diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2015-03-12 09:32:52 -0700 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-03-12 09:32:52 -0700 |
| commit | ec1c30ceecec9c0c4a1bd3f097e03d57d724e299 (patch) | |
| tree | 42423222bd84d22db1d4935bf1f4bae9b3c979fd | |
| parent | d377e94b35c1af8ab933427e067966101634d6d8 (diff) | |
| parent | e4dc4390e57efa0b8207d63b4446c019580d00aa (diff) | |
| download | gitlab-ce-ec1c30ceecec9c0c4a1bd3f097e03d57d724e299.tar.gz | |
Merge branch 'hover_toggle_sidebar'
Conflicts:
app/assets/stylesheets/generic/nav_sidebar.scss
| -rw-r--r-- | app/assets/stylesheets/generic/nav_sidebar.scss | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/app/assets/stylesheets/generic/nav_sidebar.scss b/app/assets/stylesheets/generic/nav_sidebar.scss index 4bf2c609be0..c14f12284da 100644 --- a/app/assets/stylesheets/generic/nav_sidebar.scss +++ b/app/assets/stylesheets/generic/nav_sidebar.scss @@ -147,7 +147,7 @@ .collapse-nav a { left: 0px; - padding: 5px 23px 3px 22px; + padding: 7px 23px 3px 22px; } } } @@ -155,12 +155,19 @@ .collapse-nav a { position: fixed; top: 46px; - padding: 5px 13px 3px 13px; + padding: 5px 13px 5px 13px; left: 197px; font-size: 13px; background: #EEE; color: black; - border: 1px solid rgba(0,0,0,0.035); + border-left: 1px solid rgba(0,0,0,0.035); + border-right: 1px solid rgba(0,0,0,0.035); +} + +.collapse-nav a:hover { + text-decoration: none; + color: #333; + background: #eaeaea; } @media (max-width: $screen-md-max) { |