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
Kazuhiko Shiozaki
gitlab-ce
Commits
80fbb8af
Commit
80fbb8af
authored
Feb 22, 2016
by
Alfredo Sumaran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use or create variables
parent
9c185c43
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
8 deletions
+9
-8
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+3
-3
app/assets/stylesheets/framework/selects.scss
app/assets/stylesheets/framework/selects.scss
+4
-5
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+2
-0
No files found.
app/assets/stylesheets/framework/buttons.scss
View file @
80fbb8af
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
&
:focus
,
&
:focus
,
&
:active
{
&
:active
{
outline
:
none
;
outline
:
none
;
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
)
);
@include
box-shadow
(
$gl-btn-active-background
);
}
}
}
}
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
}
}
&
:active
{
&
:active
{
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
)
);
@include
box-shadow
(
$gl-btn-active-background
);
background-color
:
$dark
;
background-color
:
$dark
;
border-color
:
$border-dark
;
border-color
:
$border-dark
;
...
@@ -190,7 +190,7 @@
...
@@ -190,7 +190,7 @@
}
}
.active
{
.active
{
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
)
);
@include
box-shadow
(
$gl-btn-active-background
);
border
:
1px
solid
#c6cacf
!
important
;
border
:
1px
solid
#c6cacf
!
important
;
background-color
:
#e4e7ed
!
important
;
background-color
:
#e4e7ed
!
important
;
...
...
app/assets/stylesheets/framework/selects.scss
View file @
80fbb8af
...
@@ -32,11 +32,10 @@
...
@@ -32,11 +32,10 @@
margin-right
:
15px
;
margin-right
:
15px
;
}
}
&
:hover
{
&
:hover
{
background-color
:
$gray-dark
;
background-color
:
$gray-dark
;
border-color
:
$border-white-normal
;
border-color
:
$border-white-normal
;
color
:
#313236
;
color
:
$gl-text-color
;
}
}
}
}
}
}
...
@@ -61,7 +60,7 @@
...
@@ -61,7 +60,7 @@
.select2-results
li
.select2-result-with-children
>
.select2-result-label
{
.select2-results
li
.select2-result-with-children
>
.select2-result-label
{
font-weight
:
600
;
font-weight
:
600
;
color
:
#313236
;
color
:
$gl-text-color
;
}
}
.select2-container-active
{
.select2-container-active
{
...
@@ -76,7 +75,7 @@
...
@@ -76,7 +75,7 @@
outline
:
0
;
outline
:
0
;
background-image
:
none
;
background-image
:
none
;
background-color
:
$white-dark
;
background-color
:
$white-dark
;
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
)
);
@include
box-shadow
(
$gl-btn-active-gradient
);
}
}
}
}
...
@@ -117,7 +116,7 @@
...
@@ -117,7 +116,7 @@
&
.select2-container-active
.select2-choices
,
&
.select2-container-active
.select2-choices
,
&
.select2-dropdown-open
.select2-choices
{
&
.select2-dropdown-open
.select2-choices
{
border-color
:
$border-white-normal
;
border-color
:
$border-white-normal
;
@include
box-shadow
(
inset
0
0
4px
rgba
(
0
,
0
,
0
,
0
.12
)
);
@include
box-shadow
(
$gl-btn-active-gradient
);
}
}
}
}
...
...
app/assets/stylesheets/framework/variables.scss
View file @
80fbb8af
...
@@ -101,6 +101,8 @@ $gl-success: $green-normal;
...
@@ -101,6 +101,8 @@ $gl-success: $green-normal;
$gl-info
:
$blue-normal
;
$gl-info
:
$blue-normal
;
$gl-warning
:
$orange-normal
;
$gl-warning
:
$orange-normal
;
$gl-danger
:
$red-normal
;
$gl-danger
:
$red-normal
;
$gl-btn-active-background
:
rgba
(
0
,
0
,
0
,
0
.12
);
$gl-btn-active-gradient
:
inset
0
0
4px
$gl-btn-active-background
;
/*
/*
* Commit Diff Colors
* Commit Diff Colors
...
...
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