Merge branch '4.0-dev' into 4.0-dev-com-contenthistory-null-date

joomla · Oct 27, 2019 · 40966f2 · 40966f2
2 parents 534aa3f + 7ca1732
commit 40966f2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/administrator/templates/atum/scss/blocks/_searchtools.scss b/administrator/templates/atum/scss/blocks/_searchtools.scss
@@ -78,6 +78,10 @@
         @include media-breakpoint-down(sm) {
             max-width:100%;
             margin-right:0.5rem;
+
+            [dir=rtl] & {
+              margin-right: 0;
+            }
         }
     }
   }

diff --git a/administrator/templates/atum/scss/blocks/_toolbar.scss b/administrator/templates/atum/scss/blocks/_toolbar.scss
@@ -337,6 +337,13 @@ joomla-toolbar-button {
       margin-left:0 !important;
       margin-right:0.75rem;
       margin-bottom:0.75rem;
+
+      @include media-breakpoint-down(sm) {
+        [dir=rtl] & {
+          margin-left: 0.75rem;
+          margin-right: 0 !important;
+        }
+      }
     }
   }
 
@@ -359,14 +366,19 @@ joomla-toolbar-button {
       .input-group,
       .ordering-select,
       .js-stools-field-list,
-      .js-stools-container-selector      {
+      .js-stools-container-selector {
         @include media-breakpoint-down(sm) {
             width:100%;
         }
      }
      .ordering-select,
-     .js-stools-container-selector{
+     .js-stools-container-selector {
         margin-right:.5rem;
+        @include media-breakpoint-down(sm) {
+          [dir=rtl] & {
+            margin-right: 0 !important;
+          }
+        }
      }
      .btn-group{
         @include media-breakpoint-down(sm) {
@@ -418,6 +430,10 @@ joomla-toolbar-button {
       [class^='fa-'],
       [class*=' fa-'] {
         float: left;
+
+        [dir=rtl] & {
+          float: right;
+        }
       }
     }
   }

diff --git a/build/media_source/system/css/searchtools.css b/build/media_source/system/css/searchtools.css
@@ -28,7 +28,7 @@
 	margin-right: 8px;
 }
 html[dir=rtl] .js-stools .js-stools-container-selector {
-	float: right;
+	float: none;
 	margin-left: auto;
 	margin-right: 0;
 }
@@ -64,6 +64,10 @@ html[dir=rtl] .js-stools .chosen-container {
 	display: inline-block;
 	margin: 0 5px 5px 0;
 }
+html[dir=rtl] .js-stools .js-stools-field-list,
+.js-stools .js-stools-field-filter {
+	margin: 0 0 5px 5px;
+}
 .js-stools .js-stools-container-list .js-stools-field-list:last-child {
 	margin-right: 0;
 }