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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
b14d21e1
Commit
b14d21e1
authored
9 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use bootstrap buttons with custom colors instead of own css
parent
8b53d9ef
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
114 deletions
+14
-114
app/assets/stylesheets/generic/buttons.scss
app/assets/stylesheets/generic/buttons.scss
+7
-114
app/assets/stylesheets/gl_bootstrap.scss
app/assets/stylesheets/gl_bootstrap.scss
+7
-0
No files found.
app/assets/stylesheets/generic/buttons.scss
View file @
b14d21e1
.btn
{
.btn
{
display
:
inline-block
;
@extend
.btn-default
;
margin-bottom
:
0
;
font-weight
:
normal
;
text-align
:
center
;
vertical-align
:
middle
;
cursor
:
pointer
;
background-image
:
none
;
border
:
$btn-border
;
white-space
:
nowrap
;
padding
:
6px
12px
;
font-size
:
13px
;
line-height
:
18px
;
border-radius
:
4px
;
-webkit-user-select
:
none
;
-moz-user-select
:
none
;
-ms-user-select
:
none
;
-o-user-select
:
none
;
user-select
:
none
;
color
:
#444444
;
background-color
:
#fff
;
text-shadow
:
none
;
&
.hover
,
&
:hover
{
color
:
#444444
;
text-decoration
:
none
;
background-color
:
#ebebeb
;
border-color
:
#adadad
;
}
&
.focus
,
&
:focus
{
color
:
#444444
;
text-decoration
:
none
;
outline
:
thin
dotted
#333
;
outline
:
5px
auto
-
webkit-focus-ring-color
;
outline-offset
:
-2px
;
}
&
.active
,
&
:active
{
outline
:
0
;
background-image
:
none
;
-webkit-box-shadow
:
inset
0
3px
5px
rgba
(
0
,
0
,
0
,
0
.125
);
box-shadow
:
inset
0
3px
5px
rgba
(
0
,
0
,
0
,
0
.125
);
}
&
.disabled
,
&
[
disabled
]
{
cursor
:
not
-
allowed
;
pointer-events
:
none
;
opacity
:
0
.65
;
filter
:
alpha
(
opacity
=
65
);
-webkit-box-shadow
:
none
;
box-shadow
:
none
;
}
&
.btn-primary
{
color
:
#ffffff
;
background-color
:
$bg_primary
;
border-color
:
$border_primary
;
&
.hover
,
&
:hover
,
&
.disabled
,
&
[
disabled
]
{
color
:
#ffffff
;
}
}
&
.btn-success
{
color
:
#ffffff
;
background-color
:
$bg_success
;
border-color
:
$border_success
;
&
.hover
,
&
:hover
,
&
.disabled
,
&
[
disabled
]
{
color
:
#ffffff
;
}
}
&
.btn-danger
{
color
:
#ffffff
;
background-color
:
$bg_danger
;
border-color
:
$border_danger
;
&
.hover
,
&
:hover
,
&
.disabled
,
&
[
disabled
]
{
color
:
#ffffff
;
}
}
&
.btn-warning
{
color
:
#ffffff
;
background-color
:
$bg_warning
;
border-color
:
$border_warning
;
&
.hover
,
&
:hover
,
&
.disabled
,
&
[
disabled
]
{
color
:
#ffffff
;
}
}
&
.btn-new
{
&
.btn-new
{
@extend
.btn-success
;
@extend
.btn-success
;
...
@@ -174,9 +64,12 @@
...
@@ -174,9 +64,12 @@
}
}
}
}
&
.btn-lg
{
&
.btn-save
{
font-size
:
15px
;
@extend
.btn-primary
;
line-height
:
1
.4
;
}
&
.btn-new
,
&
.btn-create
{
@extend
.btn-success
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/gl_bootstrap.scss
View file @
b14d21e1
...
@@ -8,6 +8,12 @@ $nav-pills-active-link-hover-bg: $bg_primary;
...
@@ -8,6 +8,12 @@ $nav-pills-active-link-hover-bg: $bg_primary;
$pagination-active-bg
:
$bg_primary
;
$pagination-active-bg
:
$bg_primary
;
$list-group-active-bg
:
$bg_primary
;
$list-group-active-bg
:
$bg_primary
;
$brand-primary
:
$bg_primary
;
$brand-success
:
$bg_success
;
$brand-info
:
#029ACF
;
$brand-warning
:
$bg_warning
;
$brand-danger
:
$bg_danger
;
// Core variables and mixins
// Core variables and mixins
@import
"bootstrap/variables"
;
@import
"bootstrap/variables"
;
@import
"bootstrap/mixins"
;
@import
"bootstrap/mixins"
;
...
@@ -23,6 +29,7 @@ $list-group-active-bg: $bg_primary;
...
@@ -23,6 +29,7 @@ $list-group-active-bg: $bg_primary;
@import
"bootstrap/grid"
;
@import
"bootstrap/grid"
;
@import
"bootstrap/tables"
;
@import
"bootstrap/tables"
;
@import
"bootstrap/forms"
;
@import
"bootstrap/forms"
;
@import
"bootstrap/buttons"
;
// Components
// Components
@import
"bootstrap/component-animations"
;
@import
"bootstrap/component-animations"
;
...
...
This diff is collapsed.
Click to expand it.
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