Skip to content

Commit 30e04f7

Browse files
author
Carlos Lizaga
authored
Merge pull request #1 from KarlDeux/sass-improvements
Sass clean up pt. I
2 parents e18f9b3 + 35d7127 commit 30e04f7

25 files changed

+827
-624
lines changed

‎BeatOn/Assets/www/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</script>
1111
<meta name="viewport" content="width=device-width, initial-scale=1">
1212
<link rel="icon" type="image/x-icon" href="favicon.ico">
13-
<link rel="stylesheet" href="styles.897db6043558b11e7565.css"></head>
13+
<link rel="stylesheet" href="styles.00f63c1921c850968e3f.css"></head>
1414
<body fxLayout="column">
1515
<app-root fxLayout="column"></app-root>
16-
<script src="runtime-es2015.858f8dd898b75fe86926.js" type="module"></script><script src="polyfills-es2015.4aaaf8cdea71ba6ebdaf.js" type="module"></script><script src="runtime-es5.741402d1d47331ce975c.js" nomodule></script><script src="polyfills-es5.27d81060418231ff91d8.js" nomodule></script><script src="main-es2015.ac3c69c65ac08ba69b42.js" type="module"></script><script src="main-es5.1d14f310f8a0dd394bb6.js" nomodule></script></body>
16+
<script src="runtime-es2015.858f8dd898b75fe86926.js" type="module"></script><script src="polyfills-es2015.4aaaf8cdea71ba6ebdaf.js" type="module"></script><script src="runtime-es5.741402d1d47331ce975c.js" nomodule></script><script src="polyfills-es5.27d81060418231ff91d8.js" nomodule></script><script src="main-es2015.abc10ad845673db52760.js" type="module"></script><script src="main-es5.241a1a357dbc0a48a4a8.js" nomodule></script></body>
1717
</html>

‎BeatOn/Assets/www/main-es2015.ac3c69c65ac08ba69b42.js renamed to ‎BeatOn/Assets/www/main-es2015.abc10ad845673db52760.js

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

‎BeatOn/Assets/www/main-es5.1d14f310f8a0dd394bb6.js renamed to ‎BeatOn/Assets/www/main-es5.241a1a357dbc0a48a4a8.js

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

‎BeatOn/Assets/www/styles.897db6043558b11e7565.css renamed to ‎BeatOn/Assets/www/styles.00f63c1921c850968e3f.css

File renamed without changes.

‎frontend/src/app/add-edit-playlist-dialog/add-edit-playlist-dialog.component.scss

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
.coverContainer {
2-
width: 150px;
3-
height: 150px;
4-
display: inline-block;
5-
2+
width: 150px;
3+
height: 150px;
4+
display: inline-block;
65
}
6+
77
.coverPlaceholder {
8-
color: gray;
9-
font-size: 12px;
8+
color: gray;
9+
font-size: 12px;
1010
}
11+
1112
.cover {
12-
width: 100%;
13-
height: 100%;
14-
position: absolute;
15-
top: 0;
16-
left: 0;
17-
background-size: 100% 100%;
13+
width: 100%;
14+
height: 100%;
15+
position: absolute;
16+
top: 0;
17+
left: 0;
18+
background-size: 100% 100%;
1819
}
1920

2021
.deleteButton {
21-
margin-right: 0px;
22-
margin-left: 310px;
23-
margin-top: -20px;
24-
}
22+
margin-right: 0px;
23+
margin-left: 310px;
24+
margin-top: -20px;
25+
}

‎frontend/src/app/app.component.scss

