Skip to content

G
gitlab-ce
Commit 4f74e882 authored by Dennis Tang's avatar Dennis Tang
Browse files
Options

Update app/assets/stylesheets/framework/variables.scss

parent 35491ba7
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/stylesheets/framework/variables.scss
View file @ 4f74e882
...@@ -275,15 +275,12 @@ $flash-height: 52px; ...@@ -275,15 +275,12 @@ $flash-height: 52px;
$context-header-height: 60px; $context-header-height: 60px;
$breadcrumb-min-height: 48px; $breadcrumb-min-height: 48px;
$project-title-row-height: 24px; $project-title-row-height: 24px;
<<<<<<< HEAD
// EE-only CSS variables START // EE-only CSS variables START
$system-header-height: 35px; $system-header-height: 35px;
$issue-box-upcoming-bg: #8f8f8f; $issue-box-upcoming-bg: #8f8f8f;
$pages-group-name-color: #4c4e54; $pages-group-name-color: #4c4e54;
// EE-only CSS variables END // 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