From 1b6ebd17179b610f832d5a1cfda866167124bb1c Mon Sep 17 00:00:00 2001 From: Stephan van Leeuwen Date: Fri, 26 Dec 2014 15:29:02 +0100 Subject: Updated sidebar style to span the whole height. --- app/assets/stylesheets/sections/sidebar.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/sections/sidebar.scss b/app/assets/stylesheets/sections/sidebar.scss index 51d6b2c920c..b836e566a10 100644 --- a/app/assets/stylesheets/sections/sidebar.scss +++ b/app/assets/stylesheets/sections/sidebar.scss @@ -104,10 +104,11 @@ .sidebar-wrapper { width: 250px; - position: absolute; + position: fixed; left: 250px; height: 100%; margin-left: -250px; + border-right: 1px solid #EAEAEA; .nav-sidebar { margin-top: 20px; @@ -119,7 +120,6 @@ .content-wrapper { padding: 20px; - border-left: 1px solid #EAEAEA; } } -- cgit v1.2.1 From 071ad02c027ac14e0944e957664fc24c82b720c3 Mon Sep 17 00:00:00 2001 From: Stephan van Leeuwen Date: Fri, 26 Dec 2014 15:29:19 +0100 Subject: Updated mobile sidebar to allow scrolling --- app/assets/stylesheets/sections/sidebar.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/sections/sidebar.scss b/app/assets/stylesheets/sections/sidebar.scss index b836e566a10..697e9d20231 100644 --- a/app/assets/stylesheets/sections/sidebar.scss +++ b/app/assets/stylesheets/sections/sidebar.scss @@ -130,14 +130,16 @@ .sidebar-wrapper { width: 52px; - position: absolute; + position: fixed; left: 50px; height: 100%; margin-left: -50px; + border-right: 1px solid #EAEAEA; + overflow-x: hidden; .nav-sidebar { margin-top: 20px; - position: fixed; + position: absolute; top: 45px; width: 52px; -- cgit v1.2.1 From 6342bc299457a2b298e8cb556bcd55efe1bbe030 Mon Sep 17 00:00:00 2001 From: Stephan van Leeuwen Date: Sat, 27 Dec 2014 20:08:29 +0100 Subject: Changed header to stay at the top of the page. --- app/assets/stylesheets/generic/common.scss | 2 +- app/assets/stylesheets/sections/header.scss | 3 +++ app/assets/stylesheets/sections/sidebar.scss | 5 +++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss index 2fc738c18d8..fa25757cfc3 100644 --- a/app/assets/stylesheets/generic/common.scss +++ b/app/assets/stylesheets/generic/common.scss @@ -282,7 +282,7 @@ img.emoji { } .navless-container { - margin-top: 20px; + margin-top: 68px; } .description-block { diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss index db419f76532..33a37ee6d7a 100644 --- a/app/assets/stylesheets/sections/header.scss +++ b/app/assets/stylesheets/sections/header.scss @@ -7,6 +7,9 @@ header { margin-bottom: 0; min-height: 40px; border: none; + position: fixed; + top: 0; + width: 100%; .navbar-inner { filter: none; diff --git a/app/assets/stylesheets/sections/sidebar.scss b/app/assets/stylesheets/sections/sidebar.scss index 697e9d20231..d03f73f2872 100644 --- a/app/assets/stylesheets/sections/sidebar.scss +++ b/app/assets/stylesheets/sections/sidebar.scss @@ -11,6 +11,7 @@ width: 100%; padding: 15px; background: #FFF; + margin-top: 48px; } .nav-sidebar { @@ -131,9 +132,9 @@ .sidebar-wrapper { width: 52px; position: fixed; - left: 50px; + top: 0; + left: 0; height: 100%; - margin-left: -50px; border-right: 1px solid #EAEAEA; overflow-x: hidden; -- cgit v1.2.1