Skip to content

Commit 9fa7a8e

Browse files
authored
Merge pull request #1034 from jakejarrett/redesign
Redesign search dropdown
2 parents 2792481 + a23a391 commit 9fa7a8e

File tree

4 files changed

+57
-34
lines changed

4 files changed

+57
-34
lines changed

app/index.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ <h4>Starting application.</h4>
3535
<header class="topFrame">
3636
<div class="headerActionsApp"></div>
3737

38+
<ul class="appInfo">
39+
<li class="appInfo_item subNav settingsApp"></li>
40+
<li class="appInfo_item" ng-controller="UpdaterCtrl">
41+
<a href="http://www.soundnodeapp.com" target="_blank" open-external ng-class="{ updateAvailable: updateAvailable }" data-link="true"> update available! </a>
42+
</li>
43+
</ul>
44+
3845
<ul class="topbarSearch">
3946
<!-- search -->
4047
<div class="search" ng-controller="SearchInputCtrl">
@@ -49,13 +56,6 @@ <h4>Starting application.</h4>
4956
</div>
5057
<!-- search / end -->
5158
</ul>
52-
53-
<ul class="appInfo">
54-
<li class="appInfo_item subNav settingsApp"></li>
55-
<li class="appInfo_item" ng-controller="UpdaterCtrl">
56-
<a href="http://www.soundnodeapp.com" target="_blank" open-external ng-class="{ updateAvailable: updateAvailable }" data-link="true"> update available! </a>
57-
</li>
58-
</ul>
5959
</header>
6060
<!-- header / end -->
6161

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
.dropdown {
22
position: absolute;
3-
top: 36px;
3+
top: 46px;
44
z-index: 1000;
55
display: none;
66
min-width: 160px;
7-
padding: 5px 0;
7+
padding: 0;
88
margin: 2px 0 0;
99
list-style: none;
1010
font-size: 13px;
11-
background-color: $sectionBackground;
12-
border-radius: 0 0 2px 2px;
13-
box-shadow: 0 6px 12px 5px rgba(0, 0, 0, 0.3);
11+
background-color: #111;
12+
border-radius: 0 0 7px 7px;
13+
box-shadow: 2px 2px 20px 2px #000000;
1414
width: 100%;
15+
overflow: hidden;
1516
}
1617

17-
.artist-container {
18+
.artist-container, .tracks-container {
1819
margin-bottom: 10px;
1920
}
2021

@@ -23,34 +24,43 @@
2324
padding: 10px 10px 10px 10px;
2425
text-align: left;
2526

27+
&, & h4 {
28+
cursor: pointer;
29+
}
30+
2631
& img {
2732
margin-right: 10px;
2833
width: 25px;
2934
height: 25px;
3035
}
3136

3237
&:hover {
33-
cursor: pointer;
38+
background: rgba(0, 0, 0, 0.4);
39+
3440
& h4 {
41+
font-weight: 700;
3542
color: #FFF;
36-
cursor: pointer;
3743
}
3844
}
3945
}
4046

4147
.dropdown h3, .dropdown h4 {
42-
color: $defaultColor;
43-
font-weight: 400;
48+
color: #ffffff;
49+
font-weight: 600;
4450
}
4551

4652
.dropdown h3 {
4753
text-align: left;
4854
text-transform: uppercase;
4955
font-size: 13px;
5056
&.dropdown-title {
51-
padding: 5px 10px;
52-
color: $linkColor;
53-
border-left: 1px solid $linkColor;
57+
color: $scColor;
58+
border-left: 5px solid $scColor;
59+
text-shadow: 1px 1px 4px rgba(0, 0, 0, 0.6);
60+
background: rgba(0, 0, 0, 0.3);
61+
padding: 10px;
62+
will-change: padding-left;
63+
transition: all 0.3s ease-in-out;
5464
}
5565
}
5666

@@ -62,14 +72,17 @@
6272
}
6373

6474
.dropdown h3.show-all {
65-
padding: 5px 10px;
66-
text-align: right;
67-
font-size: 12px;
68-
margin-top: 10px;
69-
border-right: 1px solid $linkColor;
75+
color: $scColor;
76+
border-left: 5px solid $scColor;
77+
text-shadow: 1px 1px 4px rgba(0, 0, 0, 0.6);
78+
background: rgba(0, 0, 0, 0.3);
79+
padding: 10px;
80+
will-change: padding-left;
81+
transition: all 0.3s ease-in-out;
7082

7183
&:hover {
7284
color: #FFF;
7385
cursor: pointer;
86+
padding-left: 15px;
7487
}
7588
}

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

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
& .search-icon {
1111
position: absolute;
12-
top: 10px;
12+
top: 6px;
1313
right: 5px;
1414
color: $defaultColor;
1515
transition: $transitionFastValue;
@@ -23,21 +23,29 @@
2323
border-bottom: 1px solid $separatorCleanColor;
2424
background: transparent;
2525
border-radius: 0;
26-
color: $defaultColor;
26+
color: #ffffff;
2727
height: auto;
2828
padding: 5px 5px 5px;
2929
width: 100%;
30+
font-weight: 700;
31+
3032
&:focus {
3133
box-shadow: none;
32-
border-bottom-color: $linkColor;
33-
color: $linkColor;
34-
& +.search-icon {
35-
color: $linkColor;
36-
}
34+
border-bottom-color: #ffffff;
35+
36+
& +.search-icon {
37+
color: #ffffff;
38+
}
3739
}
40+
3841
&:hover {
3942
cursor: text;
4043
}
44+
45+
::-webkit-input-placeholder { /* Chrome/Opera/Safari */
46+
color: #ffffff;
47+
font-weight: 400;
48+
}
4149
}
4250

4351
.searchButton {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,10 @@
145145
}
146146

147147
.topbarSearch {
148-
position: absolute;
149-
left: 205px;
148+
position: relative;
149+
float: right;
150+
margin-right: 10px;
151+
max-width: 500px;
150152
-webkit-app-region: no-drag;
151153
}
152154

0 commit comments

Comments
 (0)