diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-03-04 08:53:02 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-03-04 09:06:57 -0500 |
| commit | d98dc53106181f695cadd2b9a3a18de5a2a0b485 (patch) | |
| tree | 60cd6b73f9d241fa8c4875273b10e422fe98613e | |
| parent | 614cd8d12e5970967b9eab789665c2a195ddbba7 (diff) | |
| download | gitlab-ce-d98dc53106181f695cadd2b9a3a18de5a2a0b485.tar.gz | |
Correct media queries for small devices and tablets.
| -rw-r--r-- | app/assets/stylesheets/framework/issue_box.scss | 11 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/sidebar.scss | 7 | ||||
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 4 |
3 files changed, 13 insertions, 9 deletions
diff --git a/app/assets/stylesheets/framework/issue_box.scss b/app/assets/stylesheets/framework/issue_box.scss index 2b72c249368..77a00586b26 100644 --- a/app/assets/stylesheets/framework/issue_box.scss +++ b/app/assets/stylesheets/framework/issue_box.scss @@ -5,14 +5,17 @@ */ .status-box { - @media (max-width: $screen-sm-max) { - padding: 5px 11px; - margin-top: 4px; - } + + /* Extra small devices (phones, less than 768px) */ + /* No media query since this is the default in Bootstrap */ + padding: 5px 11px; + margin-top: 4px; + /* Small devices (tablets, 768px and up) */ @media (min-width: $screen-sm-min) { padding: 0 $gl-btn-padding; margin-top: 5px; } + @include border-radius(3px); display: block; float: left; diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index ddc9ccad62d..23e8a121bcc 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -27,9 +27,10 @@ } &.right-sidebar-expanded { - @media (max-width: $screen-sm-max) { - padding-right: 0; - } + /* 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; } diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index e8ab7f7af72..6cc5ce44b43 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -11,12 +11,12 @@ %span.hidden-xs Closed %span.hidden-sm.hidden-md.hidden-lg - =icon('check') + = icon('check') .status-box{ class: "status-box-open #{issue_button_visibility(@issue, true)}"} %span.hidden-xs Open %span.hidden-sm.hidden-md.hidden-lg - =icon('circle-o') + = icon('circle-o') %a.btn.btn-default.pull-right.hidden-sm.hidden-md.hidden-lg.gutter-toggle{ href: "#" } =icon('angle-double-left') |