From d79995e14c5d5cad22774824612092f25b3ee719 Mon Sep 17 00:00:00 2001
From: hristoterezov <hristo@jitsi.org>
Date: Mon, 4 Dec 2017 22:23:51 -0600
Subject: [PATCH] fix(aot): Toolbar styles (#2252)

Rounded corners on the first and last buttons. Size of the hangup button
on hover.
---
 css/_toolbars.scss                                   |  5 ++++-
 .../toolbox/components/StatelessToolbarButton.js     | 12 +++++++-----
 .../features/toolbox/components/ToolbarButton.web.js |  6 +-----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/css/_toolbars.scss b/css/_toolbars.scss
index cca312b8b..91b22b955 100644
--- a/css/_toolbars.scss
+++ b/css/_toolbars.scss
@@ -56,11 +56,14 @@
         /**
          * Toolbar button styles for always on top.
          */
-        > .button {
+        .button {
             font-size: $alwaysOnTopToolbarFontSize;
             height: $alwaysOnTopToolbarSize;
             line-height: $alwaysOnTopToolbarSize;
             width: $alwaysOnTopToolbarSize;
+            &_hangup, &_hangup:hover {
+                font-size: $alwaysOnTopToolbarFontSize;
+            }
         }
     }
 
diff --git a/react/features/toolbox/components/StatelessToolbarButton.js b/react/features/toolbox/components/StatelessToolbarButton.js
index cb5193bc8..0fb58a9d8 100644
--- a/react/features/toolbox/components/StatelessToolbarButton.js
+++ b/react/features/toolbox/components/StatelessToolbarButton.js
@@ -96,11 +96,13 @@ export default class StatelessToolbarButton extends AbstractToolbarButton {
         const attributes = getButtonAttributesByProps(button);
 
         return (
-            <a
-                { ...attributes }
-                onClick = { this._onClick }>
-                { this.props.children }
-            </a>
+            <div className = { `toolbar-button-wrapper ${button.id}-wrapper` }>
+                <a
+                    { ...attributes }
+                    onClick = { this._onClick }>
+                    { this.props.children }
+                </a>
+            </div>
         );
     }
 
diff --git a/react/features/toolbox/components/ToolbarButton.web.js b/react/features/toolbox/components/ToolbarButton.web.js
index f5cd55cfe..3b37250a0 100644
--- a/react/features/toolbox/components/ToolbarButton.web.js
+++ b/react/features/toolbox/components/ToolbarButton.web.js
@@ -140,11 +140,7 @@ class ToolbarButton extends Component<*> {
             );
         }
 
-        return (
-            <div className = { `toolbar-button-wrapper ${button.id}-wrapper` }>
-                { children }
-            </div>
-        );
+        return children;
     }
 
     /**