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
7ab056c7
Commit
7ab056c7
authored
Sep 23, 2017
by
Pedro Moreira da Silva
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update light colors, remove ’25’ and add ‘950’ shades
parent
e85e803c
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
58 additions
and
58 deletions
+58
-58
app/assets/stylesheets/framework/blocks.scss
app/assets/stylesheets/framework/blocks.scss
+1
-1
app/assets/stylesheets/framework/gitlab-theme.scss
app/assets/stylesheets/framework/gitlab-theme.scss
+2
-2
app/assets/stylesheets/framework/mixins.scss
app/assets/stylesheets/framework/mixins.scss
+1
-1
app/assets/stylesheets/framework/tw_bootstrap_variables.scss
app/assets/stylesheets/framework/tw_bootstrap_variables.scss
+1
-1
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+38
-38
app/assets/stylesheets/pages/convdev_index.scss
app/assets/stylesheets/pages/convdev_index.scss
+3
-3
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+1
-1
app/assets/stylesheets/pages/merge_conflicts.scss
app/assets/stylesheets/pages/merge_conflicts.scss
+1
-1
app/assets/stylesheets/pages/note_form.scss
app/assets/stylesheets/pages/note_form.scss
+1
-1
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+4
-4
app/assets/stylesheets/pages/profile.scss
app/assets/stylesheets/pages/profile.scss
+2
-2
app/assets/stylesheets/pages/status.scss
app/assets/stylesheets/pages/status.scss
+3
-3
No files found.
app/assets/stylesheets/framework/blocks.scss
View file @
7ab056c7
...
...
@@ -260,7 +260,7 @@
position
:
relative
;
border
:
1px
solid
$blue-300
;
border-radius
:
$border-radius-default
;
background-color
:
$blue-
25
;
background-color
:
$blue-
50
;
justify-content
:
center
;
.dismiss-button
{
...
...
app/assets/stylesheets/framework/gitlab-theme.scss
View file @
7ab056c7
...
...
@@ -242,10 +242,10 @@ body {
&
:hover
{
background-color
:
$white-light
;
box-shadow
:
inset
0
0
0
1px
$blue-
1
00
;
box-shadow
:
inset
0
0
0
1px
$blue-
2
00
;
.location-badge
{
box-shadow
:
inset
0
0
0
1px
$blue-
1
00
;
box-shadow
:
inset
0
0
0
1px
$blue-
2
00
;
}
}
}
...
...
app/assets/stylesheets/framework/mixins.scss
View file @
7ab056c7
...
...
@@ -142,5 +142,5 @@
}
@mixin
green-status-color
{
@include
status-color
(
$green-
5
0
,
$green-500
,
$green-700
);
@include
status-color
(
$green-
10
0
,
$green-500
,
$green-700
);
}
app/assets/stylesheets/framework/tw_bootstrap_variables.scss
View file @
7ab056c7
...
...
@@ -137,7 +137,7 @@ $well-border: #eee;
//##
$code-color
:
$red-600
;
$code-bg
:
lighten
(
$red-
5
0
,
2%
);
$code-bg
:
lighten
(
$red-
10
0
,
2%
);
$kbd-color
:
$white-light
;
$kbd-bg
:
#333
;
...
...
app/assets/stylesheets/framework/variables.scss
View file @
7ab056c7
...
...
@@ -27,46 +27,45 @@ $gray-dark: darken($gray-light, $darken-dark-factor);
$gray-darker
:
#eee
;
$gray-darkest
:
#c4c4c4
;
$green-25
:
#f6fcf8
;
$green-50
:
#e4f5eb
;
$green-100
:
#bae6cc
;
$green-200
:
#8dd5aa
;
$green-300
:
#5fc488
;
$green-400
:
#3cb76f
;
$green-50
:
#f1fdf6
;
$green-100
:
#dcf5e7
;
$green-200
:
#b3e6c8
;
$green-300
:
#75d09b
;
$green-400
:
#37b96d
;
$green-500
:
#1aaa55
;
$green-600
:
#168f48
;
$green-700
:
#12753a
;
$green-800
:
#0e5a2d
;
$green-900
:
#0a4020
;
$green-950
:
#072b15
;
$blue-25
:
#f6fafd
;
$blue-50
:
#e4eff9
;
$blue-100
:
#bcd7f1
;
$blue-200
:
#8fbce8
;
$blue-300
:
#62a1df
;
$blue-400
:
#418cd8
;
$blue-50
:
#f6fafe
;
$blue-100
:
#e4f0fb
;
$blue-200
:
#b8d6f4
;
$blue-300
:
#73afea
;
$blue-400
:
#2e87e0
;
$blue-500
:
#1f78d1
;
$blue-600
:
#1b69b6
;
$blue-700
:
#17599c
;
$blue-800
:
#134a81
;
$blue-900
:
#0f3b66
;
$blue-950
:
#0a2744
;
$orange-25
:
#fffcf8
;
$orange-50
:
#fff2e1
;
$orange-100
:
#fedfb3
;
$orange-200
:
#feca81
;
$orange-300
:
#fdb44f
;
$orange-400
:
#fca429
;
$orange-50
:
#fffaf4
;
$orange-100
:
#fff1de
;
$orange-200
:
#fed69f
;
$orange-300
:
#fdbc60
;
$orange-400
:
#fca121
;
$orange-500
:
#fc9403
;
$orange-600
:
#de7e00
;
$orange-700
:
#c26700
;
$orange-800
:
#a35100
;
$orange-900
:
#853b00
;
$orange-800
:
#a35200
;
$orange-900
:
#853c00
;
$orange-950
:
#592800
;
$red-25
:
#fef7f6
;
$red-50
:
#fbe7e4
;
$red-100
:
#f4c4bc
;
$red-200
:
#ed9d90
;
$red-50
:
#fef6f5
;
$red-100
:
#fbe5e1
;
$red-200
:
#f2b4a9
;
$red-300
:
#e67664
;
$red-400
:
#e05842
;
$red-500
:
#db3b21
;
...
...
@@ -74,6 +73,7 @@ $red-600: #c0341d;
$red-700
:
#a62d19
;
$red-800
:
#8b2615
;
$red-900
:
#711e11
;
$red-950
:
#4b140b
;
// GitLab themes
...
...
@@ -184,8 +184,8 @@ $list-text-disabled-color: $gl-text-color-tertiary;
$list-border-light
:
#eee
;
$list-border
:
rgba
(
0
,
0
,
0
,
0
.05
);
$list-text-height
:
42px
;
$list-warning-row-bg
:
$orange-
5
0
;
$list-warning-row-border
:
$orange-
1
00
;
$list-warning-row-bg
:
$orange-
10
0
;
$list-warning-row-border
:
$orange-
2
00
;
$list-warning-row-color
:
$orange-700
;
/*
...
...
@@ -214,8 +214,8 @@ $gl-sidebar-padding: 22px;
/*
* Misc
*/
$row-hover
:
$blue-
25
;
$row-hover-border
:
$blue-
1
00
;
$row-hover
:
$blue-
50
;
$row-hover-border
:
$blue-
2
00
;
$progress-color
:
#c0392b
;
$header-height
:
50px
;
$new-navbar-height
:
40px
;
...
...
@@ -265,8 +265,8 @@ $time-color: #999;
$project-member-show-color
:
#aaa
;
$gl-promo-color
:
#aaa
;
$error-bg
:
$red-400
;
$warning-message-bg
:
$orange-
5
0
;
$warning-message-border
:
$orange-
1
00
;
$warning-message-bg
:
$orange-
10
0
;
$warning-message-border
:
$orange-
2
00
;
$warning-message-color
:
$orange-700
;
$control-group-descr-color
:
#666
;
$table-permission-x-bg
:
#d9edf7
;
...
...
@@ -451,17 +451,17 @@ $builds-trace-bg: #111;
/*
* Callout
*/
$callout-danger-bg
:
$red-
5
0
;
$callout-danger-border
:
$red-
1
00
;
$callout-danger-bg
:
$red-
10
0
;
$callout-danger-border
:
$red-
2
00
;
$callout-danger-color
:
$red-700
;
$callout-warning-bg
:
$orange-
5
0
;
$callout-warning-border
:
$orange-
1
00
;
$callout-warning-bg
:
$orange-
10
0
;
$callout-warning-border
:
$orange-
2
00
;
$callout-warning-color
:
$orange-700
;
$callout-info-bg
:
$blue-
5
0
;
$callout-info-border
:
$blue-
1
00
;
$callout-info-bg
:
$blue-
10
0
;
$callout-info-border
:
$blue-
2
00
;
$callout-info-color
:
$blue-700
;
$callout-success-bg
:
$green-
5
0
;
$callout-success-border
:
$green-
1
00
;
$callout-success-bg
:
$green-
10
0
;
$callout-success-border
:
$green-
2
00
;
$callout-success-color
:
$green-700
;
/*
...
...
app/assets/stylesheets/pages/convdev_index.scss
View file @
7ab056c7
...
...
@@ -83,7 +83,7 @@ $space-between-cards: 8px;
border-top-color
:
$color-low-score
;
.card-score-big
{
background-color
:
$red-
25
;
background-color
:
$red-
50
;
}
}
...
...
@@ -91,7 +91,7 @@ $space-between-cards: 8px;
border-top-color
:
$color-average-score
;
.card-score-big
{
background-color
:
$orange-
25
;
background-color
:
$orange-
50
;
}
}
...
...
@@ -99,7 +99,7 @@ $space-between-cards: 8px;
border-top-color
:
$color-high-score
;
.card-score-big
{
background-color
:
$green-
25
;
background-color
:
$green-
50
;
}
}
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
7ab056c7
...
...
@@ -7,7 +7,7 @@
.is-confidential
{
color
:
$orange-600
;
background-color
:
$orange-
5
0
;
background-color
:
$orange-
10
0
;
border-radius
:
$border-radius-default
;
padding
:
5px
;
margin
:
0
3px
0
-4px
;
...
...
app/assets/stylesheets/pages/merge_conflicts.scss
View file @
7ab056c7
...
...
@@ -255,7 +255,7 @@ $colors: (
&
.saved
{
.editor
{
border-top
:
solid
2px
$green-
2
00
;
border-top
:
solid
2px
$green-
3
00
;
}
}
...
...
app/assets/stylesheets/pages/note_form.scss
View file @
7ab056c7
...
...
@@ -103,7 +103,7 @@
.confidential-issue-warning
{
color
:
$orange-600
;
background-color
:
$orange-
5
0
;
background-color
:
$orange-
10
0
;
border-radius
:
$border-radius-default
$border-radius-default
0
0
;
border
:
1px
solid
$border-gray-normal
;
border-bottom
:
none
;
...
...
app/assets/stylesheets/pages/pipelines.scss
View file @
7ab056c7
...
...
@@ -644,20 +644,20 @@ button.mini-pipeline-graph-dropdown-toggle {
// Dropdown button animation in mini pipeline graph
&
.ci-status-icon-success
{
@include
mini-pipeline-graph-color
(
$green-
5
0
,
$green-500
,
$green-600
);
@include
mini-pipeline-graph-color
(
$green-
10
0
,
$green-500
,
$green-600
);
}
&
.ci-status-icon-failed
{
@include
mini-pipeline-graph-color
(
$red-
5
0
,
$red-500
,
$red-600
);
@include
mini-pipeline-graph-color
(
$red-
10
0
,
$red-500
,
$red-600
);
}
&
.ci-status-icon-pending
,
&
.ci-status-icon-success_with_warnings
{
@include
mini-pipeline-graph-color
(
$orange-
5
0
,
$orange-500
,
$orange-600
);
@include
mini-pipeline-graph-color
(
$orange-
10
0
,
$orange-500
,
$orange-600
);
}
&
.ci-status-icon-running
{
@include
mini-pipeline-graph-color
(
$blue-
5
0
,
$blue-400
,
$blue-600
);
@include
mini-pipeline-graph-color
(
$blue-
10
0
,
$blue-400
,
$blue-600
);
}
&
.ci-status-icon-canceled
,
...
...
app/assets/stylesheets/pages/profile.scss
View file @
7ab056c7
...
...
@@ -291,7 +291,7 @@ table.u2f-registrations {
.bordered-box
{
border
:
1px
solid
$blue-300
;
border-radius
:
$border-radius-default
;
background-color
:
$blue-
25
;
background-color
:
$blue-
50
;
position
:
relative
;
display
:
flex
;
justify-content
:
center
;
...
...
@@ -379,7 +379,7 @@ table.u2f-registrations {
.nav-wip
{
border
:
1px
solid
$blue-500
;
background
:
$blue-
25
;
background
:
$blue-
50
;
padding
:
$gl-padding
;
margin-bottom
:
$gl-padding
;
...
...
app/assets/stylesheets/pages/status.scss
View file @
7ab056c7
...
...
@@ -18,7 +18,7 @@
}
&
.ci-failed
{
@include
status-color
(
$red-
5
0
,
$red-500
,
$red-600
);
@include
status-color
(
$red-
10
0
,
$red-500
,
$red-600
);
}
&
.ci-success
{
...
...
@@ -39,12 +39,12 @@
&
.ci-pending
,
&
.ci-failed_with_warnings
,
&
.ci-success_with_warnings
{
@include
status-color
(
$orange-
5
0
,
$orange-500
,
$orange-700
);
@include
status-color
(
$orange-
10
0
,
$orange-500
,
$orange-700
);
}
&
.ci-info
,
&
.ci-running
{
@include
status-color
(
$blue-
5
0
,
$blue-500
,
$blue-600
);
@include
status-color
(
$blue-
10
0
,
$blue-500
,
$blue-600
);
}
&
.ci-created
,
...
...
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