summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-02-21 13:20:38 -0600
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-02-21 13:20:38 -0600
commitc468ad75f4dba1833b139e7949dc0fa0c75c74dc (patch)
tree6b0c2e34fbebcecfa59bb818bb09b538e2aa7a23
parent459a97d46812fecc59c973bad356935422c7f60e (diff)
downloadgitlab-ce-c468ad75f4dba1833b139e7949dc0fa0c75c74dc.tar.gz
Keep right padding the same whether sidebar is open or not28495-content-shifting
-rw-r--r--app/assets/stylesheets/framework/sidebar.scss16
1 files changed, 6 insertions, 10 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index d09b1c9d7f5..040a7ce0c16 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -29,14 +29,16 @@
}
}
+@media (min-width: $screen-sm-min) {
+ .content-wrapper {
+ padding-right: $gutter_collapsed_width;
+ }
+}
+
.right-sidebar-collapsed {
padding-right: 0;
@media (min-width: $screen-sm-min) {
- .content-wrapper {
- padding-right: $gutter_collapsed_width;
- }
-
.merge-request-tabs-holder.affix {
right: $gutter_collapsed_width;
}
@@ -54,12 +56,6 @@
.right-sidebar-expanded {
padding-right: 0;
- @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
- &:not(.build-sidebar):not(.wiki-sidebar) {
- padding-right: $gutter_collapsed_width;
- }
- }
-
@media (min-width: $screen-md-min) {
.content-wrapper {
padding-right: $gutter_width;