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
7bba70c2
Commit
7bba70c2
authored
May 20, 2020
by
Florie Guibert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update card grey border color to #dbdbdb
Migrate CSS variable gray-100 to $gray-50
parent
863ee664
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
32 additions
and
32 deletions
+32
-32
app/assets/javascripts/ci_variable_list/components/ci_key_field.vue
.../javascripts/ci_variable_list/components/ci_key_field.vue
+1
-1
app/assets/stylesheets/bootstrap_migration.scss
app/assets/stylesheets/bootstrap_migration.scss
+1
-1
app/assets/stylesheets/components/dashboard_skeleton.scss
app/assets/stylesheets/components/dashboard_skeleton.scss
+3
-3
app/assets/stylesheets/framework/animations.scss
app/assets/stylesheets/framework/animations.scss
+4
-4
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+1
-1
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+2
-2
app/assets/stylesheets/framework/files.scss
app/assets/stylesheets/framework/files.scss
+1
-1
app/assets/stylesheets/framework/gitlab_theme.scss
app/assets/stylesheets/framework/gitlab_theme.scss
+2
-2
app/assets/stylesheets/framework/markdown_area.scss
app/assets/stylesheets/framework/markdown_area.scss
+1
-1
app/assets/stylesheets/framework/tables.scss
app/assets/stylesheets/framework/tables.scss
+1
-1
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-1
app/assets/stylesheets/page_bundles/ide.scss
app/assets/stylesheets/page_bundles/ide.scss
+5
-5
app/assets/stylesheets/pages/labels.scss
app/assets/stylesheets/pages/labels.scss
+2
-2
app/assets/stylesheets/pages/note_form.scss
app/assets/stylesheets/pages/note_form.scss
+2
-2
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+3
-3
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+1
-1
ee/app/assets/stylesheets/pages/roadmap.scss
ee/app/assets/stylesheets/pages/roadmap.scss
+1
-1
No files found.
app/assets/javascripts/ci_variable_list/components/ci_key_field.vue
View file @
7bba70c2
...
...
@@ -154,7 +154,7 @@ export default {
v-for=
"(result, i) in results"
:key=
"i"
role=
"option"
:class=
"
{ 'gl-bg-gray-
10
0': i === arrowCounter }"
:class=
"
{ 'gl-bg-gray-
5
0': i === arrowCounter }"
:aria-selected="i === arrowCounter"
>
<gl-button
tabindex=
"-1"
class=
"btn-transparent pl-2"
@
click=
"selectToken(result)"
>
{{
...
...
app/assets/stylesheets/bootstrap_migration.scss
View file @
7bba70c2
...
...
@@ -111,7 +111,7 @@ kbd {
code
{
padding
:
2px
4px
;
color
:
$code-color
;
background-color
:
$gray-
10
0
;
background-color
:
$gray-
5
0
;
border-radius
:
$border-radius-default
;
.code
>
&
{
...
...
app/assets/stylesheets/components/dashboard_skeleton.scss
View file @
7bba70c2
...
...
@@ -67,10 +67,10 @@
background-repeat
:
no-repeat
;
background-size
:
cover
;
background-image
:
linear-gradient
(
to
right
,
$gray-
10
0
0%
,
$gray-
5
0
0%
,
$gray-10
20%
,
$gray-
10
0
40%
,
$gray-
10
0
100%
);
$gray-
5
0
40%
,
$gray-
5
0
100%
);
border-radius
:
$gl-padding
;
height
:
$gl-padding
;
margin-top
:
-
$gl-padding-8
;
...
...
app/assets/stylesheets/framework/animations.scss
View file @
7bba70c2
...
...
@@ -177,7 +177,7 @@ a {
[
class
^=
'skeleton-line-'
]
{
position
:
relative
;
background-color
:
$gray-
10
0
;
background-color
:
$gray-
5
0
;
height
:
10px
;
overflow
:
hidden
;
...
...
@@ -192,10 +192,10 @@ a {
background-repeat
:
no-repeat
;
background-size
:
cover
;
background-image
:
linear-gradient
(
to
right
,
$gray-
10
0
0%
,
$gray-
5
0
0%
,
$gray-10
20%
,
$gray-
10
0
40%
,
$gray-
10
0
100%
);
$gray-
5
0
40%
,
$gray-
5
0
100%
);
height
:
10px
;
}
}
...
...
app/assets/stylesheets/framework/common.scss
View file @
7bba70c2
...
...
@@ -602,7 +602,7 @@ img.emoji {
bottom
:
40px
;
right
:
40px
;
font-size
:
$gl-font-size-small
;
background
:
$gray-
10
0
;
background
:
$gray-
5
0
;
width
:
200px
;
border-radius
:
24px
;
box-shadow
:
0
2px
4px
$issue-boards-card-shadow
;
...
...
app/assets/stylesheets/framework/dropdowns.scss
View file @
7bba70c2
...
...
@@ -940,7 +940,7 @@ header.header-content .dropdown-menu.frequent-items-dropdown-menu {
position
:
absolute
;
top
:
13px
;
right
:
25px
;
color
:
$gray-
10
0
;
color
:
$gray-
5
0
;
}
}
...
...
@@ -979,7 +979,7 @@ header.header-content .dropdown-menu.frequent-items-dropdown-menu {
&
:hover
{
.frequent-items-item-avatar-container
.avatar
{
border-color
:
$gray-
10
0
;
border-color
:
$gray-
5
0
;
}
}
...
...
app/assets/stylesheets/framework/files.scss
View file @
7bba70c2
...
...
@@ -480,7 +480,7 @@ span.idiff {
padding-bottom
:
$gl-padding
;
.discussion-reply-holder
{
border-bottom
:
1px
solid
$gray-
10
0
;
border-bottom
:
1px
solid
$gray-
5
0
;
border-radius
:
0
;
}
}
...
...
app/assets/stylesheets/framework/gitlab_theme.scss
View file @
7bba70c2
...
...
@@ -314,12 +314,12 @@ body {
$gray-800
,
$gray-700
,
$gray-700
,
$gray-
10
0
,
$gray-
5
0
,
$gray-700
);
.navbar-gitlab
{
background-color
:
$gray-
10
0
;
background-color
:
$gray-
5
0
;
box-shadow
:
0
1px
0
0
$border-color
;
.logo-text
svg
{
...
...
app/assets/stylesheets/framework/markdown_area.scss
View file @
7bba70c2
...
...
@@ -123,7 +123,7 @@
.markdown-area
{
border-radius
:
0
;
background
:
$white
;
border
:
1px
solid
$gray-
10
0
;
border
:
1px
solid
$gray-
5
0
;
min-height
:
140px
;
max-height
:
500px
;
padding
:
5px
;
...
...
app/assets/stylesheets/framework/tables.scss
View file @
7bba70c2
...
...
@@ -47,7 +47,7 @@ table {
}
th
{
@include
gl-bg-gray-
10
0
;
@include
gl-bg-gray-
5
0
;
border-bottom
:
0
;
&
.wide
{
...
...
app/assets/stylesheets/framework/variables.scss
View file @
7bba70c2
...
...
@@ -165,7 +165,7 @@ $red-950: #4b140b;
$gray-10
:
#fafafa
;
$gray-50
:
#f0f0f0
;
$gray-100
:
#
f2f2f2
;
$gray-100
:
#
dbdbdb
;
$gray-200
:
#dfdfdf
;
$gray-300
:
#ccc
;
$gray-400
:
#bababa
;
...
...
app/assets/stylesheets/page_bundles/ide.scss
View file @
7bba70c2
...
...
@@ -386,7 +386,7 @@ $ide-commit-header-height: 48px;
&
:hover
,
&
:focus
{
background
:
var
(
--
ide-background
,
$gray-
10
0
);
background
:
var
(
--
ide-background
,
$gray-
5
0
);
outline
:
0
;
}
...
...
@@ -558,7 +558,7 @@ $ide-commit-header-height: 48px;
&
:hover
{
color
:
var
(
--
ide-text-color
,
$gl-text-color
);
background-color
:
var
(
--
ide-background-hover
,
$gray-
10
0
);
background-color
:
var
(
--
ide-background-hover
,
$gray-
5
0
);
}
&
:focus
{
...
...
@@ -1043,7 +1043,7 @@ $ide-commit-header-height: 48px;
.ide-entry-dropdown-toggle
{
padding
:
$gl-padding-4
;
color
:
var
(
--
ide-text-color
,
$gl-text-color
);
background-color
:
var
(
--
ide-background
,
$gray-
10
0
);
background-color
:
var
(
--
ide-background
,
$gray-
5
0
);
&
:hover
{
background-color
:
var
(
--
ide-file-row-btn-hover-background
,
$gray-200
);
...
...
@@ -1144,12 +1144,12 @@ $ide-commit-header-height: 48px;
}
.file-row.is-active
{
background
:
var
(
--
ide-background
,
$gray-
10
0
);
background
:
var
(
--
ide-background
,
$gray-
5
0
);
}
.file-row
:hover
,
.file-row
:focus
{
background
:
var
(
--
ide-background
,
$gray-
10
0
);
background
:
var
(
--
ide-background
,
$gray-
5
0
);
.ide-new-btn
{
display
:
block
;
...
...
app/assets/stylesheets/pages/labels.scss
View file @
7bba70c2
...
...
@@ -86,7 +86,7 @@
justify-content
:
space-between
;
padding
:
$gl-padding
;
border-radius
:
$border-radius-default
;
border
:
1px
solid
$gray-
10
0
;
border
:
1px
solid
$gray-
5
0
;
&
:last-child
{
margin-bottom
:
0
;
...
...
@@ -276,7 +276,7 @@
}
.label-badge-gray
{
background-color
:
$gray-
10
0
;
background-color
:
$gray-
5
0
;
}
.label-links
{
...
...
app/assets/stylesheets/pages/note_form.scss
View file @
7bba70c2
...
...
@@ -253,11 +253,11 @@ table {
background-color
:
$gray-light
;
border-radius
:
0
0
3px
3px
;
padding
:
$gl-padding
;
border-top
:
1px
solid
$gray-
10
0
;
border-top
:
1px
solid
$gray-
5
0
;
+
.new-note
{
background-color
:
$gray-light
;
border-top
:
1px
solid
$gray-
10
0
;
border-top
:
1px
solid
$gray-
5
0
;
}
&
.is-replying
{
...
...
app/assets/stylesheets/pages/notes.scss
View file @
7bba70c2
...
...
@@ -5,7 +5,7 @@ $note-form-margin-left: 72px;
@mixin
vertical-line
(
$left
)
{
&
:
:
before
{
content
:
''
;
border-left
:
2px
solid
$gray-
10
0
;
border-left
:
2px
solid
$gray-
5
0
;
position
:
absolute
;
top
:
0
;
bottom
:
0
;
...
...
@@ -83,8 +83,8 @@ $note-form-margin-left: 72px;
.replies-toggle
{
background-color
:
$gray-light
;
padding
:
$gl-padding-8
$gl-padding
;
border-top
:
1px
solid
$gray-
10
0
;
border-bottom
:
1px
solid
$gray-
10
0
;
border-top
:
1px
solid
$gray-
5
0
;
border-bottom
:
1px
solid
$gray-
5
0
;
.collapse-replies-btn
:hover
{
color
:
$blue-600
;
...
...
app/assets/stylesheets/pages/projects.scss
View file @
7bba70c2
...
...
@@ -396,7 +396,7 @@
margin-right
:
$gl-padding-4
;
margin-bottom
:
$gl-padding-4
;
color
:
$gl-text-color-secondary
;
background-color
:
$gray-
10
0
;
background-color
:
$gray-
5
0
;
line-height
:
$gl-btn-line-height
;
&
:hover
{
...
...
ee/app/assets/stylesheets/pages/roadmap.scss
View file @
7bba70c2
...
...
@@ -255,7 +255,7 @@ html.group-epics-roadmap-html {
&
:hover
{
.epic-details-cell
,
.epic-timeline-cell
{
background-color
:
$gray-
10
0
;
background-color
:
$gray-
5
0
;
}
}
...
...
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