ソースを参照

Fixes and adjustments of UI layout

j8
yanas 8年前
コミット
1604fa6584
4個のファイルの変更21行の追加12行の削除
  1. 8
    5
      css/_filmstrip.scss
  2. 4
    4
      css/_variables.scss
  3. 6
    3
      css/_videolayout_default.scss
  4. 3
    0
      css/themes/_light.scss

+ 8
- 5
css/_filmstrip.scss ファイルの表示

@@ -50,14 +50,17 @@
50 50
         position:relative;
51 51
         height:196px;
52 52
         padding: 0;
53
-        padding-left: 17px;
53
+        /*The filmstrip should not be covered by the left toolbar*/
54
+        padding-left: $defaultToolbarSize + 5;
54 55
         bottom: 0;
55 56
         width:auto;
56 57
         border: $thumbnailsBorder solid transparent;
57 58
         z-index: 5;
58 59
         transition: bottom 2s;
59 60
         overflow: visible !important;
60
-        font-size: 0pt; /*!!!Removes the gap between the local video container and the remote videos.*/
61
+        /*!!!Removes the gap between the local video container and the remote
62
+        videos.*/
63
+        font-size: 0pt;
61 64
 
62 65
         &.hidden {
63 66
             bottom: -196px;
@@ -67,8 +70,8 @@
67 70
             display: none;
68 71
             position: relative;
69 72
             background-size: contain;
70
-            border: $thumbnailVideoBorder solid transparent;
71
-            border-radius:1px;
73
+            border: $thumbnailVideoBorder solid $thumbnailBorderColor;
74
+            border-radius: $borderRadius;
72 75
             margin: 0 $thumbnailVideoMargin;
73 76
 
74 77
             &.videoContainerFocused, &:hover {
@@ -112,7 +115,7 @@
112 115
             & > video,
113 116
             & > object {
114 117
                 cursor: hand;
115
-                border-radius:1px;
118
+                border-radius: $borderRadius;
116 119
                 object-fit: cover;
117 120
                 overflow: hidden;
118 121
             }

+ 4
- 4
css/_variables.scss ファイルの表示

@@ -14,9 +14,9 @@ $defaultToolbarSize: 50px;
14 14
 
15 15
 // Video layout.
16 16
 $thumbnailToolbarHeight: 22px;
17
-$thumbnailIndicatorBorder: 0;
18
-$thumbnailIndicatorSize: 3em;
19
-$thumbnailVideoMargin: 2px;
17
+$thumbnailIndicatorBorder: 2px;
18
+$thumbnailIndicatorSize: $thumbnailToolbarHeight;
19
+$thumbnailVideoMargin: 5px;
20 20
 $thumbnailsBorder: 2px;
21 21
 $thumbnailVideoBorder: 2px;
22 22
 $hideFilmstripButtonWidth: 17px;
@@ -95,7 +95,7 @@ $notificationWidth: 215px;
95 95
 /**
96 96
  * Misc.
97 97
  */
98
-$borderRadius: 3px;
98
+$borderRadius: 4px;
99 99
 $defaultWatermarkLink: '../images/watermark.png';
100 100
 $sidebarWidth: 220px;
101 101
 $popoverMenuPadding: 13px;

+ 6
- 3
css/_videolayout_default.scss ファイルの表示

@@ -18,9 +18,10 @@
18 18
 
19 19
     &__background {
20 20
         @include topLeft();
21
+        background-color: black;
22
+        border-radius: $borderRadius - 1;
21 23
         width: 100%;
22 24
         height: 100%;
23
-        background-color: black;
24 25
     }
25 26
 
26 27
     /**
@@ -106,11 +107,12 @@
106 107
     }
107 108
 
108 109
     &__hoverOverlay {
110
+        background: rgba(0,0,0,.6);
111
+        border-radius: $borderRadius;
109 112
         position: relative;
110 113
         width: 100%;
111 114
         height: 100%;
112 115
         visibility: hidden;
113
-        background: rgba(0,0,0,.6);
114 116
         z-index: 2;
115 117
     }
116 118
 }
@@ -128,8 +130,8 @@
128 130
 
129 131
 #localVideoWrapper>video,
130 132
 #localVideoWrapper>object {
133
+    border-radius: $borderRadius !important;
131 134
     cursor: hand;
132
-    border-radius:1px !important;
133 135
     object-fit: cover;
134 136
 }
135 137
 
@@ -211,6 +213,7 @@
211 213
 
212 214
 .videocontainer .displayname {
213 215
     pointer-events: none;
216
+    padding: 0 3px 0 3px;
214 217
 }
215 218
 
216 219
 .videocontainer .editdisplayname {

+ 3
- 0
css/themes/_light.scss ファイルの表示

@@ -85,6 +85,9 @@ $popupMenuSelectedItemBackground: rgba(256, 256, 256, .2);
85 85
 // Toolbar
86 86
 $splitterColor: #ccc;
87 87
 
88
+// Thumbnail
89
+$thumbnailBorderColor: rgba(71, 71, 71, .7);
90
+
88 91
 /**
89 92
  * Forms
90 93
  */

読み込み中…
キャンセル
保存