瀏覽代碼

fix(aot): Toolbar styles (#2252)

Rounded corners on the first and last buttons. Size of the hangup button
on hover.
j8
hristoterezov 8 年之前
父節點
當前提交
d79995e14c

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

@@ -56,11 +56,14 @@
56 56
         /**
57 57
          * Toolbar button styles for always on top.
58 58
          */
59
-        > .button {
59
+        .button {
60 60
             font-size: $alwaysOnTopToolbarFontSize;
61 61
             height: $alwaysOnTopToolbarSize;
62 62
             line-height: $alwaysOnTopToolbarSize;
63 63
             width: $alwaysOnTopToolbarSize;
64
+            &_hangup, &_hangup:hover {
65
+                font-size: $alwaysOnTopToolbarFontSize;
66
+            }
64 67
         }
65 68
     }
66 69
 

+ 7
- 5
react/features/toolbox/components/StatelessToolbarButton.js 查看文件

@@ -96,11 +96,13 @@ export default class StatelessToolbarButton extends AbstractToolbarButton {
96 96
         const attributes = getButtonAttributesByProps(button);
97 97
 
98 98
         return (
99
-            <a
100
-                { ...attributes }
101
-                onClick = { this._onClick }>
102
-                { this.props.children }
103
-            </a>
99
+            <div className = { `toolbar-button-wrapper ${button.id}-wrapper` }>
100
+                <a
101
+                    { ...attributes }
102
+                    onClick = { this._onClick }>
103
+                    { this.props.children }
104
+                </a>
105
+            </div>
104 106
         );
105 107
     }
106 108
 

+ 1
- 5
react/features/toolbox/components/ToolbarButton.web.js 查看文件

@@ -140,11 +140,7 @@ class ToolbarButton extends Component<*> {
140 140
             );
141 141
         }
142 142
 
143
-        return (
144
-            <div className = { `toolbar-button-wrapper ${button.id}-wrapper` }>
145
-                { children }
146
-            </div>
147
-        );
143
+        return children;
148 144
     }
149 145
 
150 146
     /**

Loading…
取消
儲存