Bladeren bron

Rearrange overlay layout

j8
Ilya Daynatovich 8 jaren geleden
bovenliggende
commit
647f577332

+ 5
- 0
css/_policy.scss Bestand weergeven

@@ -0,0 +1,5 @@
1
+.policy {
2
+    &__logo {
3
+
4
+    }
5
+}

+ 45
- 24
css/overlay/_overlay.scss Bestand weergeven

@@ -1,30 +1,51 @@
1
-.overlay_container {
2
-    top: 0;
3
-    left: 0;
4
-    width: 100%;
5
-    height: 100%;
6
-    position: fixed;
7
-    z-index: $overlayZ;
8
-    background: rgba(22, 185, 252, .9);
1
+.overlay {
2
+    &__container {
3
+        top: 0;
4
+        left: 0;
5
+        width: 100%;
6
+        height: 100%;
7
+        position: fixed;
8
+        z-index: $overlayZ;
9
+        background: $defaultBackground;
10
+    }
11
+
12
+    &__content {
13
+        margin: 0 auto;
14
+        width: 56%;
15
+
16
+        &_bottom {
17
+            position: absolute;
18
+            bottom: 0;
19
+        }
20
+    }
9 21
 }
10 22
 
11
-.overlay_content {
23
+.inlay {
24
+    margin-top: 14%;
25
+    @include border-radius(3px);
26
+    padding: 40px 38px 44px;
12 27
     color: #fff;
28
+    background: lighten($defaultBackground, 20%);
13 29
     text-align: center;
14
-    width: 400px;
15
-    height: 250px;
16
-    top: 50%;
17
-    left: 50%;
18
-    position: absolute;
19
-    margin-top: -125px;
20
-    margin-left: -200px;
21
-}
22 30
 
23
-.overlay_text_small {
24
-    display: block;
25
-    font-size: 18px;
26
-}
31
+    &__title {
32
+        margin: 12px 0;
33
+        padding-bottom: 17px;
34
+        color: $popoverFontColor;
35
+        font-size: 21px;
36
+        letter-spacing: 0.3px;
37
+        border-bottom: 1px solid $auiBorderColor;
38
+    }
27 39
 
28
-.overlay_icon {
29
-    font-size: 100px;
30
-}
40
+    &__text {
41
+        color: $popoverFontColor;
42
+        display: block;
43
+        margin-top: 22px;
44
+        font-size: 16px;
45
+    }
46
+
47
+    &__icon {
48
+        margin: 0 10px;
49
+        font-size: 50px;
50
+    }
51
+}

+ 13
- 5
modules/UI/gum_overlay/UserMediaPermissionsGuidanceOverlay.js Bestand weergeven

@@ -22,11 +22,19 @@ class GUMOverlayImpl extends Overlay {
22 22
      * @inheritDoc
23 23
      */
24 24
     _buildOverlayContent() {
25
-        return `
26
-            <span class="overlay_icon icon-microphone"></span>
27
-            <span class="overlay_icon icon-camera"></span>
28
-            <span data-i18n='[html]userMedia.${this.browser}GrantPermissions' 
29
-                  class='overlay_text_small'></span>`;
25
+    // `<span data-i18n='[html]userMedia.${this.browser}GrantPermissions'
26
+    // class='inlay__text'></span>`
27
+        let title = 'HipChat Video needs to use your microphone and camera.';
28
+        let text;
29
+        text = 'Select "Allow" when your browser asks for these permissions.';
30
+        return (
31
+            `<div class="inlay">
32
+                <span class="inlay__icon icon-microphone"></span>
33
+                <span class="inlay__icon icon-camera"></span>
34
+                <h3 class="inlay__title">${title}</h3>
35
+                <span class='inlay__text'>${text}</span>
36
+            </div>`
37
+        );
30 38
     }
31 39
 }
32 40
 

+ 2
- 2
modules/UI/overlay/Overlay.js Bestand weergeven

@@ -34,8 +34,8 @@ export default class Overlay{
34 34
         let overlayContent = this._buildOverlayContent();
35 35
 
36 36
         this.$overlay = $(`
37
-            <div class='overlay_container'>
38
-                <div class='overlay_content'>
37
+            <div class='overlay__container'>
38
+                <div class='overlay__content'>
39 39
                     ${overlayContent}
40 40
                 </div>
41 41
             </div>`);

Laden…
Annuleren
Opslaan