Lines changed: 130 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,73 @@
11
.app-content {
2-
display: block;
3-
height: 100%;
4-
}
2+
display: block;
3+
height: 100%;
4+
}
5+
56
.goodCon {
67
color: green;
78
}
9+
810
.badCon {
911
color: red;
1012
}
13+
1114
.orangeCon {
12-
color: orange
15+
color: orange;
1316
}
17+
1418
.toolbar {
1519
min-height: 50px;
1620
height: 50px;
17-
display: block!important;
21+
display: block !important;
1822
}
23+
1924
.sync-spot {
2025
width: 155px;
2126
height: 39px;
2227
}
28+
2329
.sync-placeholder {
2430
margin-top: 6px;
2531
}
32+
2633
.undo-spot {
2734
margin-top: 6px;
2835
color: #ff5722;
29-
margin-left:6px;
30-
margin-right:6px;
36+
margin-left: 6px;
37+
margin-right: 6px;
3138
}
32-
.top-button{
39+
40+
.top-button {
3341
margin-top: 6px;
3442
margin-right: 1.5em;
3543
}
36-
.sync-button{
44+
45+
.sync-button {
3746
margin-top: 7px;
3847
}
48+
3949
.logo {
4050
background: url("../assets/logo.png") no-repeat center;
4151
background-size: contain;
4252
background-repeat: no-repeat;
4353
background-position: 50% 50%;
4454
height: 50px;
4555
width: 150px;
46-
4756
}
57+
4858
.nowifi {
4959
position: absolute;
5060
top: -2px;
5161
left: -2px;
5262
color: red;
53-
font-size:32px;
63+
font-size: 32px;
5464
//text-shadow: -2px 0 black, 0 2px black, 2px 0 black, 0 -2px black;
5565
}
66+
5667
.credits li {
5768
margin-bottom: 15px;
5869
}
70+
5971
.connectionStatus {
6072
margin-top: 9px;
6173
position: relative;
@@ -64,18 +76,19 @@
6476
height: 32px;
6577
cursor: pointer;
6678
}
79+
6780
.wifi {
6881
position: absolute;
6982
top: 2px;
7083
left: 2px;
71-
font-size:32;
84+
font-size: 32;
7285
}
7386

7487
.nosync {
7588
-webkit-border-radius: 10px;
7689
border-radius: 10px;
7790
border: none;
78-
color: #FFFFFF;
91+
color: #ffffff;
7992
cursor: pointer;
8093
display: inline-block;
8194
font-family: Arial;
@@ -87,74 +100,119 @@
87100
height: 26px;
88101
width: 140.63px;
89102
}
90-
.right{
103+
104+
.right {
91105
float: right;
92106
}
93-
.warning {
94-
height: 35px;
95-
background-color: #004A7F;
96-
-webkit-border-radius: 4px;
97-
border-radius: 4px;
98-
border: none;
99-
color: #FFFFFF;
100-
cursor: pointer;
101-
display: inline-block;
102-
font-family: Arial;
103-
font-size: 14px;
104-
padding: 5px 10px;
105-
text-align: center;
106-
text-decoration: none;
107-
-webkit-animation: glowing 1500ms infinite;
108-
-moz-animation: glowing 1500ms infinite;
109-
-o-animation: glowing 1500ms infinite;
110-
animation: glowing 1500ms infinite;
111-
};
112-
@-webkit-keyframes glowing {
113-
0% { background-color: #B20000; -webkit-box-shadow: 0 0 3px #B20000; }
114-
50% { background-color: #FF0000; -webkit-box-shadow: 0 0 40px #FF0000; }
115-
100% { background-color: #B20000; -webkit-box-shadow: 0 0 3px #B20000; }
116-
}
117107

118-
@-moz-keyframes glowing {
119-
0% { background-color: #B20000; -moz-box-shadow: 0 0 3px #B20000; }
120-
50% { background-color: #FF0000; -moz-box-shadow: 0 0 40px #FF0000; }
121-
100% { background-color: #B20000; -moz-box-shadow: 0 0 3px #B20000; }
108+
.warning {
109+
height: 35px;
110+
background-color: #004a7f;
111+
-webkit-border-radius: 4px;
112+
border-radius: 4px;
113+
border: none;
114+
color: #ffffff;
115+
cursor: pointer;
116+
display: inline-block;
117+
font-family: Arial;
118+
font-size: 14px;
119+
padding: 5px 10px;
120+
text-align: center;
121+
text-decoration: none;
122+
-webkit-animation: glowing 1500ms infinite;
123+
-moz-animation: glowing 1500ms infinite;
124+
-o-animation: glowing 1500ms infinite;
125+
animation: glowing 1500ms infinite;
126+
}
127+
128+
@-webkit-keyframes glowing {
129+
0% {
130+
background-color: #b20000;
131+
-webkit-box-shadow: 0 0 3px #b20000;
132+
}
133+
50% {
134+
background-color: #ff0000;
135+
-webkit-box-shadow: 0 0 40px #ff0000;
122136
}
137+
100% {
138+
background-color: #b20000;
139+
-webkit-box-shadow: 0 0 3px #b20000;
140+
}
141+
}
123142

124-
@-o-keyframes glowing {
125-
0% { background-color: #B20000; box-shadow: 0 0 3px #B20000; }
126-
50% { background-color: #FF0000; box-shadow: 0 0 40px #FF0000; }
127-
100% { background-color: #B20000; box-shadow: 0 0 3px #B20000; }
143+
@-moz-keyframes glowing {
144+
0% {
145+
background-color: #b20000;
146+
-moz-box-shadow: 0 0 3px #b20000;
128147
}
148+
50% {
149+
background-color: #ff0000;
150+
-moz-box-shadow: 0 0 40px #ff0000;
151+
}
152+
100% {
153+
background-color: #b20000;
154+
-moz-box-shadow: 0 0 3px #b20000;
155+
}
156+
}
129157

130-
@keyframes glowing {
131-
0% { background-color: #B20000; box-shadow: 0 0 3px #B20000; }
132-
50% { background-color: #FF0000; box-shadow: 0 0 40px #FF0000; }
133-
100% { background-color: #B20000; box-shadow: 0 0 3px #B20000; }
158+
@-o-keyframes glowing {
159+
0% {
160+
background-color: #b20000;
161+
box-shadow: 0 0 3px #b20000;
134162
}
163+
50% {
164+
background-color: #ff0000;
165+
box-shadow: 0 0 40px #ff0000;
166+
}
167+
100% {
168+
background-color: #b20000;
169+
box-shadow: 0 0 3px #b20000;
170+
}
171+
}
135172

173+
@keyframes glowing {
174+
0% {
175+
background-color: #b20000;
176+
box-shadow: 0 0 3px #b20000;
177+
}
178+
50% {
179+
background-color: #ff0000;
180+
box-shadow: 0 0 40px #ff0000;
181+
}
182+
100% {
183+
background-color: #b20000;
184+
box-shadow: 0 0 3px #b20000;
185+
}
186+
}
136187

137-
138-
.happy {
188+
.happy {
139189
height: 35px;
140-
background-color: #004A7F;
141-
-webkit-border-radius: 4px;
142-
border-radius: 4px;
143-
border: none;
144-
color: #FFFFFF;
145-
cursor: pointer;
146-
display: inline-block;
147-
font-family: Arial;
148-
font-size: 14px;
149-
padding: 5px 10px;
150-
text-align: center;
151-
text-decoration: none;
152-
animation: glowing-happy 3500ms infinite;
153-
};
154-
155-
@keyframes glowing-happy {
156-
0% { background-color: #20599d; box-shadow: 0 0 10px #20599d; }
157-
50% { background-color: #216bad; box-shadow: 0 0 20px #216bad; }
158-
100% { background-color: #20599d; box-shadow: 0 0 10px #20599d; }
159-
}
190+
background-color: #004a7f;
191+
-webkit-border-radius: 4px;
192+
border-radius: 4px;
193+
border: none;
194+
color: #ffffff;
195+
cursor: pointer;
196+
display: inline-block;
197+
font-family: Arial;
198+
font-size: 14px;
199+
padding: 5px 10px;
200+
text-align: center;
201+
text-decoration: none;
202+
animation: glowing-happy 3500ms infinite;
203+
}
160204

205+
@keyframes glowing-happy {
206+
0% {
207+
background-color: #20599d;
208+
box-shadow: 0 0 10px #20599d;
209+
}
210+
50% {
211+
background-color: #216bad;
212+
box-shadow: 0 0 20px #216bad;
213+
}
214+
100% {
215+
background-color: #20599d;
216+
box-shadow: 0 0 10px #20599d;
217+
}
218+
}

‎frontend/src/app/browser-nav/browser-nav.component.scss

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
.linkbutton {
2-
max-height: 35px;
3-
height: 35px;
4-
display: inline-block;
2+
max-height: 35px;
3+
height: 35px;
4+
display: inline-block;
55
}
6-

‎frontend/src/app/credits/credits.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
.credits li {
2-
margin-bottom: 15px;
3-
}
2+
margin-bottom: 15px;
3+
}

‎frontend/src/app/download-indicator/download-indicator.component.scss

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1-
@import '../../theme.scss';
1+
@import "../../theme.scss";
22

33
@include mat-core();
44

55
.downloadCount {
6-
display: inline-block;
7-
font-size: 15px;
8-
margin-left: 5px;
9-
margin-top: 3px;
6+
display: inline-block;
7+
font-size: 15px;
8+
margin-left: 5px;
9+
margin-top: 3px;
1010
}
1111

1212
mat-icon {
13-
font-size: 24px;
13+
font-size: 24px;
1414
}
15+
1516
.nodownloads {
16-
font-size: 14px;
17-
padding: 5px;
18-
color: mat-color($my-app-warn);
19-
}
17+
font-size: 14px;
18+
padding: 5px;
19+
color: mat-color($my-app-warn);
20+
}

0 commit comments

Comments
 (0)