Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
5d6f5be0
Commit
5d6f5be0
authored
May 31, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
New colors for success/warning/primary
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
e53f4a4e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
14 deletions
+8
-14
app/assets/stylesheets/gl_bootstrap.scss
app/assets/stylesheets/gl_bootstrap.scss
+2
-2
app/assets/stylesheets/main/variables.scss
app/assets/stylesheets/main/variables.scss
+6
-12
No files found.
app/assets/stylesheets/gl_bootstrap.scss
View file @
5d6f5be0
...
@@ -7,8 +7,8 @@
...
@@ -7,8 +7,8 @@
*/
*/
$font-size-base
:
13px
!
default
;
$font-size-base
:
13px
!
default
;
$nav-pills-active-link-hover-bg
:
$bg_
style_color
;
$nav-pills-active-link-hover-bg
:
$bg_
primary
;
$pagination-active-bg
:
$bg_
style_color
;
$pagination-active-bg
:
$bg_
primary
;
// Core variables and mixins
// Core variables and mixins
@import
"bootstrap/variables"
;
@import
"bootstrap/variables"
;
...
...
app/assets/stylesheets/main/variables.scss
View file @
5d6f5be0
...
@@ -11,32 +11,26 @@ $hover: #D9EDF7;
...
@@ -11,32 +11,26 @@ $hover: #D9EDF7;
/*
/*
* Success colors (green)
* Success colors (green)
*/
*/
$border_success
:
#4cae4c
;
$border_success
:
#469408
;
$bg_success
:
#5cb85c
;
$bg_success
:
#469408
;
$bg_light_success
:
#dff0d8
;
$color_success
:
#3c763d
;
/*
/*
* Danger colors (red)
* Danger colors (red)
*/
*/
$border_danger
:
#d43f3a
;
$border_danger
:
#d43f3a
;
$bg_danger
:
#d9534f
;
$bg_danger
:
#d9534f
;
$bg_light_danger
:
#f2dede
;
$color_danger
:
#a94442
;
/*
/*
* Primary colors (blue)
* Primary colors (blue)
*/
*/
$border_primary
:
#358ebd
;
$border_primary
:
#446e9b
;
$bg_primary
:
#429bca
;
$bg_primary
:
#446e9b
;
$bg_light_primary
:
#d9edf7
;
$color_primary
:
#31708f
;
/*
/*
* Warning colors (yellow)
* Warning colors (yellow)
*/
*/
$bg_warning
:
#
f39c12
;
$bg_warning
:
#
d9831f
;
$border_warning
:
#
f39c12
;
$border_warning
:
#
d9831f
;
/**
/**
* Commit Diff Colors
* Commit Diff Colors
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment