Skip to content
This repository was archived by the owner on Nov 3, 2021. It is now read-only.

Commit f8a08cc

Browse files
committed
Merge pull request #49 from jostw/josyeh/Marketplace/master/Bug1248333
Bug 1248333 - Update visual with flexible layout
2 parents fcc73cb + cff0edb commit f8a08cc

File tree

6 files changed

+30
-17
lines changed

6 files changed

+30
-17
lines changed

src/media/css/app-list.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ $app-list-background-color = #CBCDCD;
88

99
.app-list {
1010
position: absolute;
11-
top: $app-preview-height;
1211
bottom: 0;
1312
left: 0;
1413

1514
width: 100%;
15+
height: (61.4 / 108) * 100%;
1616
overflow: hidden;
1717

1818
background-color: $app-list-background-color;

src/media/css/app-preview.styl

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ $app-preview-background-color = #72C9B0;
1212
left: 0;
1313

1414
width: 100%;
15-
height: $app-preview-height;
16-
padding: 7.2rem 18.5rem 6.9rem 15rem;
15+
height: (46.6 / 108) * 100%;
16+
padding: (7.2 / 192) * 100% 18.5rem (6.9 / 192) * 100% 15rem;
1717

1818
background-color: $app-preview-background-color;
1919
background-image: url('../img/Pattern_overlay.png');
@@ -56,12 +56,14 @@ $app-preview-background-color = #72C9B0;
5656

5757
.app-preview-image {
5858
float: right;
59-
width: 57.5rem;
59+
width: (57.5 / 158.5) * 100%;
6060
height: 100%;
61-
61+
min-height: 20rem;
6262
border-radius: .6rem;
6363
overflow: hidden;
6464

65+
text-align: right;
66+
6567
color: transparent;
6668

6769
transition: opacity 1s;
@@ -71,16 +73,20 @@ $app-preview-background-color = #72C9B0;
7173
}
7274

7375
img {
74-
width: 100%;
76+
width: auto;
77+
height: 100%;
78+
border-radius: .6rem;
7579
}
7680
}
7781

7882
.app-preview-detail {
7983
position: relative;
8084

81-
width: 89rem;
85+
width: (89 / 158.5) * 100%;
8286
height: 100%;
87+
min-height: 20rem;
8388
padding-top: 1rem;
89+
overflow: hidden;
8490

8591
color: $greyscale-white;
8692

src/media/css/lib/index.styl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
@import 'colors';
2-
@import 'layout';
32
@import 'typography';
43
@import 'mixins';

src/media/css/lib/layout.styl

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/media/css/offline.styl

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,16 @@
55
@import 'lib';
66

77
.offline-container {
8+
position: fixed;
9+
top: 0;
10+
left: 0;
11+
812
width: 100%;
913
height: 100%;
1014

1115
background-image: url('../img/bg_loading_error.png');
16+
background-size: cover;
17+
background-position: center;
1218
}
1319

1420
.offline-description,
@@ -23,7 +29,7 @@
2329
}
2430

2531
.offline-description {
26-
top: 46rem;
32+
top: (46 / 108) * 100%
2733

2834
font-style: italic;
2935

@@ -48,7 +54,7 @@
4854
}
4955

5056
.offline-control {
51-
top: 70.6rem;
57+
top: (70.6 / 108) * 100%;
5258
}
5359

5460
.offline-button {

src/media/css/tutorial.styl

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131

3232
width: 100%;
3333
height: 100%;
34-
min-width: 192rem;
35-
min-height: 108rem;
3634

3735
transition: opacity 1s;
3836

@@ -77,10 +75,11 @@
7775
}
7876

7977
.slide-section-top {
80-
top: 3.5rem;
78+
top: 8%;
8179

8280
width: 150rem;
8381
height: 8rem;
82+
margin-top: -5rem;
8483

8584
font-size: 3.8rem;
8685
font-style: italic;
@@ -143,11 +142,11 @@
143142

144143
.text {
145144
position: absolute;
146-
top: 19.5rem;
145+
top: 2.5%;
147146
left: 50%;
148147

149148
width: 50rem;
150-
margin-left: -25rem;
149+
margin: 16.875rem 0 0 -25rem;
151150

152151
font-size: 4.2rem;
153152
font-style: italic;
@@ -159,12 +158,16 @@
159158
}
160159

161160
.slide-section-bottom {
162-
bottom: 5.5rem;
161+
bottom: 7.5%;
162+
margin-bottom: -2.625rem;
163163
}
164164

165165
.slide-image {
166166
width: 100%;
167167
height: 100%;
168+
169+
background-size: cover;
170+
background-position: center bottom;
168171
}
169172

170173
for num in (1..3) {

0 commit comments

Comments
 (0)