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
1648316e
Commit
1648316e
authored
May 31, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
New style for close buttons
parent
4ec1b65b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
2 deletions
+18
-2
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+17
-1
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-1
No files found.
app/assets/stylesheets/framework/buttons.scss
View file @
1648316e
...
@@ -16,6 +16,19 @@
...
@@ -16,6 +16,19 @@
@include
btn-default
;
@include
btn-default
;
}
}
@mixin
btn-outline
(
$background
,
$text
,
$border
,
$hover-background
,
$hover-text
,
$hover-border
)
{
background-color
:
$background
;
color
:
$text
;
border-color
:
$border
;
&
:hover
,
&
:focus
{
background-color
:
$hover-background
;
color
:
$hover-text
;
border-color
:
$hover-border
;;
}
}
@mixin
btn-color
(
$light
,
$border-light
,
$normal
,
$border-normal
,
$dark
,
$border-dark
,
$color
)
{
@mixin
btn-color
(
$light
,
$border-light
,
$normal
,
$border-normal
,
$dark
,
$border-dark
,
$color
)
{
background-color
:
$light
;
background-color
:
$light
;
border-color
:
$border-light
;
border-color
:
$border-light
;
...
@@ -106,11 +119,14 @@
...
@@ -106,11 +119,14 @@
@include
btn-blue
;
@include
btn-blue
;
}
}
&
.btn-close
,
&
.btn-warning
{
&
.btn-warning
{
@include
btn-orange
;
@include
btn-orange
;
}
}
&
.btn-close
{
@include
btn-outline
(
$white-light
,
$orange-normal
,
$orange-normal
,
$orange-light
,
$white-light
,
$orange-light
);
}
&
.btn-danger
,
&
.btn-danger
,
&
.btn-remove
,
&
.btn-remove
,
&
.btn-red
{
&
.btn-red
{
...
...
app/assets/stylesheets/framework/variables.scss
View file @
1648316e
...
@@ -104,7 +104,7 @@ $blue-medium-light: #3498cb;
...
@@ -104,7 +104,7 @@ $blue-medium-light: #3498cb;
$blue-medium
:
#2f8ebf
;
$blue-medium
:
#2f8ebf
;
$blue-medium-dark
:
#2d86b4
;
$blue-medium-dark
:
#2d86b4
;
$orange-light
:
rgba
(
252
,
109
,
38
,
0
.80
)
;
$orange-light
:
#fc8a51
;
$orange-normal
:
#e75e40
;
$orange-normal
:
#e75e40
;
$orange-dark
:
#ce5237
;
$orange-dark
:
#ce5237
;
...
...
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