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
882f97e4
Commit
882f97e4
authored
Aug 15, 2016
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Satisfy scss-lint
parent
8429a578
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
app/assets/stylesheets/pages/merge_conflicts.scss
app/assets/stylesheets/pages/merge_conflicts.scss
+4
-4
No files found.
app/assets/stylesheets/pages/merge_conflicts.scss
View file @
882f97e4
...
@@ -19,12 +19,12 @@ $colors: (
...
@@ -19,12 +19,12 @@ $colors: (
white_line_not_chosen
:
#f9f9f9
,
white_line_not_chosen
:
#f9f9f9
,
dark_header_head_neutral
:
rgba
(
#3
3ff3
3
,
.2
)
,
dark_header_head_neutral
:
rgba
(
#3
f
3
,
.2
)
,
dark_line_head_neutral
:
rgba
(
#3
3ff3
3
,
.1
)
,
dark_line_head_neutral
:
rgba
(
#3
f
3
,
.1
)
,
dark_button_head_neutral
:
#40874f
,
dark_button_head_neutral
:
#40874f
,
dark_header_head_chosen
:
rgba
(
#3
3ff3
3
,
.33
)
,
dark_header_head_chosen
:
rgba
(
#3
f
3
,
.33
)
,
dark_line_head_chosen
:
rgba
(
#3
3ff3
3
,
.2
)
,
dark_line_head_chosen
:
rgba
(
#3
f
3
,
.2
)
,
dark_button_head_chosen
:
#258537
,
dark_button_head_chosen
:
#258537
,
dark_header_origin_neutral
:
rgba
(
#2878c9
,
.4
)
,
dark_header_origin_neutral
:
rgba
(
#2878c9
,
.4
)
,
...
...
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