浏览代码

Restyled toolbar splitter

j8
Ilya Daynatovich 8 年前
父节点
当前提交
16c70fddba
共有 4 个文件被更改,包括 27 次插入20 次删除
  1. 13
    15
      css/_toolbars.scss
  2. 1
    1
      css/_variables.scss
  3. 4
    1
      css/themes/_light.scss
  4. 9
    3
      modules/UI/toolbars/Toolbar.js

+ 13
- 15
css/_toolbars.scss 查看文件

4
     z-index: $toolbarZ;
4
     z-index: $toolbarZ;
5
     height: 100%;
5
     height: 100%;
6
     pointer-events: auto;
6
     pointer-events: auto;
7
+
8
+    /**
9
+     * Splitter button in the toolbar.
10
+     */
11
+    &__splitter {
12
+        display: inline-block;
13
+        vertical-align: middle;
14
+        width: 1px;
15
+        height: 50%;
16
+        margin: 0 $splitterToolbarButtonMargin;
17
+        background: $splitterColor;
18
+    }
7
 }
19
 }
8
 
20
 
9
 #mainToolbarContainer{
21
 #mainToolbarContainer{
42
     margin-right: auto;
54
     margin-right: auto;
43
     width: auto;
55
     width: auto;
44
     border-radius: 3px;
56
     border-radius: 3px;
45
-
46
-    .button:first-child {
47
-        border-bottom-left-radius: 3px;
48
-        border-top-left-radius: 3px;
49
-    }
50
-    .button:last-child {
51
-        border-bottom-right-radius: 3px;
52
-        border-top-right-radius: 3px;
53
-    }
54
-    /**
55
-     * Splitter button in the toolbar.
56
-     */
57
-    .splitter {
58
-        margin-left: $splitterToolbarButtonLeftMargin;
59
-    }
57
+    overflow: hidden;
60
 }
58
 }
61
 
59
 
62
 #extendedToolbar {
60
 #extendedToolbar {

+ 1
- 1
css/_variables.scss 查看文件

34
 $toolbarBadgeBackground: #165ECC;
34
 $toolbarBadgeBackground: #165ECC;
35
 $toolbarBadgeColor: #FFFFFF;
35
 $toolbarBadgeColor: #FFFFFF;
36
 $toolbarToggleBackground: #12499C;
36
 $toolbarToggleBackground: #12499C;
37
-$splitterToolbarButtonLeftMargin: 0px;
37
+$splitterToolbarButtonMargin: 18px;
38
 
38
 
39
 /*
39
 /*
40
  * Main controls
40
  * Main controls

+ 4
- 1
css/themes/_light.scss 查看文件

54
 // Popover colors
54
 // Popover colors
55
 $popoverBg: #000;
55
 $popoverBg: #000;
56
 $popoverFontColor: #ffffff;
56
 $popoverFontColor: #ffffff;
57
-$popupMenuSelectedItemBackground: rgba(256, 256, 256, .2);
57
+$popupMenuSelectedItemBackground: rgba(256, 256, 256, .2);
58
+
59
+// Toolbar
60
+$splitterColor: #ccc;

+ 9
- 3
modules/UI/toolbars/Toolbar.js 查看文件

769
         };
769
         };
770
         let id = places[place];
770
         let id = places[place];
771
         let buttonElement = document.createElement("a");
771
         let buttonElement = document.createElement("a");
772
-        if (button.className)
773
-            buttonElement.className = button.className
774
-                + ((isSplitter) ? " splitter": "");
772
+        if (button.className) {
773
+            buttonElement.className = button.className;
774
+        }
775
+
776
+        if (isSplitter) {
777
+            let splitter = document.createElement('span');
778
+            splitter.className = 'toolbar__splitter';
779
+            document.getElementById(id).appendChild(splitter);
780
+        }
775
 
781
 
776
         buttonElement.id = button.id;
782
         buttonElement.id = button.id;
777
 
783
 

正在加载...
取消
保存