Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added images/logo-scout-on-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/home/collection.jade
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@
.splitter
button.btn.btn-link.splitter-button.splitter-button-open
i.fa.fa-caret-left
|
i.fa.fa-file-text-o

button.btn.btn-link.splitter-button.splitter-button-close
i.fa.fa-file-text-o
|
i.fa.fa-caret-right
.column.side
div(data-hook='documents-subview')
2 changes: 1 addition & 1 deletion src/sidebar/collection-filter.jade
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.panel-heading.list-filter
.list-filter
i.search.octicon-search
input(type='search', placeholder='filter sources', data-hook='search')
1 change: 1 addition & 0 deletions src/sidebar/index.jade
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
div
.sidebar.panel
div.scout-logo
div(data-hook='collection-filter-subview')
div(data-hook='collection-list-subview')
div(data-hook='sidebar-control-subview')
2 changes: 1 addition & 1 deletion src/sidebar/sidebar-controls.jade
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.sidebar-controls
.panel-heading.list-filter
.list-filter
i.search.octicon-search
input(type='search', placeholder='filter fields', data-hook='search')
7 changes: 5 additions & 2 deletions styles/palette.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
/* commented colors have been deprecated */
@green0: #365221;
@green1: #507b32;
@green2: #6ba442;
@green3: #89b668;
@green2: #67b144;
@green3: #86bc63;
@green4: #a6c88e;
@green5: #c4dbb3;

Expand All @@ -19,6 +19,9 @@
@gray7: #ebebed;
@gray8: #f5f6f7;

@slate0: #4c5259;
@slate1: #70757a;

@blue3: #5b81a9; // TODO: deprecate
@blue4: #84a1bf; // TODO: deprecate
@blue5: #adc0d4; // TODO: deprecate
Expand Down
65 changes: 39 additions & 26 deletions styles/sidebar.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@sidebar-bg: @pw;
@sidebar-border: @gray7;
@sidebar-bg: @slate0;
@sidebar-width: 220px;

.sidebar {
Expand All @@ -9,58 +8,72 @@
-webkit-transform: translateZ(0);
margin-bottom: 0;

.scout-logo {
background: @slate1 url("/images/logo-scout-on-dark.png") center center no-repeat;
background-size: 140px 28px;
width: @sidebar-width;
height: 72px;
}

.list-filter {
margin: 12px 0;
padding: 12px;
box-shadow: 0 2px 0 rgba(0,0,0,0.2);

i.search {
.octicon;
position: absolute;
margin-top: 9px;
margin-left: 10px;
color: @gray3;
color: @gray5;
}
input {
.form-control;
padding: 5px 5px 5px 30px;
height: auto;
background: @pw;
// border-color: @gray6;
background: @slate0;
color: @pw;
width: 100%;
border: 1px solid lighten(@slate0, 5%);
}
input[type=search] {
border-radius: 18px;
}
}

.panel-title {
color: @gray5;
}
.list-group {
line-height: 24px;
// height: 100%;
position: absolute;
top: 72px;
bottom: 180px;
top: 128px;
bottom: 60px;
overflow-y: auto;
width: 100%;
z-index: -1;

.list-group-item {
cursor: pointer;
border-top-width: 0;
border-bottom-width: 0;
padding: 0 6px;
color: @gray3;
border-left: 4px solid transparent;
padding: 0;
background: none;
color: @gray5;

a {
display: block;
color: @gray3;
color: @gray5;
padding: 0 6px;
text-decoration: none;
max-width: 190px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
border-left: 4px solid transparent;

&:hover {
color: @gray3;
color: @pw;
text-decoration: none;
background: @gray8;
background: lighten(@slate0, 5%);
border-left: 4px solid lighten(@slate0, 5%);
}
}
i {
Expand All @@ -70,13 +83,13 @@
}
&.active {
background: none;
border-left: 4px solid @green2;

a {
color: @green2;
color: @green3;
border-left: 4px solid @green3;
}
i {
color: @green2;
color: @green3;
}
.list-group-item-heading {
color: @green2;
Expand All @@ -88,12 +101,13 @@
}
.sidebar-controls {
position: absolute;
width: @sidebar-width;
bottom: 0;
width: 218px;
height: 174px;
border-top: 2px solid @sidebar-border;
// background: url(/images/fake-sidebar-controls.png) 0 0 no-repeat;
// background-size: 218px 174px;
height: 60px;

.list-filter {
box-shadow: 0 -2px 0 rgba(0,0,0,0.2);
}
}
}

Expand All @@ -103,7 +117,6 @@
bottom: 0;
width: 220px;
background: @sidebar-bg;
border-right: 2px solid @sidebar-border;
border-left-width: 0;
border-top-width: 0;
border-bottom-width: 0;
Expand Down