瀏覽代碼

Editions in jitsi popover styles

j8
Ilya Daynatovich 8 年之前
父節點
當前提交
70861465e1
共有 5 個檔案被更改,包括 34 行新增61 行删除
  1. 16
    0
      css/_connection-info.scss
  2. 6
    50
      css/_jitsi_popover.scss
  3. 0
    5
      css/_variables.scss
  4. 6
    0
      css/themes/_light.scss
  5. 6
    6
      modules/UI/videolayout/ConnectionIndicator.js

css/connection-info.scss → css/_connection-info.scss 查看文件

@@ -23,4 +23,20 @@
23 23
     td:nth-child(n-1) {
24 24
         padding-left: 5px;
25 25
     }
26
+
27
+    &__icon {
28
+        margin-right: 2px;
29
+    }
30
+
31
+    &__download
32
+    {
33
+        @extend .connection-info__icon;
34
+        color: $downloadConnectionIconColor;
35
+    }
36
+
37
+    &__upload
38
+    {
39
+        @extend .connection-info__icon;
40
+        color: $uploadConnectionIconColor;
41
+    }
26 42
 }

+ 6
- 50
css/_jitsi_popover.scss 查看文件

@@ -19,35 +19,6 @@
19 19
     margin-top: -10px;
20 20
     margin-bottom: 35px;
21 21
 
22
-    &__title {
23
-        text-align: left;
24
-        margin: 0;
25
-        padding: 0;
26
-    }
27
-
28
-    &__content {
29
-        padding: em(5) em(10);
30
-        font-size: em(14);
31
-        white-space:pre-wrap;
32
-        text-align: center;
33
-    }
34
-
35
-    &__icon {
36
-        margin-right: 2px;
37
-    }
38
-
39
-    &__green
40
-    {
41
-        @extend .jitsipopover__icon;
42
-        color: #4abd04;
43
-    }
44
-
45
-    &__orange
46
-    {
47
-        @extend .jitsipopover__icon;
48
-        color: #ffa800;
49
-    }
50
-
51 22
     &__menu-padding {
52 23
         height: 35px;
53 24
         width: 100px;
@@ -62,33 +33,18 @@
62 33
         margin: 10px auto;
63 34
     }
64 35
 
65
-    &__clear {
36
+    > .arrow {
66 37
         position: absolute;
67 38
         display: block;
39
+        left: 50%;
40
+        bottom: -5px;
41
+        margin-left: -5px;
68 42
         width: 0;
69 43
         height: 0;
70 44
         border-color: transparent;
45
+        border-top-color: $popoverBg;
71 46
         border-style: solid;
72
-    }
73
-
74
-    > .arrow {
75
-        border-width: 5px 2.5px 0 2.5px;
76
-        left: 50%;
77
-        margin-left: -5px;
78
-        @extend .jitsipopover__clear;
47
+        border-width: 5px;
79 48
         border-bottom-width: 0;
80
-        border-top-color: $popoverBg;
81
-        bottom: -5px;
82
-
83
-
84
-        &:after {
85
-            border-width: 5px;
86
-            content: " ";
87
-            bottom: 1px;
88
-            margin-left: -5px;
89
-            @extend .jitsipopover__clear;
90
-            border-bottom-width: 0;
91
-            border-top-color: $popoverBg;
92
-        }
93 49
     }
94 50
 }

+ 0
- 5
css/_variables.scss 查看文件

@@ -1,8 +1,3 @@
1
-/**
2
-* Theme
3
-*/
4
-@import 'themes/main';
5
-
6 1
 /**
7 2
  * Style variables
8 3
  */

+ 6
- 0
css/themes/_light.scss 查看文件

@@ -22,6 +22,12 @@ $primaryButtonFontWeight: 400;
22 22
 
23 23
 $buttonShadowColor: #192d4f;
24 24
 
25
+/**
26
+* Connection indicator
27
+**/
28
+$downloadConnectionIconColor: #4abd04;
29
+$uploadConnectionIconColor: #ffa800;
30
+
25 31
 /**
26 32
  * Dialog colors
27 33
  **/

+ 6
- 6
modules/UI/videolayout/ConnectionIndicator.js 查看文件

@@ -80,10 +80,10 @@ ConnectionIndicator.prototype.generateText = function () {
80 80
         packetLoss = "N/A";
81 81
     } else {
82 82
 
83
-        packetLoss = "<span class='jitsipopover__green'>&darr;</span>" +
83
+        packetLoss = "<span class='connection-info__download'>&darr;</span>" +
84 84
             (this.packetLoss.download !== null ?
85 85
                 this.packetLoss.download : "N/A") +
86
-            "% <span class='jitsipopover__orange'>&uarr;</span>" +
86
+            "% <span class='connection-info__upload'>&uarr;</span>" +
87 87
             (this.packetLoss.upload !== null? this.packetLoss.upload : "N/A") +
88 88
             "%";
89 89
     }
@@ -104,8 +104,8 @@ ConnectionIndicator.prototype.generateText = function () {
104 104
                     </span>
105 105
                 </td>
106 106
                 <td>
107
-                    <span class='jitsipopover__green'>&darr;</span>${downloadBitrate}
108
-                    <span class='jitsipopover__orange'>&uarr;</span>${uploadBitrate}
107
+                    <span class='connection-info__download'>&darr;</span>${downloadBitrate}
108
+                    <span class='connection-info__upload'>&uarr;</span>${uploadBitrate}
109 109
                 </td>
110 110
             </tr>
111 111
             <tr>
@@ -242,9 +242,9 @@ ConnectionIndicator.prototype.generateText = function () {
242 242
             "<span data-i18n='connectionindicator.bandwidth'>" +
243 243
             translate("connectionindicator.bandwidth") + "</span>" +
244 244
             "</td><td>" +
245
-            "<span class='jitsipopover__green'>&darr;</span>" +
245
+            "<span class='connection-info__download'>&darr;</span>" +
246 246
             downloadBandwidth +
247
-            " <span class='jitsipopover__orange'>&uarr;</span>" +
247
+            " <span class='connection-info__upload'>&uarr;</span>" +
248 248
             uploadBandwidth + "</td></tr>";
249 249
 
250 250
         result += transport + "</table>";

Loading…
取消
儲存