Skip to content

Commit 06d0ae9

Browse files
committed
Merge pull request #33 from 10gen/INT-162
INT-162, INT-142 - Add some fake UI and fix scroll-to-end bug in sidebar collection list
2 parents 32dd021 + 1d1b77b commit 06d0ae9

File tree

4 files changed

+15
-3
lines changed

4 files changed

+15
-3
lines changed
11.4 KB
Loading
11.4 KB
Loading

scout-style/sidebar.less

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828

2929
.list-group {
3030
line-height: 24px;
31-
height: 100%;
31+
// height: 100%;
32+
position: absolute;
33+
top: 72px;
34+
bottom: 180px;
3235
overflow: scroll;
3336

3437
.list-group-item {
@@ -77,9 +80,18 @@
7780
}
7881
}
7982
}
83+
.sidebar-controls {
84+
position: absolute;
85+
bottom: 0;
86+
width: 218px;
87+
height: 174px;
88+
border-top: 2px solid @sidebar-border;
89+
background: url(/images/fake-sidebar-controls.png) 0 0 no-repeat;
90+
background-size: 218px 174px;
91+
}
8092
}
8193

82-
.sidebar, .sidebar-bg {
94+
.sidebar {
8395
top: 0px;
8496
left: 0;
8597
bottom: 0;

scout-ui/src/sidebar/index.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ div
22
.sidebar.panel
33
div(data-hook='collections-filter')
44
div(data-hook='collections')
5-
.sidebar-bg
5+
.sidebar-controls

0 commit comments

Comments
 (0)