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
f30f518f
Commit
f30f518f
authored
Dec 22, 2015
by
Andriy Dyadyura
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
buttons colors update
parent
f4dabf97
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+8
-1
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+4
-0
No files found.
app/assets/stylesheets/framework/buttons.scss
View file @
f30f518f
...
@@ -50,6 +50,10 @@
...
@@ -50,6 +50,10 @@
@include
btn-color
(
$blue-light
,
$border-blue-light
,
$blue-normal
,
$border-blue-normal
,
$blue-dark
,
$border-blue-dark
,
#FFFFFF
);
@include
btn-color
(
$blue-light
,
$border-blue-light
,
$blue-normal
,
$border-blue-normal
,
$blue-dark
,
$border-blue-dark
,
#FFFFFF
);
}
}
@mixin
btn-blue-medium
{
@include
btn-color
(
$blue-medium-light
,
$border-blue-light
,
$blue-medium
,
$border-blue-normal
,
$blue-medium-dark
,
$border-blue-dark
,
#FFFFFF
);
}
@mixin
btn-orange
{
@mixin
btn-orange
{
@include
btn-color
(
$orange-light
,
$border-orange-light
,
$orange-normal
,
$border-orange-normal
,
$orange-dark
,
$border-orange-dark
,
#FFFFFF
);
@include
btn-color
(
$orange-light
,
$border-orange-light
,
$orange-normal
,
$border-orange-normal
,
$orange-dark
,
$border-orange-dark
,
#FFFFFF
);
}
}
...
@@ -94,7 +98,10 @@
...
@@ -94,7 +98,10 @@
@include
btn-gray
;
@include
btn-gray
;
}
}
&
.btn-primary
,
&
.btn-primary
{
@include
btn-blue-medium
;
}
&
.btn-info
{
&
.btn-info
{
@include
btn-blue
;
@include
btn-blue
;
}
}
...
...
app/assets/stylesheets/framework/variables.scss
View file @
f30f518f
...
@@ -45,6 +45,10 @@ $blue-light: #2EA8E5;
...
@@ -45,6 +45,10 @@ $blue-light: #2EA8E5;
$blue-normal
:
#2D9FD8
;
$blue-normal
:
#2D9FD8
;
$blue-dark
:
#2897CE
;
$blue-dark
:
#2897CE
;
$blue-medium-light
:
#3498CB
;
$blue-medium
:
#2F8EBF
;
$blue-medium-dark
:
#2D86B4
;
$orange-light
:
#FC6443
;
$orange-light
:
#FC6443
;
$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