Skip to content
GitLab
Commit 2f7087ea authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch '3.0.0-wip' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip

parents 5638b255 c77a459b
18 merge requests!7033Fix backdrop undefined bug in modal,!8635ignore Gruntfile.js in jekyll,!8339Fix broken links to navbar component in docs examples,!7329Fix for issue #7328,!7219Fix for mini typo mistake in css.html,!7674Clear float on all when navbar is collapsed - v3,!7344Fixed .spanX selector (*= instead of ^=),!7346Fix compilation error,!7775added some tests for tooltip title setter,!8157Close Me: Docs "Customize and Download" button fix,!7509Proposed fix for allowing Collapse events ('show'/'hide') to be cancelled,!7964commit fixes #7792,!8656Added rel="stylesheet" to CDN-Examples,!8527Inner properties move 1,!8245Interactive color picker - Closed: request against wrong branch,!7865Patch 2,!7651Drop the sizzle dependency to allow smaller builds targeting mobile devices,!6853typeahead: do not store item data in an attribute
Hide whitespace changes
Inline Side-by-side
Showing
with 105 additions and 38 deletions
+105 -38
docs/assets/css/bootstrap.css
+ 78
- 0
View file @ 2f7087ea
...@@ -1745,6 +1745,19 @@ input[type="button"].btn-block { ...@@ -1745,6 +1745,19 @@ input[type="button"].btn-block {
border-color: #8d9091; border-color: #8d9091;
} }
.btn.disabled:hover,
.btn[disabled]:hover,
fieldset[disabled] .btn:hover,
.btn.disabled:focus,
.btn[disabled]:focus,
fieldset[disabled] .btn:focus,
.btn.disabled:active,
.btn[disabled]:active,
fieldset[disabled] .btn:active {
background-color: #a7a9aa;
border-color: #a7a9aa;
}
.btn-primary { .btn-primary {
background-color: #428bca; background-color: #428bca;
border-color: #428bca; border-color: #428bca;
...@@ -1757,6 +1770,19 @@ input[type="button"].btn-block { ...@@ -1757,6 +1770,19 @@ input[type="button"].btn-block {
border-color: #3071a9; border-color: #3071a9;
} }
.btn-primary.disabled:hover,
.btn-primary[disabled]:hover,
fieldset[disabled] .btn-primary:hover,
.btn-primary.disabled:focus,
.btn-primary[disabled]:focus,
fieldset[disabled] .btn-primary:focus,
.btn-primary.disabled:active,
.btn-primary[disabled]:active,
fieldset[disabled] .btn-primary:active {
background-color: #428bca;
border-color: #428bca;
}
.btn-warning { .btn-warning {
background-color: #f0ad4e; background-color: #f0ad4e;
border-color: #f0ad4e; border-color: #f0ad4e;
...@@ -1769,6 +1795,19 @@ input[type="button"].btn-block { ...@@ -1769,6 +1795,19 @@ input[type="button"].btn-block {
border-color: #ec971f; border-color: #ec971f;
} }
.btn-warning.disabled:hover,
.btn-warning[disabled]:hover,
fieldset[disabled] .btn-warning:hover,
.btn-warning.disabled:focus,
.btn-warning[disabled]:focus,
fieldset[disabled] .btn-warning:focus,
.btn-warning.disabled:active,
.btn-warning[disabled]:active,
fieldset[disabled] .btn-warning:active {
background-color: #f0ad4e;
border-color: #f0ad4e;
}
.btn-danger { .btn-danger {
background-color: #d9534f; background-color: #d9534f;
border-color: #d9534f; border-color: #d9534f;
...@@ -1781,6 +1820,19 @@ input[type="button"].btn-block { ...@@ -1781,6 +1820,19 @@ input[type="button"].btn-block {
border-color: #c9302c; border-color: #c9302c;
} }
.btn-danger.disabled:hover,
.btn-danger[disabled]:hover,
fieldset[disabled] .btn-danger:hover,
.btn-danger.disabled:focus,
.btn-danger[disabled]:focus,
fieldset[disabled] .btn-danger:focus,
.btn-danger.disabled:active,
.btn-danger[disabled]:active,
fieldset[disabled] .btn-danger:active {
background-color: #d9534f;
border-color: #d9534f;
}
.btn-success { .btn-success {
background-color: #5cb85c; background-color: #5cb85c;
border-color: #5cb85c; border-color: #5cb85c;
...@@ -1793,6 +1845,19 @@ input[type="button"].btn-block { ...@@ -1793,6 +1845,19 @@ input[type="button"].btn-block {
border-color: #449d44; border-color: #449d44;
} }
.btn-success.disabled:hover,
.btn-success[disabled]:hover,
fieldset[disabled] .btn-success:hover,
.btn-success.disabled:focus,
.btn-success[disabled]:focus,
fieldset[disabled] .btn-success:focus,
.btn-success.disabled:active,
.btn-success[disabled]:active,
fieldset[disabled] .btn-success:active {
background-color: #5cb85c;
border-color: #5cb85c;
}
.btn-info { .btn-info {
background-color: #5bc0de; background-color: #5bc0de;
border-color: #5bc0de; border-color: #5bc0de;
...@@ -1805,6 +1870,19 @@ input[type="button"].btn-block { ...@@ -1805,6 +1870,19 @@ input[type="button"].btn-block {
border-color: #31b0d5; border-color: #31b0d5;
} }
.btn-info.disabled:hover,
.btn-info[disabled]:hover,
fieldset[disabled] .btn-info:hover,
.btn-info.disabled:focus,
.btn-info[disabled]:focus,
fieldset[disabled] .btn-info:focus,
.btn-info.disabled:active,
.btn-info[disabled]:active,
fieldset[disabled] .btn-info:active {
background-color: #5bc0de;
border-color: #5bc0de;
}
.btn-link, .btn-link,
.btn-link:active, .btn-link:active,
.btn-link[disabled], .btn-link[disabled],
......
less/buttons.less
+ 27
- 38
View file @ 2f7087ea
...@@ -109,7 +109,26 @@ input[type="button"] { ...@@ -109,7 +109,26 @@ input[type="button"] {
} }
} }
// Mixin for darkening only enabled buttons for link states
.darken-button-states (@background, @border) {
&:hover,
&:focus,
&:active {
background-color: darken(@background, 5%);
border-color: darken(@border, 10%);
}
&.disabled,
&[disabled],
fieldset[disabled] & {
&:hover,
&:focus,
&:active {
background-color: @background;
border-color: @border
}
}
}
// Alternate buttons // Alternate buttons
// -------------------------------------------------- // --------------------------------------------------
...@@ -117,67 +136,37 @@ input[type="button"] { ...@@ -117,67 +136,37 @@ input[type="button"] {
.btn { .btn {
color: @btn-color; color: @btn-color;
background-color: @btn-background; background-color: @btn-background;
border-color: @btn-border; border-color: @btn-border;
&:hover, .darken-button-states(@btn-background, @btn-border)
&:focus,
&:active {
background-color: darken(@btn-background, 5%);
border-color: darken(@btn-border, 10%);
}
} }
.btn-primary { .btn-primary {
background-color: @btn-background-primary; background-color: @btn-background-primary;
border-color: @btn-border-primary; border-color: @btn-border-primary;
&:hover, .darken-button-states(@btn-background-primary, @btn-border-primary)
&:focus,
&:active {
background-color: darken(@btn-background-primary, 5%);
border-color: darken(@btn-border-primary, 10%);
}
} }
// Warning appears are orange // Warning appears as orange
.btn-warning { .btn-warning {
background-color: @btn-background-warning; background-color: @btn-background-warning;
border-color: @btn-border-warning; border-color: @btn-border-warning;
&:hover, .darken-button-states(@btn-background-warning, @btn-border-warning)
&:focus,
&:active {
background-color: darken(@btn-background-warning, 5%);
border-color: darken(@btn-border-warning, 10%);
}
} }
// Danger and error appear as red // Danger and error appear as red
.btn-danger { .btn-danger {
background-color: @btn-background-danger; background-color: @btn-background-danger;
border-color: @btn-border-danger; border-color: @btn-border-danger;
&:hover, .darken-button-states(@btn-background-danger, @btn-border-danger)
&:focus,
&:active {
background-color: darken(@btn-background-danger, 5%);
border-color: darken(@btn-border-danger, 10%);
}
} }
// Success appears as green // Success appears as green
.btn-success { .btn-success {
background-color: @btn-background-success; background-color: @btn-background-success;
border-color: @btn-border-success; border-color: @btn-border-success;
&:hover, .darken-button-states(@btn-background-success, @btn-border-success)
&:focus,
&:active {
background-color: darken(@btn-background-success, 5%);
border-color: darken(@btn-border-success, 10%);
}
} }
// Info appears as blue-green // Info appears as blue-green
.btn-info { .btn-info {
background-color: @btn-background-info; background-color: @btn-background-info;
border-color: @btn-border-info; border-color: @btn-border-info;
&:hover, .darken-button-states(@btn-background-info, @btn-border-info)
&:focus,
&:active {
background-color: darken(@btn-background-info, 5%);
border-color: darken(@btn-border-info, 10%);
}
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment