diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-30 00:30:25 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-30 00:30:25 -0500 |
| commit | e2b6e9c3c531649535e47de0814dd4cb651411fa (patch) | |
| tree | 61f47d00c4f0c86bb6de536364d2e297b26ad5a0 /app/assets | |
| parent | 541fcc37bf0c8979cc1495b63ac71912cc28f825 (diff) | |
| download | gitlab-ce-e2b6e9c3c531649535e47de0814dd4cb651411fa.tar.gz | |
Add ajax calls to return JSON
Fix subtitles on minimize.
Fix styles for show.
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/mobile.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/mobile.scss b/app/assets/stylesheets/framework/mobile.scss index 0997dfc287c..3bfac2ad9b5 100644 --- a/app/assets/stylesheets/framework/mobile.scss +++ b/app/assets/stylesheets/framework/mobile.scss @@ -116,7 +116,7 @@ display: none; } - aside { + aside:not(.right-sidebar){ display: none; } diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 1616c140c0d..b7f532c0771 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -284,6 +284,15 @@ @include collapsed-sidebar; } + .page-gutter { + &.right-sidebar-collapsed { + @include collapsed-gutter; + } + &.right-sidebar-expanded { + @include expanded-gutter; + } + } + .collapse-nav { display: none; } |