diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-18 13:11:35 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-23 17:15:14 +0000 |
| commit | e94482d1497cf6e1922261be48e5ebdcc33f44ae (patch) | |
| tree | 2518ed5c0c03ba902f41a788c38c62f2b3481434 | |
| parent | 0e85a8b816be62b3ef8d854630b015eb4b29398d (diff) | |
| download | gitlab-ce-e94482d1497cf6e1922261be48e5ebdcc33f44ae.tar.gz | |
Issue sidebar overlaps on tablet
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 6107c8a6d0a..769477ea4a9 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -27,14 +27,15 @@ } &.right-sidebar-expanded { - /* Extra small devices (phones, less than 768px) */ - /* No media query since this is the default in Bootstrap */ padding-right: 0; - /* Small devices (tablets, 768px and up) */ - @media (min-width: $screen-sm-min) { - padding-right: $gutter_width; + + @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { + padding-right: $sidebar_collapsed_width; } + @media (min-width: $screen-md-min) { + padding-right: $gutter_width; + } } } @@ -209,15 +210,6 @@ padding-left: $sidebar_width; } - &.right-sidebar-collapsed { - /* Extra small devices (phones, less than 768px) */ - padding-right: 0; - /* Small devices (tablets, 768px and up) */ - @media (min-width: $screen-sm-min) { - padding-right: $sidebar_collapsed_width; - } - } - .sidebar-wrapper { width: $sidebar_width; @@ -241,9 +233,8 @@ padding-left: $sidebar_collapsed_width; &.right-sidebar-collapsed { - /* Extra small devices (phones, less than 768px) */ padding-right: 0; - /* Small devices (tablets, 768px and up) */ + @media (min-width: $screen-sm-min) { padding-right: $sidebar_collapsed_width; } |