Selaa lähdekoodia

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 vuotta sitten
vanhempi
commit
d62ac72cfa
4 muutettua tiedostoa jossa 19 lisäystä ja 15 poistoa
  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 Näytä tiedosto

@@ -39,7 +39,7 @@
39 39
     box-sizing: border-box;
40 40
     display: flex;
41 41
     justify-content: space-between;
42
-    padding: 16px 8px;
42
+    padding: 12px 8px;
43 43
     position: absolute;
44 44
     transition: bottom .3s ease-in;
45 45
     width: 100%;
@@ -100,6 +100,7 @@
100 100
 
101 101
     .icon-hangup {
102 102
         color: $hangupColor;
103
+        font-size: $newToolbarHangupFontSize;
103 104
     }
104 105
 
105 106
     .overflow-menu {
@@ -239,10 +240,14 @@
239 240
     z-index: $toolbarZ;
240 241
 
241 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 253
     .disabled {

+ 4
- 5
css/_variables.scss Näytä tiedosto

@@ -32,15 +32,14 @@ $defaultDarkColor: #2b3d5c;
32 32
 /**
33 33
  * Toolbar
34 34
  */
35
-$alwaysOnTopToolbarFontSize: 1em;
36
-$alwaysOnTopToolbarSize: 30px;
37 35
 $defaultToolbarSize: 50px;
38 36
 $newToolbarBackgroundColor: rgba(22, 38, 55, 0.8);
39 37
 $newToolbarButtonHoverColor: rgba(14, 20, 35, 0.6);
40 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 43
 $toolbarTitleFontSize: 19px;
45 44
 
46 45
 /**

+ 3
- 3
lang/main.json Näytä tiedosto

@@ -88,7 +88,6 @@
88 88
         "documentOpen": "Open shared document",
89 89
         "documentClose": "Close shared document",
90 90
         "sharedvideo": "Share a YouTube video",
91
-        "sharescreen": "Screen share",
92 91
         "stopSharedVideo": "Stop YouTube video",
93 92
         "fullscreen": "View / Exit full screen",
94 93
         "sip": "Call SIP number",
@@ -106,7 +105,8 @@
106 105
         "profile": "Edit your profile",
107 106
         "raiseHand": "Raise / Lower your hand",
108 107
         "shortcuts": "View shortcuts",
109
-        "speakerStats": "Speaker stats"
108
+        "speakerStats": "Speaker stats",
109
+        "invite": "Invite people"
110 110
     },
111 111
     "chat":{
112 112
         "nickname": {
@@ -529,7 +529,7 @@
529 529
         "numbers": "Dial-in Numbers",
530 530
         "password": "Password:",
531 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 534
     "settingsView": {
535 535
         "alertOk": "OK",

+ 2
- 2
react/features/toolbox/components/Toolbox.web.js Näytä tiedosto

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

Loading…
Peruuta
Tallenna