Browse Source

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
j8
virtuacoplenny 7 years ago
parent
commit
d62ac72cfa
4 changed files with 19 additions and 15 deletions
  1. 10
    5
      css/_toolbars.scss
  2. 4
    5
      css/_variables.scss
  3. 3
    3
      lang/main.json
  4. 2
    2
      react/features/toolbox/components/Toolbox.web.js

+ 10
- 5
css/_toolbars.scss View File

39
     box-sizing: border-box;
39
     box-sizing: border-box;
40
     display: flex;
40
     display: flex;
41
     justify-content: space-between;
41
     justify-content: space-between;
42
-    padding: 16px 8px;
42
+    padding: 12px 8px;
43
     position: absolute;
43
     position: absolute;
44
     transition: bottom .3s ease-in;
44
     transition: bottom .3s ease-in;
45
     width: 100%;
45
     width: 100%;
100
 
100
 
101
     .icon-hangup {
101
     .icon-hangup {
102
         color: $hangupColor;
102
         color: $hangupColor;
103
+        font-size: $newToolbarHangupFontSize;
103
     }
104
     }
104
 
105
 
105
     .overflow-menu {
106
     .overflow-menu {
239
     z-index: $toolbarZ;
240
     z-index: $toolbarZ;
240
 
241
 
241
     i {
242
     i {
242
-        font-size: $alwaysOnTopToolbarFontSize;
243
-        height: $alwaysOnTopToolbarSize;
244
-        line-height: $alwaysOnTopToolbarSize;
245
-        width: $alwaysOnTopToolbarSize;
243
+        font-size: $newToolbarFontSize;
244
+        height: $newToolbarSize;
245
+        line-height: $newToolbarSize;
246
+        width: $newToolbarSize;
247
+    }
248
+
249
+    .icon-hangup {
250
+        font-size: $newToolbarHangupFontSize;
246
     }
251
     }
247
 
252
 
248
     .disabled {
253
     .disabled {

+ 4
- 5
css/_variables.scss View File

32
 /**
32
 /**
33
  * Toolbar
33
  * Toolbar
34
  */
34
  */
35
-$alwaysOnTopToolbarFontSize: 1em;
36
-$alwaysOnTopToolbarSize: 30px;
37
 $defaultToolbarSize: 50px;
35
 $defaultToolbarSize: 50px;
38
 $newToolbarBackgroundColor: rgba(22, 38, 55, 0.8);
36
 $newToolbarBackgroundColor: rgba(22, 38, 55, 0.8);
39
 $newToolbarButtonHoverColor: rgba(14, 20, 35, 0.6);
37
 $newToolbarButtonHoverColor: rgba(14, 20, 35, 0.6);
40
 $newToolbarButtonToggleColor: rgba(14, 20, 35, 1);
38
 $newToolbarButtonToggleColor: rgba(14, 20, 35, 1);
41
-$newToolbarFontSize: 1.9em;
42
-$newToolbarSize: 32px;
43
-$newToolbarSizeWithPadding: calc(32px + 32px);
39
+$newToolbarFontSize: 24px;
40
+$newToolbarHangupFontSize: 32px;
41
+$newToolbarSize: 40px;
42
+$newToolbarSizeWithPadding: calc(#{$newToolbarSize} + 24px);
44
 $toolbarTitleFontSize: 19px;
43
 $toolbarTitleFontSize: 19px;
45
 
44
 
46
 /**
45
 /**

+ 3
- 3
lang/main.json View File

88
         "documentOpen": "Open shared document",
88
         "documentOpen": "Open shared document",
89
         "documentClose": "Close shared document",
89
         "documentClose": "Close shared document",
90
         "sharedvideo": "Share a YouTube video",
90
         "sharedvideo": "Share a YouTube video",
91
-        "sharescreen": "Screen share",
92
         "stopSharedVideo": "Stop YouTube video",
91
         "stopSharedVideo": "Stop YouTube video",
93
         "fullscreen": "View / Exit full screen",
92
         "fullscreen": "View / Exit full screen",
94
         "sip": "Call SIP number",
93
         "sip": "Call SIP number",
106
         "profile": "Edit your profile",
105
         "profile": "Edit your profile",
107
         "raiseHand": "Raise / Lower your hand",
106
         "raiseHand": "Raise / Lower your hand",
108
         "shortcuts": "View shortcuts",
107
         "shortcuts": "View shortcuts",
109
-        "speakerStats": "Speaker stats"
108
+        "speakerStats": "Speaker stats",
109
+        "invite": "Invite people"
110
     },
110
     },
111
     "chat":{
111
     "chat":{
112
         "nickname": {
112
         "nickname": {
529
         "numbers": "Dial-in Numbers",
529
         "numbers": "Dial-in Numbers",
530
         "password": "Password:",
530
         "password": "Password:",
531
         "title": "Share",
531
         "title": "Share",
532
-        "tooltip": "Get access info about the meeting"
532
+        "tooltip": "Share link and dial-in info for this meeting"
533
     },
533
     },
534
     "settingsView": {
534
     "settingsView": {
535
         "alertOk": "OK",
535
         "alertOk": "OK",

+ 2
- 2
react/features/toolbox/components/Toolbox.web.js View File

363
                             accessibilityLabel = 'Invite'
363
                             accessibilityLabel = 'Invite'
364
                             iconName = 'icon-add'
364
                             iconName = 'icon-add'
365
                             onClick = { this._onToolbarOpenInvite }
365
                             onClick = { this._onToolbarOpenInvite }
366
-                            tooltip = { t('addPeople.title') } /> }
366
+                            tooltip = { t('toolbar.invite') } /> }
367
                     { this._shouldShowButton('info') && <InfoDialogButton /> }
367
                     { this._shouldShowButton('info') && <InfoDialogButton /> }
368
                     { overflowHasItems
368
                     { overflowHasItems
369
                         && <OverflowMenuButton
369
                         && <OverflowMenuButton
919
             _desktopSharingEnabled ? '' : 'disabled'}`;
919
             _desktopSharingEnabled ? '' : 'disabled'}`;
920
         const tooltip = showDisabledTooltip
920
         const tooltip = showDisabledTooltip
921
             ? disabledTooltipText
921
             ? disabledTooltipText
922
-            : t('toolbar.sharescreen');
922
+            : t('dialog.shareYourScreen');
923
 
923
 
924
         return (
924
         return (
925
             <ToolbarButton
925
             <ToolbarButton

Loading…
Cancel
Save