Skip to content

Commit c9ec788

Browse files
committed
2.x - Updating grid app
1 parent 669b793 commit c9ec788

File tree

6 files changed

+148
-32
lines changed

6 files changed

+148
-32
lines changed

src/assets/css/main.css

Lines changed: 65 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,15 @@
1313
box-sizing: border-box;
1414
}
1515

16+
body,
17+
html {
18+
width: 100%;
19+
height: 100%;
20+
display: block;
21+
}
22+
1623
body {
17-
background-color: #f7f8fa;
24+
background-color: #ffffff;
1825
font-family: 'Source Sans Pro', sans-serif;
1926
font-size: 14px;
2027
line-height: 1.5;
@@ -23,9 +30,6 @@ body {
2330
user-select: none;
2431
cursor: default;
2532
color: #212121;
26-
width: 100%;
27-
height: 45px;
28-
padding-top: 45px;
2933
-webkit-app-region: drag;
3034
overflow: hidden;
3135
}
@@ -111,9 +115,31 @@ a:active {
111115
background-color: #99a6bf;
112116
}
113117

118+
.container {
119+
height: 100%;
120+
display: flex;
121+
}
122+
123+
.col {
124+
position: relative;
125+
height: 100%;
126+
}
127+
128+
.col-2 {
129+
width: 16.666667%;
130+
}
131+
132+
.col-3 {
133+
width: 25%;
134+
}
135+
136+
.col-6 {
137+
width: 50%;
138+
}
139+
114140
.loading-app {
115141
position: fixed;
116-
color: #e52d27;
142+
color: #ffffff;
117143
top: 50%;
118144
left: 50%;
119145
transform: translate(-50%, -50%);
@@ -168,6 +194,36 @@ input[type="radio"]:checked + label .round-check:after {
168194
left: 22px;
169195
}
170196

197+
.app-yt-2 {
198+
height: 100%;
199+
}
200+
201+
.app {
202+
position: relative;
203+
height: 100%;
204+
color: #ffffff;
205+
}
206+
207+
.app-content {
208+
height: calc(100% - 120px);
209+
display: block;
210+
position: absolute;
211+
overflow: auto;
212+
bottom: 0;
213+
}
214+
215+
.app-services {
216+
background-color: #212121;
217+
}
218+
219+
.app-feed {
220+
background-color: #212121;
221+
}
222+
223+
.app-player {
224+
background-color: #e52d27;
225+
}
226+
171227
header {
172228
position: absolute;
173229
height: 45px;
@@ -314,18 +370,6 @@ footer .col {
314370
padding: 0 15px;
315371
}
316372

317-
footer .col-2 {
318-
width: 16.666667%;
319-
}
320-
321-
footer .col-3 {
322-
width: 25%;
323-
}
324-
325-
footer .col-6 {
326-
width: 50%;
327-
}
328-
329373
footer .col:first-child {
330374
padding-left: 0;
331375
}
@@ -817,3 +861,7 @@ iframe {
817861
.video-list-clear .fa {
818862
margin-right: 5px;
819863
}
864+
865+
app-yt {
866+
display: none;
867+
}

src/assets/scss/_common.scss

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.loading-app {
22
position: fixed;
3-
color: $c-primary;
3+
color: $c-white;
44
top: 50%;
55
left: 50%;
66
transform: translate(-50%, -50%)
@@ -53,3 +53,37 @@ input[type="radio"]:checked {
5353
}
5454
}
5555
}
56+
57+
58+
// app-yt-2
59+
60+
.app-yt-2 {
61+
height: 100%;
62+
}
63+
64+
.app {
65+
position: relative;
66+
height: 100%;
67+
color: $c-white;
68+
&-content {
69+
height: calc(100% - 120px);
70+
display: block;
71+
position: absolute;
72+
overflow: auto;
73+
bottom: 0;
74+
75+
}
76+
&-head {
77+
78+
}
79+
&-services {
80+
background-color: $c-black;
81+
}
82+
&-feed {
83+
background-color: $c-black;
84+
}
85+
&-player {
86+
background-color: $c-primary;
87+
}
88+
}
89+

src/assets/scss/_footer.scss

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@ footer {
99
padding: 5px 15px;
1010
.col {
1111
padding: 0 15px;
12-
&-2 {
13-
width: 16.666667%;
14-
}
15-
&-3 {
16-
width: 25%;
17-
}
18-
&-6 {
19-
width: 50%;
20-
}
2112
&:first-child {
2213
padding-left: 0;
2314
}

src/assets/scss/_global.scss

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,14 @@
22
box-sizing: border-box;
33
}
44

5+
body,
6+
html {
7+
width: 100%;
8+
height: 100%;
9+
display: block;
10+
}
511
body {
6-
background-color: $c-base;
12+
background-color: $c-white;
713
font-family: 'Source Sans Pro', sans-serif;
814
font-size: $f-14;
915
line-height: 1.5;
@@ -12,9 +18,6 @@ body {
1218
user-select: none;
1319
cursor: default;
1420
color: $c-black;
15-
width: 100%;
16-
height: 45px;
17-
padding-top: 45px;
1821
-webkit-app-region: drag;
1922
overflow: hidden;
2023
}

src/assets/scss/main.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@
44
@import 'global';
55

66
@import 'buttons';
7+
@import 'grid';
78
@import 'common';
89

910
@import 'header';
1011
@import 'footer';
1112

1213
@import 'navbar';
1314
@import 'search';
14-
@import 'videos';
15+
@import 'videos';
16+
17+
app-yt {
18+
display: none;
19+
}

src/index.html

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,41 @@
1616
</div>
1717
</app-yt>
1818

19+
<div class="app-yt-2">
20+
<div class="container">
21+
<div class="col col-3">
22+
<div class="app app-services">
23+
<div class="app-head">
24+
YouTube
25+
</div>
26+
<div class="app-content">
27+
28+
</div>
29+
</div>
30+
</div>
31+
<div class="col col-6">
32+
<div class="app app-feed">
33+
<div class="app-head">
34+
Feed
35+
</div>
36+
<div class="app-content">
37+
38+
</div>
39+
</div>
40+
</div>
41+
<div class="col col-3">
42+
<div class="app app-player">
43+
<div class="app-head">
44+
Player
45+
</div>
46+
<div class="app-content">
47+
48+
</div>
49+
</div>
50+
</div>
51+
</div>
52+
</div>
53+
1954
<script>
2055
/*
2156
// Reload pentru NWJS (DE EDITAT)

0 commit comments

Comments
 (0)