diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-11-21 22:11:21 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-11-21 22:11:21 +0000 |
| commit | 334347febc3dafdb39ef9bc6b552c6eb886bcbfc (patch) | |
| tree | f553920669b411ca1d197be52c9c60bc9cbe60ff /app/assets/stylesheets | |
| parent | 67fde38806bd843c8008766edf49023e4c63df81 (diff) | |
| download | gitlab-ce-334347febc3dafdb39ef9bc6b552c6eb886bcbfc.tar.gz | |
Frontend review changeszj-mattermost-command-help-message
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/framework/forms.scss | 57 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/settings.scss | 4 |
2 files changed, 33 insertions, 28 deletions
diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index be2d87197bf..e83a1f7ad68 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -68,41 +68,42 @@ label { } } -.help-form { - .form-group { - .control-label { - font-weight: bold; - padding-top: 4px; - } +.help-form .form-group { + margin-left: 0; + margin-right: 0; - .form-control { - height: 29px; - background: $white-light; - font-family: $monospace_font; - } + .control-label { + font-weight: bold; + padding-top: 4px; + } - .input-group-btn .btn { - padding: 3px $gl-btn-padding; - background-color: $gray-light; - border: 1px solid $border-color; - } + .form-control { + height: 29px; + background: $white-light; + font-family: $monospace_font; + } - .text-block { - line-height: 0.8; - padding-top: 9px; + .input-group-btn .btn { + padding: 3px $gl-btn-padding; + background-color: $gray-light; + border: 1px solid $border-color; + } + + .text-block { + line-height: 0.8; + padding-top: 9px; - code { - line-height: 1.8; - } + code { + line-height: 1.8; } + } - @media(max-width: $screen-sm-min) { - padding: 0 $gl-padding; + @media(max-width: $screen-sm-min) { + padding: 0 $gl-padding; - .control-label, - .text-block { - padding-left: 0; - } + .control-label, + .text-block { + padding-left: 0; } } } diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss index 2e8f356298d..51c926608f9 100644 --- a/app/assets/stylesheets/pages/settings.scss +++ b/app/assets/stylesheets/pages/settings.scss @@ -20,3 +20,7 @@ .danger-title { color: $gl-danger; } + +.service-settings .control-label { + padding-top: 0; +} |