Skip to content

G
gitlab-ce
Commit 2250df94 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in app/assets/stylesheets/framework/variables.scss 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 62ded594
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
app/assets/stylesheets/framework/variables.scss
View file @ 2250df94
...@@ -302,13 +302,12 @@ $system-footer-height: $system-header-height; ...@@ -302,13 +302,12 @@ $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;
<<<<<<< HEAD
// EE-only CSS variables START
$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; $ldap-members-override-bg: $orange-50;
======= // EE-only CSS variables END
>>>>>>> upstream/master
/* /*
* Common component specific colors * Common component specific colors
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7