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
Jérome Perrin
gitlab-ce
Commits
cd73b26e
Commit
cd73b26e
authored
Mar 06, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor gitlab css state colors
parent
3bfd5314
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
65 additions
and
68 deletions
+65
-68
app/assets/stylesheets/generic/buttons.scss
app/assets/stylesheets/generic/buttons.scss
+4
-4
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+1
-1
app/assets/stylesheets/generic/issue_box.scss
app/assets/stylesheets/generic/issue_box.scss
+3
-3
app/assets/stylesheets/generic/jquery.scss
app/assets/stylesheets/generic/jquery.scss
+2
-2
app/assets/stylesheets/generic/selects.scss
app/assets/stylesheets/generic/selects.scss
+1
-1
app/assets/stylesheets/gl_bootstrap.scss
app/assets/stylesheets/gl_bootstrap.scss
+28
-16
app/assets/stylesheets/main/variables.scss
app/assets/stylesheets/main/variables.scss
+6
-21
app/assets/stylesheets/sections/dashboard.scss
app/assets/stylesheets/sections/dashboard.scss
+4
-4
app/assets/stylesheets/sections/merge_requests.scss
app/assets/stylesheets/sections/merge_requests.scss
+8
-8
app/assets/stylesheets/sections/notes.scss
app/assets/stylesheets/sections/notes.scss
+1
-1
app/assets/stylesheets/sections/notifications.scss
app/assets/stylesheets/sections/notifications.scss
+3
-3
app/assets/stylesheets/sections/projects.scss
app/assets/stylesheets/sections/projects.scss
+3
-3
app/assets/stylesheets/sections/tree.scss
app/assets/stylesheets/sections/tree.scss
+1
-1
No files found.
app/assets/stylesheets/generic/buttons.scss
View file @
cd73b26e
...
...
@@ -41,16 +41,16 @@
}
&
.btn-close
{
color
:
$
bg_
danger
;
border-color
:
$
border_
danger
;
color
:
$
gl-
danger
;
border-color
:
$
gl-
danger
;
&
:hover
{
color
:
#B94A48
;
}
}
&
.btn-reopen
{
color
:
$
bg_
success
;
border-color
:
$
border_
success
;
color
:
$
gl-
success
;
border-color
:
$
gl-
success
;
&
:hover
{
color
:
#468847
;
}
...
...
app/assets/stylesheets/generic/common.scss
View file @
cd73b26e
...
...
@@ -61,7 +61,7 @@ pre {
.dropdown-menu
>
li
>
a
:hover
,
.dropdown-menu
>
li
>
a
:focus
{
background
:
$
bg_
primary
;
background
:
$
gl-
primary
;
color
:
#FFF
}
...
...
app/assets/stylesheets/generic/issue_box.scss
View file @
cd73b26e
...
...
@@ -11,17 +11,17 @@
margin-right
:
5px
;
&
.issue-box-closed
{
background-color
:
$
bg_
danger
;
background-color
:
$
gl-
danger
;
color
:
#FFF
;
}
&
.issue-box-merged
{
background-color
:
$
bg_
primary
;
background-color
:
$
gl-
primary
;
color
:
#FFF
;
}
&
.issue-box-open
{
background-color
:
$
bg_
success
;
background-color
:
$
gl-
success
;
color
:
#FFF
;
}
...
...
app/assets/stylesheets/generic/jquery.scss
View file @
cd73b26e
...
...
@@ -41,8 +41,8 @@
}
.ui-state-active
{
border
:
1px
solid
$
bg_
primary
;
background
:
$
bg_
primary
;
border
:
1px
solid
$
gl-
primary
;
background
:
$
gl-
primary
;
color
:
#FFF
;
}
...
...
app/assets/stylesheets/generic/selects.scss
View file @
cd73b26e
...
...
@@ -42,7 +42,7 @@
.select2-results
{
max-height
:
350px
;
.select2-highlighted
{
background
:
$
bg_
primary
;
background
:
$
gl-
primary
;
}
}
}
...
...
app/assets/stylesheets/gl_bootstrap.scss
View file @
cd73b26e
...
...
@@ -4,15 +4,27 @@
*/
$font-size-base
:
13px
!
default
;
$nav-pills-active-link-hover-bg
:
$
bg_
primary
;
$pagination-active-bg
:
$
bg_
primary
;
$list-group-active-bg
:
$
bg_
primary
;
$nav-pills-active-link-hover-bg
:
$
gl-
primary
;
$pagination-active-bg
:
$
gl-
primary
;
$list-group-active-bg
:
$
gl-
primary
;
$brand-primary
:
$bg_primary
;
$brand-success
:
$bg_success
;
$brand-info
:
#029ACF
;
$brand-warning
:
$bg_warning
;
$brand-danger
:
$bg_danger
;
$brand-primary
:
$gl-primary
;
$brand-success
:
$gl-success
;
$brand-info
:
#029ACF
;
$brand-warning
:
$gl-warning
;
$brand-danger
:
$gl-danger
;
$state-primary-bg
:
lighten
(
$gl-primary
,
30%
);
$state-success-bg
:
lighten
(
$gl-success
,
10%
);
$state-info-bg
:
lighten
(
$gl-info
,
30%
);
$state-warning-bg
:
lighten
(
$gl-warning
,
30%
);
$state-danger-bg
:
lighten
(
$gl-danger
,
30%
);
$state-primary-txt
:
$gl-primary
;
$state-success-txt
:
$gl-success
;
$state-info-txt
:
$gl-info
;
$state-warning-txt
:
$gl-warning
;
$state-danger-txt
:
$gl-danger
;
// Core variables and mixins
@import
"bootstrap/variables"
;
...
...
@@ -226,31 +238,31 @@ $brand-danger: $bg_danger;
.panel-danger
{
@include
panel-colored
;
.panel-heading
{
color
:
$
border_
danger
;
border-color
:
$
border_
danger
;
color
:
$
gl-
danger
;
border-color
:
$
gl-
danger
;
}
}
.panel-success
{
@include
panel-colored
;
.panel-heading
{
color
:
$
border_
success
;
border-color
:
$
border_
success
;
color
:
$
gl-
success
;
border-color
:
$
gl-
success
;
}
}
.panel-primary
{
@include
panel-colored
;
.panel-heading
{
color
:
$
border_
primary
;
border-color
:
$
border_
primary
;
color
:
$
gl-
primary
;
border-color
:
$
gl-
primary
;
}
}
.panel-warning
{
@include
panel-colored
;
.panel-heading
{
color
:
$
border_
warning
;
border-color
:
$
border_
warning
;
color
:
$
gl-
warning
;
border-color
:
$
gl-
warning
;
}
}
app/assets/stylesheets/main/variables.scss
View file @
cd73b26e
...
...
@@ -14,28 +14,13 @@ $link_hover_color: darken($link-color, 10%);
$btn-border
:
1px
solid
#ccc
;
/*
* S
uccess colors (green)
* S
tate colors:
*/
$border_success
:
#019875
;
$bg_success
:
#019875
;
/*
* Danger colors (red)
*/
$border_danger
:
#d43f3a
;
$bg_danger
:
#d9534f
;
/*
* Primary colors (blue)
*/
$border_primary
:
#446e9b
;
$bg_primary
:
#446e9b
;
/*
* Warning colors (yellow)
*/
$bg_warning
:
#EB9532
;
$border_warning
:
#EB9532
;
$gl-success
:
#019875
;
$gl-danger
:
#d9534f
;
$gl-primary
:
#446e9b
;
$gl-info
:
#029ACF
;
$gl-warning
:
#EB9532
;
/**
* Commit Diff Colors
...
...
app/assets/stylesheets/sections/dashboard.scss
View file @
cd73b26e
...
...
@@ -111,8 +111,8 @@
}
.dash-new-project
{
background
:
$
bg_
success
;
border
:
1px
solid
$
border_
success
;
background
:
$
gl-
success
;
border
:
1px
solid
$
gl-
success
;
a
{
color
:
#FFF
;
...
...
@@ -120,8 +120,8 @@
}
.dash-new-group
{
background
:
$
bg_
success
;
border
:
1px
solid
$
border_
success
;
background
:
$
gl-
success
;
border
:
1px
solid
$
gl-
success
;
a
{
color
:
#FFF
;
...
...
app/assets/stylesheets/sections/merge_requests.scss
View file @
cd73b26e
...
...
@@ -136,8 +136,8 @@
background-color
:
#F5F5F5
;
&
.ci-success
{
color
:
$
bg_
success
;
border-color
:
$
border_
success
;
color
:
$
gl-
success
;
border-color
:
$
gl-
success
;
background-color
:
#F1FAF1
;
}
...
...
@@ -148,20 +148,20 @@
}
&
.ci-running
{
color
:
$
bg_
warning
;
border-color
:
$
border_
warning
;
color
:
$
gl-
warning
;
border-color
:
$
gl-
warning
;
background-color
:
#FAF5F1
;
}
&
.ci-failed
{
color
:
$
bg_
danger
;
border-color
:
$
border_
danger
;
color
:
$
gl-
danger
;
border-color
:
$
gl-
danger
;
background-color
:
#FAF1F1
;
}
&
.ci-error
{
color
:
$
bg_
danger
;
border-color
:
$
border_
danger
;
color
:
$
gl-
danger
;
border-color
:
$
gl-
danger
;
background-color
:
#FAF1F1
;
}
}
...
...
app/assets/stylesheets/sections/notes.scss
View file @
cd73b26e
...
...
@@ -194,7 +194,7 @@ ul.notes {
&
:hover
{
font-size
:
24px
;
background
:
$
bg_
primary
;
background
:
$
gl-
primary
;
color
:
#FFF
;
@include
show-add-diff-note
;
}
...
...
app/assets/stylesheets/sections/notifications.scss
View file @
cd73b26e
...
...
@@ -10,13 +10,13 @@
}
.ns-part
{
color
:
$
bg_
primary
;
color
:
$
gl-
primary
;
}
.ns-watch
{
color
:
$
bg_
success
;
color
:
$
gl-
success
;
}
.ns-mute
{
color
:
$
bg_
danger
;
color
:
$
gl-
danger
;
}
app/assets/stylesheets/sections/projects.scss
View file @
cd73b26e
...
...
@@ -267,15 +267,15 @@ ul.nav.nav-projects-tabs {
}
.vs-public
{
color
:
$
bg_
primary
;
color
:
$
gl-
primary
;
}
.vs-internal
{
color
:
$
bg_
warning
;
color
:
$
gl-
warning
;
}
.vs-private
{
color
:
$
bg_
success
;
color
:
$
gl-
success
;
}
.breadcrumb.repo-breadcrumb
{
...
...
app/assets/stylesheets/sections/tree.scss
View file @
cd73b26e
...
...
@@ -46,7 +46,7 @@
}
i
{
color
:
$
bg_
primary
;
color
:
$
gl-
primary
;
}
img
{
...
...
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