[ui:toolbar] fix #2751 correction rtl-toolbar (float icons in group)

And remove CSS class "ui-corner-*" rel #2739 .
Studio-42 · Oct 28, 2018 · 295db8f · 295db8f
1 parent f471d8c
commit 295db8f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 22 deletions.
diff --git a/css/toolbar.css b/css/toolbar.css
@@ -20,6 +20,7 @@
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
     border-radius: 4px;
+    overflow: hidden;
 }
 
 /*.elfinder-buttonset:first-child { margin:0; }*/
@@ -41,6 +42,10 @@
     cursor: default;
 }
 
+.elfinder-rtl .elfinder-button {
+    float: right;
+}
+
 .elfinder-touch .elfinder-button {
     min-width: 20px;
     height: 20px;
@@ -50,24 +55,6 @@
     cursor: pointer;
 }
 
-.elfinder-button:first-child {
-    -moz-border-radius-topleft: 4px;
-    -webkit-border-top-left-radius: 4px;
-    border-top-left-radius: 4px;
-    -moz-border-radius-bottomleft: 4px;
-    -webkit-border-bottom-left-radius: 4px;
-    border-bottom-left-radius: 4px;
-}
-
-.elfinder-button:last-child {
-    -moz-border-radius-topright: 4px;
-    -webkit-border-top-right-radius: 4px;
-    border-top-right-radius: 4px;
-    -moz-border-radius-bottomright: 4px;
-    -webkit-border-bottom-right-radius: 4px;
-    border-bottom-right-radius: 4px;
-}
-
 /* separator between buttons, required for berder between button with ui color */
 .elfinder-toolbar-button-separator {
     float: left;
@@ -79,6 +66,10 @@
     width: 0;
 }
 
+.elfinder-rtl .elfinder-toolbar-button-separator {
+    float: right;
+}
+
 .elfinder-touch .elfinder-toolbar-button-separator {
     height: 28px;
 }
@@ -437,7 +428,6 @@
     margin: 1px 4px;
     height: auto;
     min-height: 26px;
-    float: right;
     width: 70px;
     overflow: visible;
 }
@@ -495,6 +485,10 @@
     margin-left: 10px;
 }
 
+.elfinder-rtl .ui-controlgroup > .ui-controlgroup-item {
+    float: right;
+}
+
 /* search text field */
 .elfinder-button-search input[type=text] {
     box-sizing: border-box;

diff --git a/js/ui/toolbar.js b/js/ui/toolbar.js
@@ -7,7 +7,7 @@ $.fn.elfindertoolbar = function(fm, opts) {
 	"use strict";
 	this.not('.elfinder-toolbar').each(function() {
 		var commands = fm._commands,
-			self     = $(this).addClass('ui-helper-clearfix ui-widget-header ui-corner-top elfinder-toolbar'),
+			self     = $(this).addClass('ui-helper-clearfix ui-widget-header elfinder-toolbar'),
 			options  = {
 				// default options
 				displayTextLabel: false,
@@ -32,7 +32,7 @@ $.fn.elfindertoolbar = function(fm, opts) {
 				l = panels.length;
 				while (l--) {
 					if (panels[l]) {
-						panel = $('<div class="ui-widget-content ui-corner-all elfinder-buttonset"/>');
+						panel = $('<div class="ui-widget-content elfinder-buttonset"/>');
 						i = panels[l].length;
 						while (i--) {
 							name = panels[l][i];
@@ -58,7 +58,7 @@ $.fn.elfindertoolbar = function(fm, opts) {
 					//cmdPref.state = !self.children().length? 0 : -1;
 					if (options.showPreferenceButton === 'always' || (!self.children().length && options.showPreferenceButton === 'auto')) {
 						//cmdPref.state = 0;
-						panel = $('<div class="ui-widget-content ui-corner-all elfinder-buttonset"/>');
+						panel = $('<div class="ui-widget-content elfinder-buttonset"/>');
 						name = 'preference';
 						button = 'elfinder'+cmd.options.ui;
 						buttons[name] = $('<div/>')[button](cmdPref);