diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-11-29 19:46:40 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2016-11-30 15:22:43 -0600 |
| commit | bf587cb5c0bbc8d99809d7195a17f96d6c3a1a80 (patch) | |
| tree | ec0b7cd1449481709490a5e7e170888dac865440 /app | |
| parent | 9918be8fc885600d21ae6a5020e6288e8e341f21 (diff) | |
| download | gitlab-ce-bf587cb5c0bbc8d99809d7195a17f96d6c3a1a80.tar.gz | |
add special class in cases where sidebar toggle should exist in the margin
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/wiki.scss | 8 | ||||
| -rw-r--r-- | app/views/projects/wikis/edit.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/wikis/git_access.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/wikis/history.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/wikis/show.html.haml | 2 |
5 files changed, 10 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/wiki.scss b/app/assets/stylesheets/pages/wiki.scss index df16ad1600c..b9f81533150 100644 --- a/app/assets/stylesheets/pages/wiki.scss +++ b/app/assets/stylesheets/pages/wiki.scss @@ -46,7 +46,9 @@ } @media (min-width: $screen-sm-min) { - padding-right: 40px; + &.has-sidebar-toggle { + padding-right: 40px; + } .git-clone-holder { width: 480px; @@ -60,7 +62,9 @@ } @media (min-width: $screen-md-min) { - padding-right: 0; + &.has-sidebar-toggle { + padding-right: 0; + } button.sidebar-toggle { display: none; diff --git a/app/views/projects/wikis/edit.html.haml b/app/views/projects/wikis/edit.html.haml index 23117128bbb..8cf018da1b7 100644 --- a/app/views/projects/wikis/edit.html.haml +++ b/app/views/projects/wikis/edit.html.haml @@ -2,7 +2,7 @@ - page_title "Edit", @page.title.capitalize, "Wiki" %div{ class: container_class } - .wiki-page-header + .wiki-page-header.has-sidebar-toggle %button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" } = icon('angle-double-left') diff --git a/app/views/projects/wikis/git_access.html.haml b/app/views/projects/wikis/git_access.html.haml index c148f65eb3e..e25d6a48573 100644 --- a/app/views/projects/wikis/git_access.html.haml +++ b/app/views/projects/wikis/git_access.html.haml @@ -2,7 +2,7 @@ - page_title "Git Access", "Wiki" %div{ class: container_class } - .wiki-page-header + .wiki-page-header.has-sidebar-toggle %button.btn.btn-default.visible-xs.visible-sm.pull-right.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" } = icon('angle-double-left') diff --git a/app/views/projects/wikis/history.html.haml b/app/views/projects/wikis/history.html.haml index 5f9c3067cc1..dd7213622c1 100644 --- a/app/views/projects/wikis/history.html.haml +++ b/app/views/projects/wikis/history.html.haml @@ -1,7 +1,7 @@ - page_title "History", @page.title.capitalize, "Wiki" %div{ class: container_class } - .wiki-page-header + .wiki-page-header.has-sidebar-toggle %button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" } = icon('angle-double-left') diff --git a/app/views/projects/wikis/show.html.haml b/app/views/projects/wikis/show.html.haml index 28c1c5ab7d1..1b6dceee241 100644 --- a/app/views/projects/wikis/show.html.haml +++ b/app/views/projects/wikis/show.html.haml @@ -2,7 +2,7 @@ - page_title @page.title.capitalize, "Wiki" %div{ class: container_class } - .wiki-page-header + .wiki-page-header.has-sidebar-toggle %button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" } = icon('angle-double-left') |