diff options
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 20 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 7 |
2 files changed, 13 insertions, 14 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index 23e8a121bcc..6b382e4b1b2 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -206,9 +206,9 @@ padding-left: $sidebar_width; &.right-sidebar-collapsed { - @media (max-width: $screen-sm-max) { - padding-right: 0; - } + /* 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; } @@ -237,9 +237,9 @@ padding-left: $sidebar_collapsed_width; &.right-sidebar-collapsed { - @media (max-width: $screen-sm-max) { - padding-right: 0; - } + /* 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; } @@ -309,10 +309,10 @@ } .page-sidebar-collapsed { - @media (max-width: $screen-sm-max) { - @include collapsed-sidebar; - padding-right: 0; - } + /* Extra small devices (phones, less than 768px) */ + @include collapsed-sidebar; + padding-right: 0; + /* Small devices (tablets, 768px and up) */ @media (min-width: $screen-sm-min) { @include collapsed-sidebar; } diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 968de90c00d..1310e6ad7c7 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -183,10 +183,9 @@ } &.right-sidebar-collapsed { - - @media (max-width: $screen-sm-max) { - display: none; - } + /* Extra small devices (phones, less than 768px) */ + display: none; + /* Small devices (tablets, 768px and up) */ @media (min-width: $screen-sm-min) { display: block } |