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
6ff078cd
Commit
6ff078cd
authored
Sep 09, 2020
by
Jeremy Elder
Committed by
Simon Knox
Sep 09, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updating $orange variables
Updating each $orange hex and evaluating usage for each instance.
parent
a8ed9972
Changes
25
Hide whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
53 additions
and
59 deletions
+53
-59
app/assets/stylesheets/components/related_items_list.scss
app/assets/stylesheets/components/related_items_list.scss
+1
-1
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+3
-3
app/assets/stylesheets/framework/callout.scss
app/assets/stylesheets/framework/callout.scss
+3
-3
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+1
-1
app/assets/stylesheets/framework/files.scss
app/assets/stylesheets/framework/files.scss
+1
-1
app/assets/stylesheets/framework/flash.scss
app/assets/stylesheets/framework/flash.scss
+2
-2
app/assets/stylesheets/framework/gfm.scss
app/assets/stylesheets/framework/gfm.scss
+1
-1
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+1
-1
app/assets/stylesheets/framework/lists.scss
app/assets/stylesheets/framework/lists.scss
+0
-11
app/assets/stylesheets/framework/spinner.scss
app/assets/stylesheets/framework/spinner.scss
+1
-1
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+11
-11
app/assets/stylesheets/pages/boards.scss
app/assets/stylesheets/pages/boards.scss
+1
-1
app/assets/stylesheets/pages/builds.scss
app/assets/stylesheets/pages/builds.scss
+1
-1
app/assets/stylesheets/pages/clusters.scss
app/assets/stylesheets/pages/clusters.scss
+2
-2
app/assets/stylesheets/pages/dev_ops_score.scss
app/assets/stylesheets/pages/dev_ops_score.scss
+2
-2
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+2
-2
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
+1
-1
app/assets/stylesheets/pages/settings.scss
app/assets/stylesheets/pages/settings.scss
+3
-3
app/assets/stylesheets/pages/status.scss
app/assets/stylesheets/pages/status.scss
+1
-1
app/assets/stylesheets/pages/tree.scss
app/assets/stylesheets/pages/tree.scss
+1
-1
app/assets/stylesheets/vendors/atwho.scss
app/assets/stylesheets/vendors/atwho.scss
+3
-3
ee/app/assets/stylesheets/components/batch_comments/draft_note.scss
...ets/stylesheets/components/batch_comments/draft_note.scss
+3
-3
ee/app/assets/stylesheets/pages/issuable.scss
ee/app/assets/stylesheets/pages/issuable.scss
+2
-2
ee/changelogs/unreleased/241728-update-orange-variables-in-gitlab-to-match-gitlab-ui.yml
...-update-orange-variables-in-gitlab-to-match-gitlab-ui.yml
+5
-0
No files found.
app/assets/stylesheets/components/related_items_list.scss
View file @
6ff078cd
...
...
@@ -48,7 +48,7 @@ $item-remove-button-space: 42px;
}
.confidential-icon
{
color
:
$orange-
6
00
;
color
:
$orange-
5
00
;
}
.item-title-wrapper
{
...
...
app/assets/stylesheets/framework/buttons.scss
View file @
6ff078cd
...
...
@@ -112,7 +112,7 @@
}
@mixin
btn-orange
{
@include
btn-color
(
$orange-500
,
$orange-600
,
$orange-
600
,
$orange-700
,
$orange-7
00
,
$orange-800
,
$white
);
@include
btn-color
(
$orange-500
,
$orange-600
,
$orange-
500
,
$orange-600
,
$orange-6
00
,
$orange-800
,
$white
);
}
@mixin
btn-red
{
...
...
@@ -182,7 +182,7 @@
}
&
.btn-warning
{
@include
btn-outline
(
$white
,
$orange-500
,
$orange-500
,
$orange-
100
,
$orange-700
,
$orange-500
,
$orange-200
,
$orange-600
,
$orange-8
00
);
@include
btn-outline
(
$white
,
$orange-500
,
$orange-500
,
$orange-
50
,
$orange-600
,
$orange-600
,
$orange-100
,
$orange-700
,
$orange-7
00
);
}
&
.btn-primary
,
...
...
@@ -202,7 +202,7 @@
&
.btn-close
,
&
.btn-close-color
{
@include
btn-outline
(
$white
,
$orange-
600
,
$orange-500
,
$orange-100
,
$orange-700
,
$orange-500
,
$orange-200
,
$orange-600
,
$orange-8
00
);
@include
btn-outline
(
$white
,
$orange-
500
,
$orange-500
,
$orange-50
,
$orange-600
,
$orange-600
,
$orange-100
,
$orange-700
,
$orange-7
00
);
}
&
.btn-spam
{
...
...
app/assets/stylesheets/framework/callout.scss
View file @
6ff078cd
...
...
@@ -37,12 +37,12 @@
}
.bs-callout-warning
{
background-color
:
$orange-
10
0
;
background-color
:
$orange-
5
0
;
border-color
:
$orange-200
;
color
:
$
orange
-900
;
color
:
$
gray
-900
;
a
{
color
:
$
orange-9
00
;
color
:
$
blue-6
00
;
}
}
...
...
app/assets/stylesheets/framework/common.scss
View file @
6ff078cd
...
...
@@ -237,7 +237,7 @@ li.note {
}
.warning_message
{
@include
message
(
$orange-
100
,
$orange-200
,
$orange-8
00
);
@include
message
(
$orange-
50
,
$orange-200
,
$gray-9
00
);
}
.danger_message
{
...
...
app/assets/stylesheets/framework/files.scss
View file @
6ff078cd
...
...
@@ -300,7 +300,7 @@ span.idiff {
.renamed-file
{
a
{
color
:
$orange-
6
00
;
color
:
$orange-
5
00
;
}
}
...
...
app/assets/stylesheets/framework/flash.scss
View file @
6ff078cd
...
...
@@ -65,8 +65,8 @@ $notification-box-shadow-color: rgba(0, 0, 0, 0.25);
}
.flash-warning
{
background-color
:
$orange-
10
0
;
color
:
$
orange-8
00
;
background-color
:
$orange-
5
0
;
color
:
$
gray-9
00
;
cursor
:
default
;
}
...
...
app/assets/stylesheets/framework/gfm.scss
View file @
6ff078cd
...
...
@@ -13,7 +13,7 @@
border-radius
:
$border-radius-default
;
&
.current-user
{
background-color
:
$orange-
10
0
;
background-color
:
$orange-
5
0
;
}
}
...
...
app/assets/stylesheets/framework/header.scss
View file @
6ff078cd
...
...
@@ -462,7 +462,7 @@
}
&
.merge-requests-count
{
background-color
:
$orange-
6
00
;
background-color
:
$orange-
5
00
;
}
&
.todos-count
{
...
...
app/assets/stylesheets/framework/lists.scss
View file @
6ff078cd
...
...
@@ -34,17 +34,6 @@
}
}
&
.warning-row
{
background-color
:
$orange-100
;
border-color
:
$orange-200
;
color
:
$orange-700
;
&
:hover
{
background
:
$orange-100
;
}
}
&
.smoke
{
background-color
:
$gray-light
;
}
&
:last-child
{
...
...
app/assets/stylesheets/framework/spinner.scss
View file @
6ff078cd
...
...
@@ -31,7 +31,7 @@
border-style
:
solid
;
display
:
inline-flex
;
@include
spinner-size
(
16px
,
2px
);
@include
spinner-color
(
$orange-
6
00
);
@include
spinner-color
(
$orange-
4
00
);
&
.spinner-md
{
@include
spinner-size
(
32px
,
3px
);
...
...
app/assets/stylesheets/framework/variables.scss
View file @
6ff078cd
...
...
@@ -128,17 +128,17 @@ $blue-800: #064787 !default;
$blue-900
:
#033464
!
default
;
$blue-950
:
#002850
!
default
;
$orange-50
:
#f
ffaf4
!
default
;
$orange-100
:
#f
ff1de
!
default
;
$orange-200
:
#
fed69f
!
default
;
$orange-300
:
#
fdbc6
0
!
default
;
$orange-400
:
#
fca429
!
default
;
$orange-500
:
#
fc9403
!
default
;
$orange-600
:
#
de7e
00
!
default
;
$orange-700
:
#
c26
700
!
default
;
$orange-800
:
#
a352
00
!
default
;
$orange-900
:
#
853c
00
!
default
;
$orange-950
:
#
5928
00
!
default
;
$orange-50
:
#f
df1dd
!
default
;
$orange-100
:
#f
5d9a8
!
default
;
$orange-200
:
#
e9be74
!
default
;
$orange-300
:
#
d9953
0
!
default
;
$orange-400
:
#
c17d10
!
default
;
$orange-500
:
#
ab6100
!
default
;
$orange-600
:
#
9e54
00
!
default
;
$orange-700
:
#
8f4
700
!
default
;
$orange-800
:
#
7038
00
!
default
;
$orange-900
:
#
5c29
00
!
default
;
$orange-950
:
#
421f
00
!
default
;
$red-50
:
#fcf1ef
!
default
;
$red-100
:
#fdd4cd
!
default
;
...
...
app/assets/stylesheets/pages/boards.scss
View file @
6ff078cd
...
...
@@ -283,7 +283,7 @@
}
.confidential-icon
{
color
:
$orange-
6
00
;
color
:
$orange-
5
00
;
cursor
:
help
;
}
...
...
app/assets/stylesheets/pages/builds.scss
View file @
6ff078cd
...
...
@@ -50,7 +50,7 @@
top
:
$header-height
;
border-radius
:
2px
2px
0
0
;
color
:
$orange-600
;
background-color
:
$orange-
10
0
;
background-color
:
$orange-
5
0
;
border
:
1px
solid
$border-gray-normal
;
padding
:
3px
12px
;
margin
:
auto
;
...
...
app/assets/stylesheets/pages/clusters.scss
View file @
6ff078cd
...
...
@@ -69,7 +69,7 @@
align-self
:
flex-start
;
font-weight
:
500
;
font-size
:
20px
;
color
:
$orange-
9
00
;
color
:
$orange-
5
00
;
opacity
:
1
;
margin
:
$gl-padding-8
14px
0
0
;
}
...
...
@@ -156,7 +156,7 @@
}
.cluster-deployments-warning
{
color
:
$orange-
6
00
;
color
:
$orange-
5
00
;
}
.badge.pods-badge
{
...
...
app/assets/stylesheets/pages/dev_ops_score.scss
View file @
6ff078cd
...
...
@@ -88,7 +88,7 @@ $space-between-cards: 8px;
}
.devops-card-average
{
border-top-color
:
$orange-
4
00
;
border-top-color
:
$orange-
2
00
;
.board-card-score-big
{
background-color
:
$orange-50
;
...
...
@@ -247,7 +247,7 @@ $space-between-cards: 8px;
}
.devops-average-score
{
color
:
$orange-
4
00
;
color
:
$orange-
5
00
;
}
.devops-low-score
{
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
6ff078cd
.issuable-warning-icon
{
background-color
:
$orange-
10
0
;
background-color
:
$orange-
5
0
;
border-radius
:
$border-radius-default
;
width
:
$issuable-warning-size
;
height
:
$issuable-warning-size
;
...
...
@@ -982,7 +982,7 @@
}
.suggestion-confidential
{
color
:
$orange-
6
00
;
color
:
$orange-
5
00
;
}
.suggestion-state-open
{
...
...
app/assets/stylesheets/pages/note_form.scss
View file @
6ff078cd
...
...
@@ -97,7 +97,7 @@
.issuable-note-warning
{
color
:
$orange-600
;
background-color
:
$orange-
10
0
;
background-color
:
$orange-
5
0
;
border-radius
:
$border-radius-default
$border-radius-default
0
0
;
border
:
1px
solid
$border-gray-normal
;
border-bottom
:
0
;
...
...
app/assets/stylesheets/pages/pipelines.scss
View file @
6ff078cd
...
...
@@ -781,7 +781,7 @@
&
.ci-status-icon-pending
,
&
.ci-status-icon-waiting-for-resource
,
&
.ci-status-icon-success-with-warnings
{
@include
mini-pipeline-graph-color
(
$white
,
$orange-
100
,
$orange-2
00
,
$orange-500
,
$orange-600
,
$orange-700
);
@include
mini-pipeline-graph-color
(
$white
,
$orange-
50
,
$orange-1
00
,
$orange-500
,
$orange-600
,
$orange-700
);
}
&
.ci-status-icon-preparing
,
...
...
app/assets/stylesheets/pages/settings.scss
View file @
6ff078cd
...
...
@@ -124,8 +124,8 @@
.settings-message
{
padding
:
5px
;
line-height
:
1
.3
;
color
:
$
orange-7
00
;
background-color
:
$orange-
10
0
;
color
:
$
gray-9
00
;
background-color
:
$orange-
5
0
;
border
:
1px
solid
$orange-200
;
border-radius
:
$border-radius-base
;
}
...
...
@@ -135,7 +135,7 @@
}
.warning-title
{
color
:
$
orange-5
00
;
color
:
$
gray-9
00
;
}
.danger-title
{
...
...
app/assets/stylesheets/pages/status.scss
View file @
6ff078cd
...
...
@@ -43,7 +43,7 @@
&
.ci-waiting-for-resource
,
&
.ci-failed-with-warnings
,
&
.ci-success-with-warnings
{
@include
status-color
(
$orange-
10
0
,
$orange-500
,
$orange-700
);
@include
status-color
(
$orange-
5
0
,
$orange-500
,
$orange-700
);
}
&
.ci-info
,
...
...
app/assets/stylesheets/pages/tree.scss
View file @
6ff078cd
...
...
@@ -173,7 +173,7 @@
.tree-truncated-warning
{
color
:
$orange-600
;
background-color
:
$orange-
10
0
;
background-color
:
$orange-
5
0
;
}
.tree-time-ago
{
...
...
app/assets/stylesheets/vendors/atwho.scss
View file @
6ff078cd
...
...
@@ -24,8 +24,8 @@
.has-warning
{
.description
{
color
:
$
orange-7
00
;
background-color
:
$orange-
10
0
;
color
:
$
gray-9
00
;
background-color
:
$orange-
5
0
;
}
}
...
...
@@ -58,7 +58,7 @@
}
&
.has-warning
{
color
:
$orange-
7
00
;
color
:
$orange-
5
00
;
}
}
...
...
ee/app/assets/stylesheets/components/batch_comments/draft_note.scss
View file @
6ff078cd
...
...
@@ -5,7 +5,7 @@ $draft-actions-left-margin: 40px + $gl-padding;
background
:
$orange-50
;
.referenced-commands.draft-note-commands
{
background
:
$orange-
10
0
;
background
:
$orange-
5
0
;
font-size
:
$label-font-size
;
margin
:
0
0
$gl-padding
$draft-actions-left-margin
;
}
...
...
@@ -35,7 +35,7 @@ button[disabled] {
}
.draft-pending-label
{
background
:
$orange-
6
00
;
background
:
$orange-
5
00
;
color
:
$white
;
vertical-align
:
text-top
;
}
...
...
@@ -72,6 +72,6 @@ button[disabled] {
.frame
,
.diff-discussions
{
.badge.is-draft
{
background-color
:
$orange-
6
00
;
background-color
:
$orange-
5
00
;
}
}
ee/app/assets/stylesheets/pages/issuable.scss
View file @
6ff078cd
...
...
@@ -106,8 +106,8 @@
}
&
-needs-attention
{
color
:
$
orange-7
00
;
background-color
:
$orange-
10
0
;
color
:
$
gray-9
00
;
background-color
:
$orange-
5
0
;
}
&
-on-track
{
...
...
ee/changelogs/unreleased/241728-update-orange-variables-in-gitlab-to-match-gitlab-ui.yml
0 → 100644
View file @
6ff078cd
---
title
:
Update $orange variables to match GitLab UI and address contrast for accessibility
merge_request
:
40652
author
:
type
:
other
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