BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
b834ecd2
Commit
b834ecd2
authored
Nov 28, 2016
by
Chris Peressini
Committed by
Annabel Dunstone Gray
Nov 28, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add darker active state for outline buttons and new border colors.
parent
6743d5aa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
10 deletions
+16
-10
buttons.scss
app/assets/stylesheets/framework/buttons.scss
+15
-9
variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-1
No files found.
app/assets/stylesheets/framework/buttons.scss
View file @
b834ecd2
...
...
@@ -15,7 +15,7 @@
@include
btn-default
;
}
@mixin
btn-outline
(
$background
,
$text
,
$border
,
$hover-background
,
$hover-text
,
$hover-border
)
{
@mixin
btn-outline
(
$background
,
$text
,
$border
,
$hover-background
,
$hover-text
,
$hover-border
,
$active-background
,
$active-border
)
{
background-color
:
$background
;
color
:
$text
;
border-color
:
$border
;
...
...
@@ -23,8 +23,14 @@
&
:hover
,
&
:focus
{
background-color
:
$hover-background
;
color
:
$hover-text
;
border-color
:
$hover-border
;
color
:
$hover-text
;
}
&
:active
{
background-color
:
$active-background
;
border-color
:
$active-border
;
color
:
$hover-text
;
}
}
...
...
@@ -82,11 +88,11 @@
}
@mixin
btn-gray
{
@include
btn-color
(
$gray-light
,
$border-gray-light
,
$gray-normal
,
$border-gray-
light
,
$gray-dark
,
$border-gray-dark
,
$gl-gray-dark
);
@include
btn-color
(
$gray-light
,
$border-gray-light
,
$gray-normal
,
$border-gray-
normal
,
$gray-dark
,
$border-gray-dark
,
$gl-gray-dark
);
}
@mixin
btn-white
{
@include
btn-color
(
$white-light
,
$border-color
,
$white-normal
,
$border-white-normal
,
$white-dark
,
$border-white-dark
,
$
btn-white-active
);
@include
btn-color
(
$white-light
,
$border-color
,
$white-normal
,
$border-white-normal
,
$white-dark
,
$border-white-dark
,
$
gl-text-color
);
}
@mixin
btn-with-margin
{
...
...
@@ -139,11 +145,11 @@
&
.btn-new
,
&
.btn-create
,
&
.btn-save
{
@include
btn-outline
(
$white-light
,
$
green-normal
,
$green-normal
,
$green-light
,
$white-light
,
$green-light
);
@include
btn-outline
(
$white-light
,
$
border-green-light
,
$border-green-light
,
$green-light
,
$white-light
,
$border-green-light
,
$green-normal
,
$border-green-normal
);
}
&
.btn-remove
{
@include
btn-outline
(
$white-light
,
$
red-normal
,
$red-normal
,
$red-light
,
$white-light
,
$red-light
);
@include
btn-outline
(
$white-light
,
$
border-red-light
,
$border-red-light
,
$red-light
,
$white-light
,
$border-red-light
,
$red-normal
,
$border-red-normal
);
}
}
...
...
@@ -165,11 +171,11 @@
}
&
.btn-close
{
@include
btn-outline
(
$white-light
,
$
orange-normal
,
$orange-normal
,
$orange-light
,
$white-light
,
$orange-light
);
@include
btn-outline
(
$white-light
,
$
border-orange-light
,
$border-orange-light
,
$orange-light
,
$white-light
,
$border-orange-light
,
$orange-normal
,
$border-orange-normal
);
}
&
.btn-spam
{
@include
btn-outline
(
$white-light
,
$
red-normal
,
$red-normal
,
$red-light
,
$white-light
,
$red-light
);
@include
btn-outline
(
$white-light
,
$
border-red-light
,
$border-red-light
,
$red-light
,
$white-light
,
$border-red-light
,
$red-normal
,
$border-red-normal
);
}
&
.btn-danger
,
...
...
@@ -351,7 +357,7 @@
.btn-inverted
{
&
-secondary
{
@include
btn-outline
(
$white-light
,
$b
lue-normal
,
$blue-normal
,
$blue-light
,
$white-light
,
$blue-light
);
@include
btn-outline
(
$white-light
,
$b
order-blue-light
,
$border-blue-light
,
$blue-light
,
$white-light
,
$border-blue-light
,
$blue-normal
,
$border-blue-normal
);
}
}
...
...
app/assets/stylesheets/framework/variables.scss
View file @
b834ecd2
...
...
@@ -12,7 +12,7 @@ $sidebar-breakpoint: 1024px;
/*
* Color schema
*/
$darken-normal-factor
:
7%
;
$darken-normal-factor
:
7%
;
$darken-dark-factor
:
10%
;
$darken-border-factor
:
5%
;
...
...
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