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
6a50414c
Commit
6a50414c
authored
Jun 19, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace bg_style_color with bg_primary
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
3ee7209a
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
6 deletions
+5
-6
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+1
-1
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
+1
-1
app/assets/stylesheets/main/variables.scss
app/assets/stylesheets/main/variables.scss
+0
-1
No files found.
app/assets/stylesheets/generic/common.scss
View file @
6a50414c
...
@@ -55,7 +55,7 @@ pre {
...
@@ -55,7 +55,7 @@ pre {
.dropdown-menu
>
li
>
a
:hover
,
.dropdown-menu
>
li
>
a
:hover
,
.dropdown-menu
>
li
>
a
:focus
{
.dropdown-menu
>
li
>
a
:focus
{
background
:
$bg_
style_color
;
background
:
$bg_
primary
;
color
:
#FFF
color
:
#FFF
}
}
...
...
app/assets/stylesheets/generic/jquery.scss
View file @
6a50414c
...
@@ -41,8 +41,8 @@
...
@@ -41,8 +41,8 @@
}
}
.ui-state-active
{
.ui-state-active
{
border
:
1px
solid
$bg_
style_color
;
border
:
1px
solid
$bg_
primary
;
background
:
$bg_
style_color
;
background
:
$bg_
primary
;
color
:
#FFF
;
color
:
#FFF
;
}
}
...
...
app/assets/stylesheets/generic/selects.scss
View file @
6a50414c
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
.select2-results
{
.select2-results
{
max-height
:
350px
;
max-height
:
350px
;
.select2-highlighted
{
.select2-highlighted
{
background
:
$bg_
style_color
;
background
:
$bg_
primary
;
}
}
}
}
}
}
...
...
app/assets/stylesheets/gl_bootstrap.scss
View file @
6a50414c
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
$font-size-base
:
13px
!
default
;
$font-size-base
:
13px
!
default
;
$nav-pills-active-link-hover-bg
:
$bg_primary
;
$nav-pills-active-link-hover-bg
:
$bg_primary
;
$pagination-active-bg
:
$bg_primary
;
$pagination-active-bg
:
$bg_primary
;
$list-group-active-bg
:
$bg_
style_color
;
$list-group-active-bg
:
$bg_
primary
;
// Core variables and mixins
// Core variables and mixins
@import
"bootstrap/variables"
;
@import
"bootstrap/variables"
;
...
...
app/assets/stylesheets/main/variables.scss
View file @
6a50414c
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
* General Colors
* General Colors
*/
*/
$style_color
:
#474D57
;
$style_color
:
#474D57
;
$bg_style_color
:
#2299BB
;
$hover
:
#D9EDF7
;
$hover
:
#D9EDF7
;
/*
/*
...
...
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