Merge branch 'master' into rtl

AustinShalit · Dec 30, 2018 · 2fd1264 · 2fd1264
2 parents a7217d7 + 7be9d1f
commit 2fd1264
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 12 deletions.
diff --git a/sass/_theme_font_awesome_compatibility.sass b/sass/_theme_font_awesome_compatibility.sass
@@ -1,3 +1,9 @@
+.fa-ul
+  :dir(rtl) &
+    padding-left: inherit
+    margin-left: inherit
+    padding-right: 0
+    margin-right: $fa-li-width
 .icon
   @extend .fa
 .icon-home
@@ -16,8 +22,14 @@
   @extend .fa-gitlab
 .icon-fire
   @extend .fa-fire
+.fa-arrow-circle-right
+  :dir(rtl) &
+    @extend .fa-arrow-circle-left
 .icon-circle-arrow-right
   @extend .fa-arrow-circle-right
+.fa-arrow-circle-left
+  :dir(rtl) &
+    @extend .fa-arrow-circle-right
 .icon-circle-arrow-left
   @extend .fa-arrow-circle-left
 .icon-link

diff --git a/sass/_theme_layout.sass b/sass/_theme_layout.sass
@@ -10,14 +10,60 @@ html
   a:hover
     text-decoration: none
 
+.wy-dropdown-menu
+  :dir(rtl) &
+    float: right
+  .wy-dropdown.wy-dropdown-left
+    :dir(rtl) &
+      text-align: left
+
+.wy-form-aligned
+  .wy-control-group>label
+    :dir(rtl) &
+      float: right
+      margin: $base-line-height / 4 0 $base-line-height / 2
+  .wy-control
+    :dir(rtl) &
+      float: right
+
+.wy-control-group
+  .wy-form-full
+    :dir(rtl) &
+      float: right
+      margin-left:2.35765%;
+      margin-left:0;
+      margin-right:inherit
+    &:last-child
+      :dir(rtl) &
+        margin-left: 0
+        margin-right: inherit
+  .wy-form-halves
+    :dir(rtl) &
+      float: right
+    &:last-child, &:nth-of-type(2n)
+      :dir(rtl) &
+        margin-right:inherit
+        margin-left: 0
+    &:nth-of-type(2n+1)
+      :dir(rtl) &
+        clear: right
+    .wy-form-thirds
+      float:right
+      margin-left:2.35765%
+      margin-right:inherit
+      &:last-child, :nth-of-type(3n)
+        :dir(rtl) &
+          margin-left: 0
+          margin-right: inherit
+
 .wy-menu-horiz
   +clearfix
   ul, li
     display: inline-block
   li:hover
     background: rgba(255,255,255,.1)
   li
-    &.divide-left
+    &.divide-left, &:dir(rtl) .divide-right
       border-left: solid 1px hsl(0, 0%, 25%)
       &:dir(rtl)
         border-left: inherit
@@ -420,6 +466,9 @@ article ul li, article ol li, .wy-plain-list-disc li, .wy-plain-list-decimal li
   .wy-nav-side
     @if $nav-desktop-position == left
       left: -$nav-desktop-width
+      :dir(rtl) &
+        left: inherit
+        right: -$nav-desktop-width
     @else
       right: -$nav-desktop-width
     &:dir(rtl)

diff --git a/sass/_theme_rst.sass b/sass/_theme_rst.sass
@@ -17,7 +17,7 @@
   // Sphinx by default applies HxW style attributes to images. This fixes that oversight.
   img
     max-width: 100%
-    height: auto
+    height: auto !important
 
   div.figure
     margin-bottom: $base-line-height
@@ -33,10 +33,6 @@
   .section > img,   .section > a > img
     margin-bottom: $base-line-height
 
-  // normalize browser styling
-  abbr[title]
-    text-decoration: none
-
   // Style external links
   &.style-external-links a.reference.external:after
     font-family: FontAwesome
@@ -251,10 +247,7 @@
 
   // These are the little citation links [1] that show up within paragraphs.
   .footnote-reference, .citation-reference
-    vertical-align: baseline
-    position: relative
-    top: -0.4em
-    line-height: 0
+    vertical-align: super
     font-size: 90%
 
   // Tables! Sphinx LOVES TABLES. Most of wyrm assumes you're only going to use a table as a table

diff --git a/sphinx_rtd_theme/layout.html b/sphinx_rtd_theme/layout.html
@@ -9,8 +9,8 @@
 {%- set lang_attr = 'en' if language == None else (language | replace('_', '-')) %}
 
 <!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="{{ lang_attr }}" dir="rtl"> <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="{{ lang_attr }}" dir="rtl"> <!--<![endif]-->
+<!--[if IE 8]><html class="no-js lt-ie9" lang="{{ lang_attr }}"  dir="auto"> <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="{{ lang_attr }}" dir="auto"> <!--<![endif]-->
 <head>
   <meta charset="utf-8">
   {{ metatags }}