diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-12 12:47:46 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-13 09:46:36 +0100 |
| commit | 4f67864103e42497c3cbd06f28faca5fe0e34921 (patch) | |
| tree | 38bac9eb7b3bece3dae92789a60a380ccd698d7f /app/assets | |
| parent | 578f460674e14b4c8ca71cda7ac5a0378b724712 (diff) | |
| download | gitlab-ce-4f67864103e42497c3cbd06f28faca5fe0e34921.tar.gz | |
Limit wiki container widthwiki-limited-width
Closes #23734
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/framework/forms.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/layout.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/wiki.scss | 9 |
3 files changed, 10 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index 432024779fd..a78179e727f 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -148,7 +148,8 @@ label { margin-top: 35px; } -.form-group .control-label { +.form-group .control-label, +.form-group .control-label-full-width { font-weight: normal; } diff --git a/app/assets/stylesheets/framework/layout.scss b/app/assets/stylesheets/framework/layout.scss index 9e8acf4e73c..49bff23452d 100644 --- a/app/assets/stylesheets/framework/layout.scss +++ b/app/assets/stylesheets/framework/layout.scss @@ -51,6 +51,10 @@ body { &.limit-container-width { max-width: $limited-layout-width; } + + &.limit-container-width-sm { + max-width: 790px; + } } .alert-wrapper { diff --git a/app/assets/stylesheets/pages/wiki.scss b/app/assets/stylesheets/pages/wiki.scss index b64b89485f7..94d0a39f397 100644 --- a/app/assets/stylesheets/pages/wiki.scss +++ b/app/assets/stylesheets/pages/wiki.scss @@ -42,9 +42,7 @@ } .git-access-header { - padding: 16px 40px 11px 0; - line-height: 28px; - font-size: 18px; + padding: $gl-padding 0 $gl-padding-top; } .git-clone-holder { @@ -66,6 +64,7 @@ .git-clone-holder { width: 480px; + padding-bottom: $gl-padding; } .nav-controls { @@ -89,9 +88,9 @@ margin: $gl-padding 0; h3 { - font-size: 22px; + font-size: 19px; font-weight: normal; - margin-top: 1.4em; + margin: $gl-padding 0; } } |