summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/settings.scss
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/stylesheets/pages/settings.scss')
-rw-r--r--app/assets/stylesheets/pages/settings.scss31
1 files changed, 6 insertions, 25 deletions
diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss
index 2b3773eebad..e264b06c4b2 100644
--- a/app/assets/stylesheets/pages/settings.scss
+++ b/app/assets/stylesheets/pages/settings.scss
@@ -52,7 +52,7 @@
.settings-content {
max-height: 1px;
- overflow-y: scroll;
+ overflow-y: hidden;
padding-right: 110px;
animation: collapseMaxHeight 300ms ease-out;
// Keep the section from expanding when we scroll over it
@@ -102,10 +102,6 @@
.form-text.text-muted {
margin-top: 0;
}
-
- .label-light {
- margin-bottom: 0;
- }
}
.settings-list-icon {
@@ -131,12 +127,9 @@
color: $gl-danger;
}
-.service-settings .form-control-label {
- padding-top: 0;
-}
-
.integration-settings-form {
- .card.card-body {
+ .card.card-body,
+ .info-well {
padding: $gl-padding / 2;
box-shadow: none;
}
@@ -174,7 +167,7 @@
.option-description,
.option-disabled-reason {
- margin-left: 45px;
+ margin-left: 30px;
color: $project-option-descr-color;
}
@@ -262,25 +255,12 @@
}
}
-.modal-doorkeepr-auth,
-.doorkeeper-app-form {
- .scope-description {
- color: $theme-gray-700;
- }
-}
-
.modal-doorkeepr-auth {
.modal-body {
padding: $gl-padding;
}
}
-.doorkeeper-app-form {
- .scope-description {
- margin: 0 0 5px 17px;
- }
-}
-
.deprecated-service {
cursor: default;
}
@@ -296,7 +276,8 @@
}
.btn-clipboard {
- margin-left: 5px;
+ background-color: $white-light;
+ border: 1px solid $theme-gray-200;
}
.deploy-token-help-block {