Skip to content

Commit cf4026e

Browse files
committed
Merge pull request Soundnode#321 from Pitros/visual-changes
Smaller graphical changes - player, following page, top frame, loading
2 parents 2f723b1 + 7bba397 commit cf4026e

File tree

6 files changed

+44
-21
lines changed

6 files changed

+44
-21
lines changed

app/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,14 @@ <h4 id="playerUser" class="player_user"></h4>
153153
</div>
154154
<div class="player_controls">
155155
<span class="player_prevSong" ng-click="prevSong($event)">
156-
<i class="fa fa-step-backward"></i>
156+
<i class="fa fa-step-backward thin"></i>
157157
</span>
158158
<span class="player_play-pause" ng-click="playPause($event)">
159159
<i class="fa fa-play"></i>
160-
<i class="fa fa-pause" ></i>
160+
<i class="fa fa-pause thin" ></i>
161161
</span>
162162
<span class="player_nextSong" ng-click="nextSong($event)">
163-
<i class="fa fa-step-forward"></i>
163+
<i class="fa fa-step-forward thin"></i>
164164
</span>
165165
</div>
166166
<div class="player_volume">

app/public/stylesheets/sass/_components/_config.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ $separatorDarkColor: #000;
77
$scColor: #f50;
88
$transitionValue: all 0.5s ease;
99
$transitionFastValue: all 0.25s ease;
10+
$transitionInstantValue: all 0.1s ease-out;
1011

1112
// HELPERS
1213
.ui-db {

app/public/stylesheets/sass/_components/_following.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
.following {}
1+
.following {
2+
display: flex;
3+
flex-direction: row;
4+
flex-wrap: wrap;
5+
justify-content: space-around;
6+
}
27

38
.following_item {
49
display: inline-block;

app/public/stylesheets/sass/_components/_loader.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
.box-loader {
22
display: block;
33
height: 35px;
4-
width: 250px;
4+
width: 300px;
55
position: absolute;
6+
text-align: center;
67
top: 50%;
78
left: 50%;
8-
margin-left: -125px;
9+
margin-left: -150px;
910
margin-top: -17px;
1011

1112
& > h4 {

app/public/stylesheets/sass/_components/_player.scss

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
.player_details {
3030
width: 300px;
3131
flex: 1;
32-
padding: 0 10px;
32+
padding: 0 5px;
3333
}
3434

3535
.player_user {
@@ -58,6 +58,9 @@
5858
& .fa {
5959
font-size: 20px;
6060
color: #FFF;
61+
&.thin::before {
62+
-webkit-text-stroke: 1px #000;
63+
}
6164
}
6265
}
6366

@@ -144,8 +147,12 @@
144147
box-sizing: content-box;
145148

146149
&:hover {
147-
& .player_progress_bar::before, & .player_progress_bar::after {
148-
opacity: 1;
150+
& .player_progress_bar::before {
151+
background: rgba(255, 255, 255, 0.2);
152+
}
153+
154+
& .player_progress_bar::after {
155+
transform: scale(1);
149156
}
150157
}
151158

@@ -161,10 +168,9 @@
161168
display: block;
162169
height: 4px;
163170
width: 100%;
164-
background: rgba(255, 255, 255, 0.29);
171+
background: rgba(0, 0, 0, 0.15);
165172
z-index: -1;
166-
transition: $transitionFastValue;
167-
opacity: 0;
173+
transition: $transitionInstantValue;
168174
}
169175

170176
&::after {
@@ -179,8 +185,8 @@
179185
background: rgb(255, 122, 0);
180186
border-radius: 50%;
181187
box-shadow: 0 0 2px 0 #000;
182-
opacity: 0;
183-
transition: $transitionFastValue;
188+
transform: scale(0);
189+
transition: $transitionInstantValue;
184190
}
185191
}
186192
}

app/public/stylesheets/sass/_components/_topFrame.scss

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,16 @@
2121
}
2222
.windowAction_item {
2323
float: left;
24-
margin: 0 10px;
24+
margin: 10px 10px 0;
2525
font-size: 10px;
2626
cursor: pointer;
2727
border-radius: 15px;
2828
padding: 2px 4px;
2929
letter-spacing: 0;
30-
margin-top: 10px;
30+
31+
&:hover .fa {
32+
color: $defaultColor;
33+
}
3134

3235
& .fa {
3336
cursor: pointer;
@@ -75,15 +78,22 @@
7578

7679
& li {
7780
margin: 0;
78-
padding: 8px 10px 8px;
81+
padding: 7px 10px 7px;
7982
border-radius: 0;
8083
&:hover {
81-
background: $separatorCleanColor;
84+
background: #2C2C2C;
85+
.fa {
86+
color: #FFF;
87+
}
8288
}
8389
}
8490

91+
& #minimizeApp {
92+
padding: 10px 10px 4px;
93+
}
94+
8595
& #closeApp {
86-
padding: 8px 15px 8px;
96+
padding: 6px 20px 8px;
8797
background: #390000;
8898
&:hover {
8999
background: #530000;
@@ -149,12 +159,12 @@
149159

150160
@media (max-width: 940px) {
151161
.topbarSearch {
152-
width: 15%;
162+
width: 25%;
153163
}
154164
}
155165

156166
@media (min-width: 940px) {
157167
.topbarSearch {
158-
width: 25%;
168+
width: 35%;
159169
}
160170
}

0 commit comments

Comments
 (0)