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
51df9360
Commit
51df9360
authored
8 years ago
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SCSS colors into variables
parent
f62d7d26
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
26 deletions
+31
-26
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+6
-0
app/assets/stylesheets/framework/zen.scss
app/assets/stylesheets/framework/zen.scss
+2
-2
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+0
-18
app/assets/stylesheets/pages/note_form.scss
app/assets/stylesheets/pages/note_form.scss
+5
-6
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+18
-0
No files found.
app/assets/stylesheets/framework/variables.scss
View file @
51df9360
...
@@ -217,3 +217,9 @@ $notes-light-color: #8e8e8e;
...
@@ -217,3 +217,9 @@ $notes-light-color: #8e8e8e;
$notes-action-color
:
#c3c3c3
;
$notes-action-color
:
#c3c3c3
;
$notes-role-color
:
#8e8e8e
;
$notes-role-color
:
#8e8e8e
;
$notes-role-border-color
:
#e4e4e4
;
$notes-role-border-color
:
#e4e4e4
;
$note-disabled-comment-color
:
#b2b2b2
;
$note-form-border-color
:
#e5e5e5
;
$note-toolbar-color
:
#959494
;
$zen-control-hover-color
:
#111
;
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/framework/zen.scss
View file @
51df9360
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
}
}
.zen-control-full
{
.zen-control-full
{
color
:
#959494
;
color
:
$note-toolbar-color
;
&
:hover
{
&
:hover
{
color
:
$gl-link-color
;
color
:
$gl-link-color
;
...
@@ -57,6 +57,6 @@
...
@@ -57,6 +57,6 @@
font-size
:
36px
;
font-size
:
36px
;
&
:hover
{
&
:hover
{
color
:
#111
;
color
:
$zen-control-hover-color
;
}
}
}
}
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/merge_requests.scss
View file @
51df9360
...
@@ -195,24 +195,6 @@
...
@@ -195,24 +195,6 @@
line-height
:
31px
;
line-height
:
31px
;
}
}
.disabled-comment
{
margin-left
:
-
$gl-padding-top
;
margin-right
:
-
$gl-padding-top
;
background-color
:
$gray-light
;
border-radius
:
$border-radius-base
;
border
:
1px
solid
$border-gray-normal
;
color
:
#b2b2b2
;
line-height
:
200px
;
.disabled-comment-text
{
line-height
:
normal
;
}
a
{
color
:
$gl-link-color
;
}
}
.builds
{
.builds
{
.table-holder
{
.table-holder
{
overflow-x
:
scroll
;
overflow-x
:
scroll
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/note_form.scss
View file @
51df9360
...
@@ -58,17 +58,17 @@
...
@@ -58,17 +58,17 @@
.common-note-form
{
.common-note-form
{
.md-area
{
.md-area
{
padding
:
$gl-padding-top
$gl-padding
;
padding
:
$gl-padding-top
$gl-padding
;
border
:
1px
solid
#e5e5e5
;
border
:
1px
solid
$note-form-border-color
;
border-radius
:
$border-radius-base
;
border-radius
:
$border-radius-base
;
&
.is-focused
{
&
.is-focused
{
border-color
:
#3b99fc
;
border-color
:
$focus-border-color
;
box-shadow
:
0
0
2px
rgba
(
#000
,
.2
)
,
box-shadow
:
0
0
2px
rgba
(
#000
,
.2
)
,
0
0
4px
rgba
(
#3b99fc
,
.5
);
0
0
4px
rgba
(
$focus-border-color
,
.4
);
.comment-toolbar
,
.comment-toolbar
,
.nav-links
{
.nav-links
{
border-color
:
#3b99fc
;
border-color
:
$focus-border-color
;
}
}
}
}
}
}
...
@@ -139,6 +139,7 @@
...
@@ -139,6 +139,7 @@
.comment-toolbar
{
.comment-toolbar
{
padding-top
:
$gl-padding-top
;
padding-top
:
$gl-padding-top
;
color
:
$note-toolbar-color
;
border-top
:
1px
solid
$border-color
;
border-top
:
1px
solid
$border-color
;
}
}
...
@@ -146,7 +147,6 @@
...
@@ -146,7 +147,6 @@
padding
:
0
;
padding
:
0
;
background
:
none
;
background
:
none
;
border
:
0
;
border
:
0
;
color
:
#959494
;
font-size
:
14px
;
font-size
:
14px
;
line-height
:
16px
;
line-height
:
16px
;
...
@@ -176,7 +176,6 @@
...
@@ -176,7 +176,6 @@
}
}
.toolbar-text
{
.toolbar-text
{
color
:
#959494
;
font-size
:
14px
;
font-size
:
14px
;
line-height
:
16px
;
line-height
:
16px
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/notes.scss
View file @
51df9360
...
@@ -287,3 +287,21 @@ ul.notes {
...
@@ -287,3 +287,21 @@ ul.notes {
}
}
}
}
}
}
.disabled-comment
{
margin-left
:
-
$gl-padding-top
;
margin-right
:
-
$gl-padding-top
;
background-color
:
$gray-light
;
border-radius
:
$border-radius-base
;
border
:
1px
solid
$border-gray-normal
;
color
:
$note-disabled-comment-color
;
line-height
:
200px
;
.disabled-comment-text
{
line-height
:
normal
;
}
a
{
color
:
$gl-link-color
;
}
}
This diff is collapsed.
Click to expand it.
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