From d62ac72cfa8d6da8889c16040d9cba75b99d495c Mon Sep 17 00:00:00 2001
From: virtuacoplenny <leonard.h.kim@gmail.com>
Date: Fri, 4 May 2018 13:10:48 -0700
Subject: [PATCH] Various pixel pushing, tooltip copy changes (#2918)

* fix(toolbar): make button hover bigger

* fix(toolbar): make hangup button bigger

* fix(always-on-top): make toolbar and buttons same sizes as main toolbar

* fix(toolbar): change some tooltips

* fix(toolbar): adjust side panel and filmstrip for new toolbar sizes
---
 css/_toolbars.scss                               | 15 ++++++++++-----
 css/_variables.scss                              |  9 ++++-----
 lang/main.json                                   |  6 +++---
 react/features/toolbox/components/Toolbox.web.js |  4 ++--
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/css/_toolbars.scss b/css/_toolbars.scss
index 3c71d48ef..06038646b 100644
--- a/css/_toolbars.scss
+++ b/css/_toolbars.scss
@@ -39,7 +39,7 @@
     box-sizing: border-box;
     display: flex;
     justify-content: space-between;
-    padding: 16px 8px;
+    padding: 12px 8px;
     position: absolute;
     transition: bottom .3s ease-in;
     width: 100%;
@@ -100,6 +100,7 @@
 
     .icon-hangup {
         color: $hangupColor;
+        font-size: $newToolbarHangupFontSize;
     }
 
     .overflow-menu {
@@ -239,10 +240,14 @@
     z-index: $toolbarZ;
 
     i {
-        font-size: $alwaysOnTopToolbarFontSize;
-        height: $alwaysOnTopToolbarSize;
-        line-height: $alwaysOnTopToolbarSize;
-        width: $alwaysOnTopToolbarSize;
+        font-size: $newToolbarFontSize;
+        height: $newToolbarSize;
+        line-height: $newToolbarSize;
+        width: $newToolbarSize;
+    }
+
+    .icon-hangup {
+        font-size: $newToolbarHangupFontSize;
     }
 
     .disabled {
diff --git a/css/_variables.scss b/css/_variables.scss
index 51a7e32e3..8e34df1c7 100644
--- a/css/_variables.scss
+++ b/css/_variables.scss
@@ -32,15 +32,14 @@ $defaultDarkColor: #2b3d5c;
 /**
  * Toolbar
  */
-$alwaysOnTopToolbarFontSize: 1em;
-$alwaysOnTopToolbarSize: 30px;
 $defaultToolbarSize: 50px;
 $newToolbarBackgroundColor: rgba(22, 38, 55, 0.8);
 $newToolbarButtonHoverColor: rgba(14, 20, 35, 0.6);
 $newToolbarButtonToggleColor: rgba(14, 20, 35, 1);
-$newToolbarFontSize: 1.9em;
-$newToolbarSize: 32px;
-$newToolbarSizeWithPadding: calc(32px + 32px);
+$newToolbarFontSize: 24px;
+$newToolbarHangupFontSize: 32px;
+$newToolbarSize: 40px;
+$newToolbarSizeWithPadding: calc(#{$newToolbarSize} + 24px);
 $toolbarTitleFontSize: 19px;
 
 /**
diff --git a/lang/main.json b/lang/main.json
index 3fde6edc4..a99eaacef 100644
--- a/lang/main.json
+++ b/lang/main.json
@@ -88,7 +88,6 @@
         "documentOpen": "Open shared document",
         "documentClose": "Close shared document",
         "sharedvideo": "Share a YouTube video",
-        "sharescreen": "Screen share",
         "stopSharedVideo": "Stop YouTube video",
         "fullscreen": "View / Exit full screen",
         "sip": "Call SIP number",
@@ -106,7 +105,8 @@
         "profile": "Edit your profile",
         "raiseHand": "Raise / Lower your hand",
         "shortcuts": "View shortcuts",
-        "speakerStats": "Speaker stats"
+        "speakerStats": "Speaker stats",
+        "invite": "Invite people"
     },
     "chat":{
         "nickname": {
@@ -529,7 +529,7 @@
         "numbers": "Dial-in Numbers",
         "password": "Password:",
         "title": "Share",
-        "tooltip": "Get access info about the meeting"
+        "tooltip": "Share link and dial-in info for this meeting"
     },
     "settingsView": {
         "alertOk": "OK",
diff --git a/react/features/toolbox/components/Toolbox.web.js b/react/features/toolbox/components/Toolbox.web.js
index e87d0e278..56241e85b 100644
--- a/react/features/toolbox/components/Toolbox.web.js
+++ b/react/features/toolbox/components/Toolbox.web.js
@@ -363,7 +363,7 @@ class Toolbox extends Component<Props, State> {
                             accessibilityLabel = 'Invite'
                             iconName = 'icon-add'
                             onClick = { this._onToolbarOpenInvite }
-                            tooltip = { t('addPeople.title') } /> }
+                            tooltip = { t('toolbar.invite') } /> }
                     { this._shouldShowButton('info') && <InfoDialogButton /> }
                     { overflowHasItems
                         && <OverflowMenuButton
@@ -919,7 +919,7 @@ class Toolbox extends Component<Props, State> {
             _desktopSharingEnabled ? '' : 'disabled'}`;
         const tooltip = showDisabledTooltip
             ? disabledTooltipText
-            : t('toolbar.sharescreen');
+            : t('dialog.shareYourScreen');
 
         return (
             <ToolbarButton