Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Btutton Fix
Browse files Browse the repository at this point in the history 
Fixing button wrap issue. Edited global SCSS file to add !important to
the button text coloring (see global update)
  • Loading branch information
andrewmbacon committed Nov 3, 2015
1 parent b44c87f commit 2a11b7b
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion sass/_buttons.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
cursor: pointer;
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
border: 1px solid transparent;
white-space: nowrap;
white-space:normal;
@include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base);
@include user-select(none);

Expand Down
40 changes: 20 additions & 20 deletions style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2900,7 +2900,7 @@ select[multiple].input-lg,
box-shadow: none; }

.btn-default {
color: #333;
color: #333 !important;
background-color: #fff;
border-color: #ccc; }
.btn-default:hover, .btn-default:focus, .btn-default.focus, .btn-default:active, .btn-default.active, .open > .btn-default.dropdown-toggle {
Expand All @@ -2917,7 +2917,7 @@ select[multiple].input-lg,
background-color: #333; }

.btn-primary {
color: #fff;
color: #fff !important;
background-color: #337ab7;
border-color: #2e6da4; }
.btn-primary:hover, .btn-primary:focus, .btn-primary.focus, .btn-primary:active, .btn-primary.active, .open > .btn-primary.dropdown-toggle {
Expand All @@ -2934,7 +2934,7 @@ select[multiple].input-lg,
background-color: #fff; }

.btn-success {
color: #fff;
color: #fff !important;
background-color: #5cb85c;
border-color: #4cae4c; }
.btn-success:hover, .btn-success:focus, .btn-success.focus, .btn-success:active, .btn-success.active, .open > .btn-success.dropdown-toggle {
Expand All @@ -2951,7 +2951,7 @@ select[multiple].input-lg,
background-color: #fff; }

.btn-info {
color: #fff;
color: #fff !important;
background-color: #5bc0de;
border-color: #46b8da; }
.btn-info:hover, .btn-info:focus, .btn-info.focus, .btn-info:active, .btn-info.active, .open > .btn-info.dropdown-toggle {
Expand All @@ -2968,7 +2968,7 @@ select[multiple].input-lg,
background-color: #fff; }

.btn-warning {
color: #fff;
color: #fff !important;
background-color: #f0ad4e;
border-color: #eea236; }
.btn-warning:hover, .btn-warning:focus, .btn-warning.focus, .btn-warning:active, .btn-warning.active, .open > .btn-warning.dropdown-toggle {
Expand All @@ -2985,7 +2985,7 @@ select[multiple].input-lg,
background-color: #fff; }

.btn-danger {
color: #fff;
color: #fff !important;
background-color: #d9534f;
border-color: #d43f3a; }
.btn-danger:hover, .btn-danger:focus, .btn-danger.focus, .btn-danger:active, .btn-danger.active, .open > .btn-danger.dropdown-toggle {
Expand Down Expand Up @@ -7021,7 +7021,7 @@ code {
cursor: pointer;
background-image: none;
border: 1px solid transparent;
white-space: nowrap;
white-space: normal;
padding: 6px 12px;
font-size: 14px;
line-height: 1.428571429;
Expand Down Expand Up @@ -7051,7 +7051,7 @@ code {
box-shadow: none; }

#page #content .widget .btn-default {
color: #333;
color: #333 !important;
background-color: #fff;
border-color: #ccc; }
#page #content .widget .btn-default:hover, #page #content .widget .btn-default:focus, #page #content .widget .btn-default.focus, #page #content .widget .btn-default:active, #page #content .widget .btn-default.active, .open > #page #content .widget .btn-default.dropdown-toggle {
Expand All @@ -7068,7 +7068,7 @@ code {
background-color: #333; }

#page #content .widget .btn-primary {
color: #fff;
color: #fff !important;
background-color: #337ab7;
border-color: #2e6da4; }
#page #content .widget .btn-primary:hover, #page #content .widget .btn-primary:focus, #page #content .widget .btn-primary.focus, #page #content .widget .btn-primary:active, #page #content .widget .btn-primary.active, .open > #page #content .widget .btn-primary.dropdown-toggle {
Expand All @@ -7085,7 +7085,7 @@ code {
background-color: #fff; }

#page #content .widget .btn-success {
color: #fff;
color: #fff !important;
background-color: #5cb85c;
border-color: #4cae4c; }
#page #content .widget .btn-success:hover, #page #content .widget .btn-success:focus, #page #content .widget .btn-success.focus, #page #content .widget .btn-success:active, #page #content .widget .btn-success.active, .open > #page #content .widget .btn-success.dropdown-toggle {
Expand All @@ -7102,7 +7102,7 @@ code {
background-color: #fff; }

#page #content .widget .btn-info {
color: #fff;
color: #fff !important;
background-color: #5bc0de;
border-color: #46b8da; }
#page #content .widget .btn-info:hover, #page #content .widget .btn-info:focus, #page #content .widget .btn-info.focus, #page #content .widget .btn-info:active, #page #content .widget .btn-info.active, .open > #page #content .widget .btn-info.dropdown-toggle {
Expand All @@ -7119,7 +7119,7 @@ code {
background-color: #fff; }

#page #content .widget .btn-warning {
color: #fff;
color: #fff !important;
background-color: #f0ad4e;
border-color: #eea236; }
#page #content .widget .btn-warning:hover, #page #content .widget .btn-warning:focus, #page #content .widget .btn-warning.focus, #page #content .widget .btn-warning:active, #page #content .widget .btn-warning.active, .open > #page #content .widget .btn-warning.dropdown-toggle {
Expand All @@ -7136,7 +7136,7 @@ code {
background-color: #fff; }

#page #content .widget .btn-danger {
color: #fff;
color: #fff !important;
background-color: #d9534f;
border-color: #d43f3a; }
#page #content .widget .btn-danger:hover, #page #content .widget .btn-danger:focus, #page #content .widget .btn-danger.focus, #page #content .widget .btn-danger:active, #page #content .widget .btn-danger.active, .open > #page #content .widget .btn-danger.dropdown-toggle {
Expand Down Expand Up @@ -7996,7 +7996,7 @@ body.sticky .ie8 #footers {
cursor: pointer;
background-image: none;
border: 1px solid transparent;
white-space: nowrap;
white-space: normal;
padding: 6px 12px;
font-size: 14px;
line-height: 1.428571429;
Expand Down Expand Up @@ -8026,7 +8026,7 @@ body.sticky .ie8 #footers {
box-shadow: none; }

#footers .btn-default {
color: #333;
color: #333 !important;
background-color: #fff;
border-color: #ccc; }
#footers .btn-default:hover, #footers .btn-default:focus, #footers .btn-default.focus, #footers .btn-default:active, #footers .btn-default.active, .open > #footers .btn-default.dropdown-toggle {
Expand All @@ -8043,7 +8043,7 @@ body.sticky .ie8 #footers {
background-color: #333; }

#footers .btn-primary {
color: #fff;
color: #fff !important;
background-color: #337ab7;
border-color: #2e6da4; }
#footers .btn-primary:hover, #footers .btn-primary:focus, #footers .btn-primary.focus, #footers .btn-primary:active, #footers .btn-primary.active, .open > #footers .btn-primary.dropdown-toggle {
Expand All @@ -8060,7 +8060,7 @@ body.sticky .ie8 #footers {
background-color: #fff; }

#footers .btn-success {
color: #fff;
color: #fff !important;
background-color: #5cb85c;
border-color: #4cae4c; }
#footers .btn-success:hover, #footers .btn-success:focus, #footers .btn-success.focus, #footers .btn-success:active, #footers .btn-success.active, .open > #footers .btn-success.dropdown-toggle {
Expand All @@ -8077,7 +8077,7 @@ body.sticky .ie8 #footers {
background-color: #fff; }

#footers .btn-info {
color: #fff;
color: #fff !important;
background-color: #5bc0de;
border-color: #46b8da; }
#footers .btn-info:hover, #footers .btn-info:focus, #footers .btn-info.focus, #footers .btn-info:active, #footers .btn-info.active, .open > #footers .btn-info.dropdown-toggle {
Expand All @@ -8094,7 +8094,7 @@ body.sticky .ie8 #footers {
background-color: #fff; }

#footers .btn-warning {
color: #fff;
color: #fff !important;
background-color: #f0ad4e;
border-color: #eea236; }
#footers .btn-warning:hover, #footers .btn-warning:focus, #footers .btn-warning.focus, #footers .btn-warning:active, #footers .btn-warning.active, .open > #footers .btn-warning.dropdown-toggle {
Expand All @@ -8111,7 +8111,7 @@ body.sticky .ie8 #footers {
background-color: #fff; }

#footers .btn-danger {
color: #fff;
color: #fff !important;
background-color: #d9534f;
border-color: #d43f3a; }
#footers .btn-danger:hover, #footers .btn-danger:focus, #footers .btn-danger.focus, #footers .btn-danger:active, #footers .btn-danger.active, .open > #footers .btn-danger.dropdown-toggle {
Expand Down

0 comments on commit 2a11b7b

Please sign in to comment.