diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-08-02 00:08:22 +0100 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-08-02 00:08:22 +0100 |
| commit | 94dfd15e473d6d4775b07091ef5a878a8e365965 (patch) | |
| tree | 28fee93c6291a48bb4db42a0b4050a9910e257f2 /app/assets/stylesheets | |
| parent | 56744742a9ca7f3fa2b92f31cddee212736008f3 (diff) | |
| download | gitlab-ce-94dfd15e473d6d4775b07091ef5a878a8e365965.tar.gz | |
re-port
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/framework/buttons.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/forms.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/settings.scss | 8 |
3 files changed, 13 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index 646cedd79ed..a842ff92f8e 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -242,6 +242,10 @@ &:not(:last-child) { margin-right: 5px; } + + &.hide { + display: none; + } } } diff --git a/app/assets/stylesheets/framework/forms.scss b/app/assets/stylesheets/framework/forms.scss index a10ff3eecb3..49a56cac14b 100644 --- a/app/assets/stylesheets/framework/forms.scss +++ b/app/assets/stylesheets/framework/forms.scss @@ -201,7 +201,7 @@ label { } .gl-show-field-errors { - .form-control { + .form-control:not(textarea) { height: 34px; } diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss index 03243581abf..fc5212cfade 100644 --- a/app/assets/stylesheets/pages/settings.scss +++ b/app/assets/stylesheets/pages/settings.scss @@ -311,3 +311,11 @@ .push-pull-table { margin-top: 1em; } + +.push-pull-table { + margin-top: 1em; + + .mirror-action-buttons { + padding-right: 0; + } +} |