summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-06-15 22:47:51 -0500
committerEric Eastwood <contact@ericeastwood.com>2017-06-15 22:47:51 -0500
commit0a4636121e227200eb37dbee6ae1307961ba8341 (patch)
treebe3977bbcffe4a495d0a6a82e89d445b96b6f6f8
parent42aaae9916b7b76da968579fcc722067947df018 (diff)
downloadgitlab-ce-0a4636121e227200eb37dbee6ae1307961ba8341.tar.gz
Backport panels styles from EEbackport-panels-styles-from-ee
See https://gitlab.com/gitlab-org/gitlab-ee/blob/43a570dcf5cbd0a98572d5601e9000e906791db0/app/assets/stylesheets/framework/panels.scss
-rw-r--r--app/assets/stylesheets/framework/panels.scss90
1 files changed, 48 insertions, 42 deletions
diff --git a/app/assets/stylesheets/framework/panels.scss b/app/assets/stylesheets/framework/panels.scss
index fa364e68d22..e8d69e62194 100644
--- a/app/assets/stylesheets/framework/panels.scss
+++ b/app/assets/stylesheets/framework/panels.scss
@@ -1,54 +1,60 @@
.panel {
margin-bottom: $gl-padding;
+}
+
+.panel-slim {
+ @extend .panel;
+ margin-bottom: $gl-vert-padding;
+}
+
+
+.panel-heading {
+ padding: $gl-vert-padding $gl-padding;
+ line-height: 36px;
+
+ .controls {
+ margin-top: -2px;
+ float: right;
+ }
+
+ .dropdown-menu-toggle {
+ line-height: 20px;
+ }
- .panel-heading {
- padding: $gl-vert-padding $gl-padding;
- line-height: 36px;
-
- .controls {
- margin-top: -2px;
- float: right;
- }
-
- .dropdown-menu-toggle {
- line-height: 20px;
- }
-
- .badge {
- margin-top: -2px;
- margin-left: 5px;
- }
-
- &.split {
- display: flex;
- align-items: center;
- }
-
- .left {
- flex: 1 1 auto;
- }
-
- .right {
- flex: 0 0 auto;
- text-align: right;
- }
+ .badge {
+ margin-top: -2px;
+ margin-left: 5px;
}
- .panel-empty-heading {
- border-bottom: 0;
+ &.split {
+ display: flex;
+ align-items: center;
}
- .panel-body {
- padding: $gl-padding;
+ .left {
+ flex: 1 1 auto;
+ }
- .form-actions {
- margin: -$gl-padding;
- margin-top: $gl-padding;
- }
+ .right {
+ flex: 0 0 auto;
+ text-align: right;
}
+}
+
+.panel-empty-heading {
+ border-bottom: 0;
+}
+
+.panel-body {
+ padding: $gl-padding;
- .panel-title {
- font-size: inherit;
- line-height: inherit;
+ .form-actions {
+ margin: -$gl-padding;
+ margin-top: $gl-padding;
}
}
+
+.panel-title {
+ font-size: inherit;
+ line-height: inherit;
+}