浏览代码

Some css adjustments to settings and contact list.

j8
yanas 8 年前
父节点
当前提交
aacb39a439
共有 5 个文件被更改,包括 22 次插入27 次删除
  1. 4
    5
      css/_contact_list.scss
  2. 8
    7
      css/_side_toolbar_container.scss
  3. 2
    3
      css/_variables.scss
  4. 6
    6
      lang/main.json
  5. 2
    6
      modules/UI/side_pannels/settings/SettingsMenu.js

+ 4
- 5
css/_contact_list.scss 查看文件

@@ -2,12 +2,11 @@
2 2
     cursor: default;
3 3
 
4 4
     > ul#contacts {
5
-        position: absolute;
6
-        top: 31px;
5
+        font-size: 12px;
7 6
         bottom: 0px;
8
-        width: 100%;
9 7
         margin: 0px;
10 8
         padding: 0px;
9
+        width: 100%;
11 10
         overflow-y: scroll;
12 11
         overflow-x: hidden;
13 12
     }
@@ -20,13 +19,13 @@
20 19
 #contacts {
21 20
 
22 21
     >li {
22
+        color: $defaultSideBarFontColor;
23 23
         list-style-type: none;
24 24
         text-align: left;
25 25
         white-space: nowrap;
26 26
         color: #FFF;
27 27
         font-size: 10pt;
28
-        padding: 7px 10px;
29
-        margin: 2px;
28
+        padding: 6px 10%;
30 29
 
31 30
         &:hover,
32 31
         &:active {

+ 8
- 7
css/_side_toolbar_container.scss 查看文件

@@ -12,12 +12,13 @@
12 12
     background-color: rgba(0,0,0,0.8);
13 13
     z-index: 800;
14 14
     overflow: hidden;
15
+    letter-spacing: 1px;
15 16
 
16 17
     /**
17 18
      * Labels inside the side panel.
18 19
      */
19 20
     label {
20
-        color: $defaultSemiDarkColor;
21
+        color: $defaultColor;
21 22
     }
22 23
 
23 24
     /**
@@ -70,16 +71,16 @@
70 71
          */
71 72
         > div.title,
72 73
           div.subTitle {
73
-            color: $defaultColor !important;
74 74
             text-align: left;
75 75
             margin: 10px 0px 10px 0px;
76
-            padding: 5px 10px 5px 10px;
77 76
         }
78 77
 
79 78
         /**
80 79
          * Main title size.
81 80
          */
82 81
         > div.title {
82
+            color: $defaultColor !important;
83
+            text-align: center;
83 84
             font-size: 16px;
84 85
         }
85 86
 
@@ -87,10 +88,10 @@
87 88
          * Subtitle specific properties.
88 89
          */
89 90
         > div.subTitle {
90
-            font-size: 12px;
91
-            background: $inputSemiBackground !important;
92
-            margin-top: 20px !important;
93
-            margin-bottom: 8px !important;
91
+            font-size: 11px;
92
+            font-weight: 500;
93
+            color: $defaultSideBarFontColor !important;
94
+            margin-left: 10%;
94 95
         }
95 96
 
96 97
         /**

+ 2
- 3
css/_variables.scss 查看文件

@@ -20,7 +20,7 @@ $thumbnailToolbarHeight: 25px;
20 20
  * Color variables.
21 21
  */
22 22
 $defaultColor: #F1F1F1;
23
-$defaultSemiDarkColor: #ACACAC;
23
+$defaultSideBarFontColor: #44A5FF;
24 24
 $defaultDarkColor: #4F4F4F;
25 25
 $defaultBackground: #474747;
26 26
 $tooltipBg: rgba(0,0,0, 0.7);
@@ -72,5 +72,4 @@ $defaultDarkFontColor: #000;
72 72
 $buttonFontColor: #777;
73 73
 $buttonHoverFontColor: #287ade;
74 74
 $linkFontColor: #489afe;
75
-$linkHoverFontColor: #287ade;
76
-
75
+$linkHoverFontColor: #287ade;

+ 6
- 6
lang/main.json 查看文件

@@ -1,5 +1,5 @@
1 1
 {
2
-    "contactlist": "ON CALL (__participants__)",
2
+    "contactlist": "On Call (__participants__)",
3 3
     "connectionsettings": "Connection Settings",
4 4
     "poweredby": "powered by",
5 5
     "downloadlogs": "Download logs",
@@ -110,21 +110,21 @@
110 110
     },
111 111
     "settings":
112 112
     {
113
-        "title": "SETTINGS",
113
+        "title": "Settings",
114 114
         "update": "Update",
115 115
         "name": "Name",
116 116
         "startAudioMuted": "Everyone starts muted",
117 117
         "startVideoMuted": "Everyone starts hidden",
118
-        "selectCamera": "Select camera",
119
-        "selectMic": "Select microphone",
120
-        "selectAudioOutput": "Select audio output",
118
+        "selectCamera": "Camera",
119
+        "selectMic": "Microphone",
120
+        "selectAudioOutput": "Audio output",
121 121
         "followMe": "Everyone follows me",
122 122
         "noDevice": "None",
123 123
         "noPermission": "Permission to use device is not granted",
124 124
         "cameraAndMic": "Camera and microphone",
125 125
         "moderator": "MODERATOR",
126 126
         "password": "SET PASSWORD",
127
-        "audioVideo": "AUDIO / VIDEO",
127
+        "audioVideo": "AUDIO AND VIDEO",
128 128
         "setPasswordLabel": "Lock your room with a password."
129 129
     },
130 130
     "profile": {

+ 2
- 6
modules/UI/side_pannels/settings/SettingsMenu.js 查看文件

@@ -74,10 +74,7 @@ export default {
74 74
                     }
75 75
                 });
76 76
 
77
-            // Only show the subtitle if this isn't the only setting section.
78
-            if (interfaceConfig.SETTINGS_SECTIONS.length > 1)
79
-                UIUtil.showElement("deviceOptionsTitle");
80
-
77
+            UIUtil.showElement("deviceOptionsTitle");
81 78
             UIUtil.showElement("devicesOptions");
82 79
         }
83 80
 
@@ -150,8 +147,7 @@ export default {
150 147
     showStartMutedOptions (show) {
151 148
         if (show && UIUtil.isSettingEnabled('moderator')) {
152 149
             // Only show the subtitle if this isn't the only setting section.
153
-            if (!$("#moderatorOptionsTitle").is(":visible")
154
-                && interfaceConfig.SETTINGS_SECTIONS.length > 1)
150
+            if (!$("#moderatorOptionsTitle").is(":visible"))
155 151
                 UIUtil.showElement("moderatorOptionsTitle");
156 152
 
157 153
             UIUtil.showElement("startMutedOptions");

正在加载...
取消
保存