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
5e272889
Commit
5e272889
authored
Mar 18, 2016
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup somce css colors
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
3837f441
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
20 deletions
+25
-20
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+14
-11
app/assets/stylesheets/pages/events.scss
app/assets/stylesheets/pages/events.scss
+4
-3
app/assets/stylesheets/pages/issues.scss
app/assets/stylesheets/pages/issues.scss
+3
-3
app/assets/stylesheets/pages/todos.scss
app/assets/stylesheets/pages/todos.scss
+4
-3
No files found.
app/assets/stylesheets/framework/variables.scss
View file @
5e272889
...
@@ -17,25 +17,29 @@ $background-color: #faf9f9;
...
@@ -17,25 +17,29 @@ $background-color: #faf9f9;
/*
/*
* Text
* Text
*/
*/
$secondary-text
:
#555
;
$gl-font-size
:
15px
;
$placeholder-color
:
#8f8f8f
;
$gl-title-color
:
#333
;
$gl-text-color
:
#54565b
;
$gl-text-color
:
#555
;
$gl-placeholder-color
:
#8f8f8f
;
$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
:
#323232
;
$gl-header-color
:
$gl-title-color
;
$gl-link-color
:
#333c48
;
$gl-link-color
:
#333c48
;
$gl-gray
:
#5a5a5a
;
$gl-gray
:
$gl-text-color
;
$md-text-color
:
#444
;
$md-link-color
:
#3084bb
;
/*
/*
* Lists
* Lists
*/
*/
$list-
title-color
:
#333
;
$list-
font-size
:
$gl-font-size
;
$list-t
ext-color
:
#555
;
$list-t
itle-color
:
$gl-title-color
;
$list-
font-size
:
15px
;
$list-
text-color
:
$gl-text-color
;
/*
* Markdown
*/
$md-text-color
:
#444
;
$md-link-color
:
#3084bb
;
/*
/*
* Code
* Code
...
@@ -56,7 +60,6 @@ $gl-padding-top: 10px;
...
@@ -56,7 +60,6 @@ $gl-padding-top: 10px;
*/
*/
$row-hover
:
#f4f8fe
;
$row-hover
:
#f4f8fe
;
$progress-color
:
#c0392b
;
$progress-color
:
#c0392b
;
$gl-font-size
:
15px
;
$avatar_radius
:
50%
;
$avatar_radius
:
50%
;
$header-height
:
58px
;
$header-height
:
58px
;
$fixed-layout-width
:
1280px
;
$fixed-layout-width
:
1280px
;
...
...
app/assets/stylesheets/pages/events.scss
View file @
5e272889
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
font-size
:
$gl-font-size
;
font-size
:
$gl-font-size
;
padding
:
$gl-padding-top
0
$gl-padding-top
(
$gl-avatar-size
+
$gl-padding-top
);
padding
:
$gl-padding-top
0
$gl-padding-top
(
$gl-avatar-size
+
$gl-padding-top
);
border-bottom
:
1px
solid
$table-border-color
;
border-bottom
:
1px
solid
$table-border-color
;
color
:
#7f8fa4
;
color
:
$list-text-color
;
&
.event-inline
{
&
.event-inline
{
.avatar
{
.avatar
{
...
@@ -31,9 +31,10 @@
...
@@ -31,9 +31,10 @@
.event-title
{
.event-title
{
@include
str-truncated
(
calc
(
100%
-
174px
));
@include
str-truncated
(
calc
(
100%
-
174px
));
font-weight
:
600
;
font-weight
:
600
;
color
:
$list-title-color
;
.author_name
{
a
{
color
:
#333
;
color
:
$list-title-color
;
}
}
}
}
...
...
app/assets/stylesheets/pages/issues.scss
View file @
5e272889
...
@@ -130,14 +130,14 @@ form.edit-issue {
...
@@ -130,14 +130,14 @@ form.edit-issue {
}
}
.issue-closed-by-widget
{
.issue-closed-by-widget
{
color
:
$
secondary-text
;
color
:
$
gl-text-color
;
margin-left
:
52px
;
margin-left
:
52px
;
}
}
.editor-details
{
.editor-details
{
display
:
block
;
display
:
block
;
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
display
:
inline-block
;
display
:
inline-block
;
}
}
}
}
\ No newline at end of file
app/assets/stylesheets/pages/todos.scss
View file @
5e272889
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
.todo-item
{
.todo-item
{
font-size
:
$gl-font-size
;
font-size
:
$gl-font-size
;
padding-left
:
$gl-avatar-size
+
$gl-padding-top
;
padding-left
:
$gl-avatar-size
+
$gl-padding-top
;
color
:
$
secondary-text
;
color
:
$
gl-text-color
;
a
{
a
{
color
:
#4c4e54
;
color
:
#4c4e54
;
...
@@ -29,9 +29,10 @@
...
@@ -29,9 +29,10 @@
.todo-title
{
.todo-title
{
@include
str-truncated
(
calc
(
100%
-
174px
));
@include
str-truncated
(
calc
(
100%
-
174px
));
font-weight
:
600
;
font-weight
:
600
;
color
:
$list-title-color
;
.author-name
{
a
{
color
:
#333
;
color
:
$list-title-color
;
}
}
}
}
...
...
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