Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

make both sidebar and main scrollable independently

Browse source
This commit is contained in:
Felix Niklas 2014-07-08 16:36:40 +02:00
parent 2d853ff3bf
commit 63556b2d45
2 changed files with 32 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/lib/app_post/interface_handle.js.coffee
View file

@ -47,7 +47,7 @@ class App.Run extends App.Controller
App.Event.trigger( event + ':ready') App.Event.trigger( event + ':ready')
class App.Content extends App.Controller class App.Content extends App.Controller
className: 'content flex' className: 'content flex horizontal stretch'
constructor: -> constructor: ->
super super

41
app/assets/stylesheets/zzz.css.erb
View file

@ -1190,13 +1190,13 @@ footer {
} }
.search { .search {
padding: 10px; padding: 10px 15px 10px 10px;
border-bottom: 1px solid rgba(240, 250, 255, .05); border-bottom: 1px solid rgba(240, 250, 255, .05);
} }
.search input { .search input {
padding: 5px 10px 5px 33px; padding: 5px 10px 5px 33px;
margin-right: 10px; margin-right: 15px;
width: 100px; width: 100px;
height: 30px; height: 30px;
color: #ECECEC; color: #ECECEC;
@ -1207,11 +1207,18 @@ footer {
border-radius: 15px; border-radius: 15px;
} }
.search .logo {
cursor: pointer;
}
.navbar_l2 {
overflow: hidden;
height: 100%;
}
.sidebar { .sidebar {
width: 270px; width: 270px;
min-height: 100%; padding: 1px 20px 20px;
height: 100%;
padding: 1px 20px;
background: white; background: white;
border-right: 1px solid #e6e6e6; border-right: 1px solid #e6e6e6;
overflow: auto; overflow: auto;
@ -1221,22 +1228,26 @@ footer {
margin-top: 0; margin-top: 0;
} }
.nav-stacked > li:first-child a { .nav-stacked > li:last-child a {
border-top: 1px solid #f2f2f3; border-bottom: 1px solid #f2f2f3;
} }
.nav-pills > li > a { .nav-pills > li > a {
color: #0f94d6; color: #0f94d6;
border-radius: 0; border-radius: 0;
padding: 8px 10px; padding: 8px 0;
margin-left: -10px; border-top: 1px solid #f2f2f3;
border-bottom: 1px solid #f2f2f3;
} }
.nav-pills > li:hover > a { .nav-pills > li:hover > a {
background: #f2f2f3; background: #f2f2f3;
} }
.nav-pills > li:hover > a,
.nav-pills > li:hover + li > a {
border-color: transparent;
}
.nav-pills > li.active > a, .nav-pills > li.active > a,
.nav-pills > li.active > a:hover, .nav-pills > li.active > a:hover,
.nav-pills > li.active > a:focus { .nav-pills > li.active > a:focus {
@ -1244,6 +1255,16 @@ footer {
background: #2c2d36; background: #2c2d36;
} }
.nav-pills > li:hover > a,
.nav-pills > li.active > a,
.nav-pills > li.active > a:hover,
.nav-pills > li.active > a:focus {
padding-left: 10px;
padding-right: 10px;
margin-left: -10px;
margin-right: -10px;
}
.main { .main {
padding: 10px 20px; padding: 10px 20px;
background: #f8f9fa; background: #f8f9fa;