Commit fb6d8bcb authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Remove EE specific variables

parent b350e67b
...@@ -270,16 +270,14 @@ $general-hover-transition-duration: 100ms; ...@@ -270,16 +270,14 @@ $general-hover-transition-duration: 100ms;
$general-hover-transition-curve: linear; $general-hover-transition-curve: linear;
$highlight-changes-color: rgb(235, 255, 232); $highlight-changes-color: rgb(235, 255, 232);
$performance-bar-height: 35px; $performance-bar-height: 35px;
$system-header-height: 35px;
$system-footer-height: $system-header-height;
$flash-height: 52px; $flash-height: 52px;
$context-header-height: 60px; $context-header-height: 60px;
$breadcrumb-min-height: 48px; $breadcrumb-min-height: 48px;
// EE-only CSS variables START // EE-only CSS variables START
$system-header-height: 35px;
$issue-box-upcoming-bg: #8f8f8f; $issue-box-upcoming-bg: #8f8f8f;
$pages-group-name-color: #4c4e54; $pages-group-name-color: #4c4e54;
$ldap-members-override-bg: $orange-50;
// EE-only CSS variables END // EE-only CSS variables END
/* /*
...@@ -679,7 +677,6 @@ GitLab Plans ...@@ -679,7 +677,6 @@ GitLab Plans
$gl-gold-plan: #d4af37; $gl-gold-plan: #d4af37;
$gl-silver-plan: #91a1ab; $gl-silver-plan: #91a1ab;
$gl-bronze-plan: #cd7f32; $gl-bronze-plan: #cd7f32;
$gl-no-plan: $gl-gray-light;
/* /*
Cross-project Pipelines Cross-project Pipelines
......
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
} }
.alert-member-ldap { .alert-member-ldap {
background-color: $ldap-members-override-bg; background-color: $orange-50;
@include media-breakpoint-up(sm) { @include media-breakpoint-up(sm) {
line-height: 40px; line-height: 40px;
......
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
.footer-message { .footer-message {
bottom: 0; bottom: 0;
height: $system-footer-height; height: $system-header-height;
line-height: $system-footer-height; line-height: $system-header-height;
} }
.with-performance-bar { .with-performance-bar {
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
// navless pages' footer border eg: login page // navless pages' footer border eg: login page
&.devise-layout-html body .footer-container, &.devise-layout-html body .footer-container,
&.devise-layout-html body hr.footer-fixed { &.devise-layout-html body hr.footer-fixed {
bottom: $system-footer-height; bottom: $system-header-height;
} }
} }
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
} }
@if (map-get($map, system-footer) == true) { @if (map-get($map, system-footer) == true) {
$height: $height + $system-footer-height; $height: $height + $system-header-height;
} }
@if (map-get($map, flash) == true) { @if (map-get($map, flash) == true) {
......
...@@ -29,6 +29,6 @@ ...@@ -29,6 +29,6 @@
} }
&:not([data-plan]) { &:not([data-plan]) {
svg g { fill: $gl-no-plan; } svg g { fill: $gl-gray-light; }
} }
} }
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
} }
.classification-label { .classification-label {
background-color: $common-red; background-color: $red-500;
} }
.load-wrapper { .load-wrapper {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment