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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
2e7bee26
Commit
2e7bee26
authored
Dec 18, 2015
by
Andriy Dyadyura
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new-colors
parent
08ddb8f7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
19 deletions
+21
-19
app/assets/stylesheets/framework/layout.scss
app/assets/stylesheets/framework/layout.scss
+1
-1
app/assets/stylesheets/framework/mixins.scss
app/assets/stylesheets/framework/mixins.scss
+5
-6
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+15
-12
No files found.
app/assets/stylesheets/framework/layout.scss
View file @
2e7bee26
...
@@ -5,7 +5,7 @@ html {
...
@@ -5,7 +5,7 @@ html {
}
}
body
{
body
{
background-color
:
#
EAEBEC
!
important
;
background-color
:
#
F3F3F3
!
important
;
&
.navless
{
&
.navless
{
background-color
:
white
!
important
;
background-color
:
white
!
important
;
...
...
app/assets/stylesheets/framework/mixins.scss
View file @
2e7bee26
...
@@ -123,7 +123,6 @@
...
@@ -123,7 +123,6 @@
padding
:
0
;
padding
:
0
;
margin
:
0
;
margin
:
0
;
list-style
:
none
;
list-style
:
none
;
margin-top
:
5px
;
height
:
56px
;
height
:
56px
;
li
{
li
{
...
@@ -131,9 +130,9 @@
...
@@ -131,9 +130,9 @@
a
{
a
{
padding
:
14px
;
padding
:
14px
;
font-size
:
1
7
px
;
font-size
:
1
5
px
;
line-height
:
2
8
px
;
line-height
:
2
3
px
;
color
:
#
7f8fa
4
;
color
:
#
95949
4
;
border-bottom
:
2px
solid
transparent
;
border-bottom
:
2px
solid
transparent
;
&
:hover
,
&
:active
,
&
:focus
{
&
:hover
,
&
:active
,
&
:focus
{
...
@@ -143,8 +142,8 @@
...
@@ -143,8 +142,8 @@
}
}
&
.active
a
{
&
.active
a
{
color
:
#
4c4e54
;
color
:
#
616060
;
border-bottom
:
2px
solid
#
1cacfc
;
border-bottom
:
2px
solid
#
4688f1
;
}
}
.badge
{
.badge
{
...
...
app/assets/stylesheets/framework/variables.scss
View file @
2e7bee26
$hover
:
#
FFFAF1
;
$hover
:
#
faf9f9
;
$gl-text-color
:
#54565B
;
$gl-text-color
:
#54565B
;
$gl-text-green
:
#4A2
;
$gl-text-green
:
#4A2
;
$gl-text-red
:
#D12F19
;
$gl-text-red
:
#D12F19
;
$gl-text-orange
:
#D90
;
$gl-text-orange
:
#D90
;
$gl-header-color
:
#
4c4e54
;
$gl-header-color
:
#
323232
;
$gl-link-color
:
#333c48
;
$gl-link-color
:
#333c48
;
$md-text-color
:
#444
;
$md-text-color
:
#444
;
$md-link-color
:
#3084bb
;
$md-link-color
:
#3084bb
;
...
@@ -15,13 +15,14 @@ $sidebar_width: 230px;
...
@@ -15,13 +15,14 @@ $sidebar_width: 230px;
$avatar_radius
:
50%
;
$avatar_radius
:
50%
;
$code_font_size
:
13px
;
$code_font_size
:
13px
;
$code_line_height
:
1
.5
;
$code_line_height
:
1
.5
;
$border-color
:
#
dce0e6
;
$border-color
:
#
efeff1
;
$table-border-color
:
#eef0f2
;
$table-border-color
:
#eef0f2
;
$background-color
:
#
F7F8FA
;
$background-color
:
#
faf9f9
;
$header-height
:
58px
;
$header-height
:
58px
;
$fixed-layout-width
:
1280px
;
$fixed-layout-width
:
1280px
;
$gl-gray
:
#
7f8fa4
;
$gl-gray
:
#
5a5a5a
;
$gl-padding
:
16px
;
$gl-padding
:
16px
;
$gl-padding-top
:
10px
;
$gl-avatar-size
:
46px
;
$gl-avatar-size
:
46px
;
/*
/*
...
@@ -29,12 +30,12 @@ $gl-avatar-size: 46px;
...
@@ -29,12 +30,12 @@ $gl-avatar-size: 46px;
*/
*/
$white-light
:
#FFFFFF
;
$white-light
:
#FFFFFF
;
$white-normal
:
#
DCE0E5
;
$white-normal
:
#
ededed
;
$white-dark
:
#
E4E7ED
;
$white-dark
:
#
ededed
;
$gray-light
:
#
F0F2F5
;
$gray-light
:
#
f7f7f7
;
$gray-normal
:
#
DCE0E5
;
$gray-normal
:
#
ededed
;
$gray-dark
:
#
E4E7ED
;
$gray-dark
:
#
ededed
;
$green-light
:
#31AF64
;
$green-light
:
#31AF64
;
$green-normal
:
#2FAA60
;
$green-normal
:
#2FAA60
;
...
@@ -52,11 +53,11 @@ $red-light: #F43263;
...
@@ -52,11 +53,11 @@ $red-light: #F43263;
$red-normal
:
#E52C5A
;
$red-normal
:
#E52C5A
;
$red-dark
:
#D22852
;
$red-dark
:
#D22852
;
$border-white-light
:
#
E3E7EC
;
$border-white-light
:
#
F1F2F4
;
$border-white-normal
:
#D6DAE2
;
$border-white-normal
:
#D6DAE2
;
$border-white-dark
:
#C6CACF
;
$border-white-dark
:
#C6CACF
;
$border-gray-light
:
#
DCE0E5
;
$border-gray-light
:
#
d1d1d1
;
$border-gray-normal
:
#D6DAE2
;
$border-gray-normal
:
#D6DAE2
;
$border-gray-dark
:
#C6CACF
;
$border-gray-dark
:
#C6CACF
;
...
@@ -76,6 +77,8 @@ $border-red-light: #E52C5A;
...
@@ -76,6 +77,8 @@ $border-red-light: #E52C5A;
$border-red-normal
:
#D22852
;
$border-red-normal
:
#D22852
;
$border-red-dark
:
#CA264F
;
$border-red-dark
:
#CA264F
;
/* header */
$light-grey-header
:
#faf9f9
;
/*
/*
* State colors:
* State 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