Skip to content

Commit e1e1b84

Browse files
marcgurneykangas
authored andcommitted
INT-110 added scout logo, updated sidebar to brand slate color
Fixes #65
1 parent c06aac1 commit e1e1b84

File tree

7 files changed

+49
-30
lines changed

7 files changed

+49
-30
lines changed

images/logo-scout-on-dark.png

3.97 KB
Loading

src/home/collection.jade

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@
1414
.splitter
1515
button.btn.btn-link.splitter-button.splitter-button-open
1616
i.fa.fa-caret-left
17+
|
1718
i.fa.fa-file-text-o
1819

1920
button.btn.btn-link.splitter-button.splitter-button-close
2021
i.fa.fa-file-text-o
22+
|
2123
i.fa.fa-caret-right
2224
.column.side
2325
div(data-hook='documents-subview')

src/sidebar/collection-filter.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
.panel-heading.list-filter
1+
.list-filter
22
i.search.octicon-search
33
input(type='search', placeholder='filter sources', data-hook='search')

src/sidebar/index.jade

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
div
22
.sidebar.panel
3+
div.scout-logo
34
div(data-hook='collection-filter-subview')
45
div(data-hook='collection-list-subview')
56
div(data-hook='sidebar-control-subview')

src/sidebar/sidebar-controls.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
.sidebar-controls
2-
.panel-heading.list-filter
2+
.list-filter
33
i.search.octicon-search
44
input(type='search', placeholder='filter fields', data-hook='search')

styles/palette.less

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
/* commented colors have been deprecated */
33
@green0: #365221;
44
@green1: #507b32;
5-
@green2: #6ba442;
6-
@green3: #89b668;
5+
@green2: #67b144;
6+
@green3: #86bc63;
77
@green4: #a6c88e;
88
@green5: #c4dbb3;
99

@@ -19,6 +19,9 @@
1919
@gray7: #ebebed;
2020
@gray8: #f5f6f7;
2121

22+
@slate0: #4c5259;
23+
@slate1: #70757a;
24+
2225
@blue3: #5b81a9; // TODO: deprecate
2326
@blue4: #84a1bf; // TODO: deprecate
2427
@blue5: #adc0d4; // TODO: deprecate

styles/sidebar.less

Lines changed: 39 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
@sidebar-bg: @pw;
2-
@sidebar-border: @gray7;
1+
@sidebar-bg: @slate0;
32
@sidebar-width: 220px;
43

54
.sidebar {
@@ -9,58 +8,72 @@
98
-webkit-transform: translateZ(0);
109
margin-bottom: 0;
1110

11+
.scout-logo {
12+
background: @slate1 url("/images/logo-scout-on-dark.png") center center no-repeat;
13+
background-size: 140px 28px;
14+
width: @sidebar-width;
15+
height: 72px;
16+
}
17+
1218
.list-filter {
13-
margin: 12px 0;
19+
padding: 12px;
20+
box-shadow: 0 2px 0 rgba(0,0,0,0.2);
1421

1522
i.search {
1623
.octicon;
1724
position: absolute;
1825
margin-top: 9px;
1926
margin-left: 10px;
20-
color: @gray3;
27+
color: @gray5;
2128
}
2229
input {
23-
.form-control;
2430
padding: 5px 5px 5px 30px;
2531
height: auto;
26-
background: @pw;
27-
// border-color: @gray6;
32+
background: @slate0;
33+
color: @pw;
34+
width: 100%;
35+
border: 1px solid lighten(@slate0, 5%);
2836
}
2937
input[type=search] {
3038
border-radius: 18px;
3139
}
3240
}
3341

42+
.panel-title {
43+
color: @gray5;
44+
}
3445
.list-group {
3546
line-height: 24px;
36-
// height: 100%;
3747
position: absolute;
38-
top: 72px;
39-
bottom: 180px;
48+
top: 128px;
49+
bottom: 60px;
4050
overflow-y: auto;
4151
width: 100%;
52+
z-index: -1;
4253

4354
.list-group-item {
4455
cursor: pointer;
4556
border-top-width: 0;
4657
border-bottom-width: 0;
47-
padding: 0 6px;
48-
color: @gray3;
49-
border-left: 4px solid transparent;
58+
padding: 0;
59+
background: none;
60+
color: @gray5;
5061

5162
a {
5263
display: block;
53-
color: @gray3;
64+
color: @gray5;
65+
padding: 0 6px;
5466
text-decoration: none;
55-
max-width: 190px;
5667
white-space: nowrap;
5768
overflow: hidden;
5869
text-overflow: ellipsis;
70+
border-left: 4px solid transparent;
5971

6072
&:hover {
61-
color: @gray3;
73+
color: @pw;
6274
text-decoration: none;
63-
background: @gray8;
75+
background: lighten(@slate0, 5%);
76+
border-left: 4px solid lighten(@slate0, 5%);
6477
}
6578
}
6679
i {
@@ -70,13 +83,13 @@
7083
}
7184
&.active {
7285
background: none;
73-
border-left: 4px solid @green2;
7486

7587
a {
76-
color: @green2;
88+
color: @green3;
89+
border-left: 4px solid @green3;
7790
}
7891
i {
79-
color: @green2;
92+
color: @green3;
8093
}
8194
.list-group-item-heading {
8295
color: @green2;
@@ -88,12 +101,13 @@
88101
}
89102
.sidebar-controls {
90103
position: absolute;
104+
width: @sidebar-width;
91105
bottom: 0;
92-
width: 218px;
93-
height: 174px;
94-
border-top: 2px solid @sidebar-border;
95-
// background: url(/images/fake-sidebar-controls.png) 0 0 no-repeat;
96-
// background-size: 218px 174px;
106+
height: 60px;
107+
108+
.list-filter {
109+
box-shadow: 0 -2px 0 rgba(0,0,0,0.2);
110+
}
97111
}
98112
}
99113

@@ -103,7 +117,6 @@
103117
bottom: 0;
104118
width: 220px;
105119
background: @sidebar-bg;
106-
border-right: 2px solid @sidebar-border;
107120
border-left-width: 0;
108121
border-top-width: 0;
109122
border-bottom-width: 0;

0 commit comments

Comments
 (0)