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
1c8ec154
Commit
1c8ec154
authored
Sep 03, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor colors
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
89df4a79
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
14 deletions
+17
-14
app/assets/stylesheets/base/variables.scss
app/assets/stylesheets/base/variables.scss
+1
-2
app/assets/stylesheets/generic/blocks.scss
app/assets/stylesheets/generic/blocks.scss
+8
-3
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+0
-2
app/assets/stylesheets/generic/lists.scss
app/assets/stylesheets/generic/lists.scss
+6
-0
app/assets/stylesheets/pages/commit.scss
app/assets/stylesheets/pages/commit.scss
+0
-4
app/views/dashboard/groups/index.html.haml
app/views/dashboard/groups/index.html.haml
+1
-2
app/views/shared/groups/_group.html.haml
app/views/shared/groups/_group.html.haml
+1
-1
No files found.
app/assets/stylesheets/base/variables.scss
View file @
1c8ec154
$style_color
:
#474D57
;
$hover
:
#FFFAF1
;
$hover
:
#FFFAF1
;
$gl-text-color
:
#
7f8fa4
;
$gl-text-color
:
#
54565b
;
$gl-header-color
:
#4c4e54
;
$gl-header-color
:
#4c4e54
;
$gl-link-color
:
#333c48
;
$gl-link-color
:
#333c48
;
$nprogress-color
:
#c0392b
;
$nprogress-color
:
#c0392b
;
...
...
app/assets/stylesheets/generic/blocks.scss
View file @
1c8ec154
.light-well
{
.light-well
{
background
:
#f9f9f9
;
background
-color
:
#f8fafc
;
padding
:
15px
;
padding
:
15px
;
}
}
.centered-light-block
{
.centered-light-block
{
text-align
:
center
;
text-align
:
center
;
color
:
#888
;
color
:
$gl-gray
;
margin
:
20px
;
margin
:
20px
;
}
}
.nothing-here-block
{
.nothing-here-block
{
text-align
:
center
;
text-align
:
center
;
padding
:
20px
;
padding
:
20px
;
color
:
#666
;
color
:
$gl-gray
;
font-weight
:
normal
;
font-weight
:
normal
;
font-size
:
16px
;
font-size
:
16px
;
line-height
:
36px
;
line-height
:
36px
;
...
@@ -25,4 +25,9 @@
...
@@ -25,4 +25,9 @@
margin-bottom
:
0px
;
margin-bottom
:
0px
;
border-top
:
1px
solid
#e7e9ed
;
border-top
:
1px
solid
#e7e9ed
;
border-bottom
:
1px
solid
#e7e9ed
;
border-bottom
:
1px
solid
#e7e9ed
;
color
:
$gl-gray
;
.title
{
color
:
$gl-text-color
;
}
}
}
app/assets/stylesheets/generic/common.scss
View file @
1c8ec154
...
@@ -74,8 +74,6 @@ pre {
...
@@ -74,8 +74,6 @@ pre {
color
:
$gl-link-color
;
color
:
$gl-link-color
;
}
}
.help
li
{
color
:
$style_color
;
}
.back-link
{
.back-link
{
font-size
:
14px
;
font-size
:
14px
;
}
}
...
...
app/assets/stylesheets/generic/lists.scss
View file @
1c8ec154
...
@@ -109,10 +109,16 @@ ul.content-list {
...
@@ -109,10 +109,16 @@ ul.content-list {
padding
:
18px
;
padding
:
18px
;
border-color
:
#f1f2f4
;
border-color
:
#f1f2f4
;
margin
:
0
-18px
;
margin
:
0
-18px
;
color
:
$gl-gray
;
.avatar
{
.avatar
{
margin-right
:
15px
;
margin-right
:
15px
;
}
}
.controls
{
padding-top
:
10px
;
float
:
right
;
}
}
}
}
}
app/assets/stylesheets/pages/commit.scss
View file @
1c8ec154
...
@@ -61,10 +61,6 @@
...
@@ -61,10 +61,6 @@
}
}
}
}
.file-stats
a
{
color
:
$style_color
;
}
.file-stats
{
.file-stats
{
.new-file
{
.new-file
{
a
{
a
{
...
...
app/views/dashboard/groups/index.html.haml
View file @
1c8ec154
...
@@ -7,8 +7,7 @@
...
@@ -7,8 +7,7 @@
=
link_to
new_group_path
,
class:
"btn btn-new"
do
=
link_to
new_group_path
,
class:
"btn btn-new"
do
%i
.fa.fa-plus
%i
.fa.fa-plus
New Group
New Group
Welcome to the groups!
.title
Welcome to the groups!
%br
Group members have access to all group projects.
Group members have access to all group projects.
%ul
.content-list
%ul
.content-list
...
...
app/views/shared/groups/_group.html.haml
View file @
1c8ec154
-
group_member
=
local_assigns
[
:group_member
]
-
group_member
=
local_assigns
[
:group_member
]
%li
%li
-
if
group_member
-
if
group_member
.
pull-right
.hidden-xs
.
controls
.hidden-xs
-
if
can?
(
current_user
,
:admin_group
,
group
)
-
if
can?
(
current_user
,
:admin_group
,
group
)
=
link_to
edit_group_path
(
group
),
class:
"btn-sm btn btn-grouped"
do
=
link_to
edit_group_path
(
group
),
class:
"btn-sm btn btn-grouped"
do
%i
.fa.fa-cogs
%i
.fa.fa-cogs
...
...
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