Commit bbe67be6 authored by Thomas Park's avatar Thomas Park
Browse files

fixes #182, updates all variables.less files for 3.0.3

parent 14855508
......@@ -761,7 +761,7 @@ code,
kbd,
pre,
samp {
font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
}
code {
......@@ -2145,7 +2145,7 @@ textarea.input-sm {
}
.input-lg {
height: 56px;
height: 54px;
padding: 14px 16px;
font-size: 18px;
line-height: 1.33;
......@@ -2153,8 +2153,8 @@ textarea.input-sm {
}
select.input-lg {
height: 56px;
line-height: 56px;
height: 54px;
line-height: 54px;
}
textarea.input-lg {
......@@ -4094,7 +4094,7 @@ input[type="button"].btn-block {
.input-group-lg > .form-control,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn {
height: 56px;
height: 54px;
padding: 14px 16px;
font-size: 18px;
line-height: 1.33;
......@@ -4104,8 +4104,8 @@ input[type="button"].btn-block {
select.input-group-lg > .form-control,
select.input-group-lg > .input-group-addon,
select.input-group-lg > .input-group-btn > .btn {
height: 56px;
line-height: 56px;
height: 54px;
line-height: 54px;
}
textarea.input-group-lg > .form-control,
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -41,7 +41,7 @@
@font-family-sans-serif: "Cabin", Arial, sans-serif;
@font-family-serif: Georgia, "Times New Roman", Times, serif;
@font-family-monospace: Monaco, Menlo, Consolas, "Courier New", monospace;
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
@font-family-base: @font-family-sans-serif;
@font-size-base: 14px;
......@@ -84,6 +84,9 @@
@padding-small-vertical: 5px;
@padding-small-horizontal: 10px;
@padding-xs-vertical: 1px;
@padding-xs-horizontal: 5px;
@line-height-large: 1.33;
@line-height-small: 1.5;
......@@ -157,8 +160,8 @@
@input-color-placeholder: @gray-light;
@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
@input-height-large: (ceil(@font-size-large * @line-height-base) + (@padding-large-vertical * 2) + 2);
@input-height-small: (ceil(@font-size-small * @line-height-base) + (@padding-small-vertical * 2) + 2);
@input-height-large: (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
@input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
@legend-color: @text-color;
@legend-border-color: darken(@body-bg, 5%);
......@@ -186,8 +189,6 @@
@dropdown-header-color: @gray-lighter;
@dropdown-caret-color: #fff;
// COMPONENT VARIABLES
// --------------------------------------------------
......@@ -246,8 +247,13 @@
@grid-columns: 12;
// Padding, to be divided by two and applied to the left and right of all columns
@grid-gutter-width: 30px;
// Point at which the navbar stops collapsing
// Navbar collapse
// Point at which the navbar becomes uncollapsed
@grid-float-breakpoint: @screen-sm-min;
// Point at which the navbar begins collapsing
@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
// Navbar
......@@ -321,7 +327,6 @@
@nav-disabled-link-hover-color: @gray-lighter;
@nav-open-link-hover-color: @nav-link-hover-bg;
@nav-open-caret-border-color: @nav-link-hover-bg;
// Tabs
@nav-tabs-border-color: @nav-link-hover-bg;
......
......@@ -759,7 +759,7 @@ code,
kbd,
pre,
samp {
font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
}
code {
......@@ -2143,7 +2143,7 @@ textarea.input-sm {
}
.input-lg {
height: 56px;
height: 54px;
padding: 14px 16px;
font-size: 18px;
line-height: 1.33;
......@@ -2151,8 +2151,8 @@ textarea.input-sm {
}
select.input-lg {
height: 56px;
line-height: 56px;
height: 54px;
line-height: 54px;
}
textarea.input-lg {
......@@ -4092,7 +4092,7 @@ input[type="button"].btn-block {
.input-group-lg > .form-control,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn {
height: 56px;
height: 54px;
padding: 14px 16px;
font-size: 18px;
line-height: 1.33;
......@@ -4102,8 +4102,8 @@ input[type="button"].btn-block {
select.input-group-lg > .form-control,
select.input-group-lg > .input-group-addon,
select.input-group-lg > .input-group-btn > .btn {
height: 56px;
line-height: 56px;
height: 54px;
line-height: 54px;
}
textarea.input-group-lg > .form-control,
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -41,7 +41,7 @@
@font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif;
@font-family-serif: Georgia, "Times New Roman", Times, serif;
@font-family-monospace: Monaco, Menlo, Consolas, "Courier New", monospace;
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
@font-family-base: @font-family-sans-serif;
@font-size-base: 14px;
......@@ -84,6 +84,9 @@
@padding-small-vertical: 5px;
@padding-small-horizontal: 10px;
@padding-xs-vertical: 1px;
@padding-xs-horizontal: 5px;
@line-height-large: 1.33;
@line-height-small: 1.5;
......@@ -157,8 +160,8 @@
@input-color-placeholder: @gray-light;
@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
@input-height-large: (ceil(@font-size-large * @line-height-base) + (@padding-large-vertical * 2) + 2);
@input-height-small: (ceil(@font-size-small * @line-height-base) + (@padding-small-vertical * 2) + 2);
@input-height-large: (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
@input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
@legend-color: @text-color;
@legend-border-color: #e5e5e5;
......@@ -186,8 +189,6 @@
@dropdown-header-color: @text-muted;
@dropdown-caret-color: #fff;
// COMPONENT VARIABLES
// --------------------------------------------------
......@@ -246,8 +247,13 @@
@grid-columns: 12;
// Padding, to be divided by two and applied to the left and right of all columns
@grid-gutter-width: 30px;
// Point at which the navbar stops collapsing
// Navbar collapse
// Point at which the navbar becomes uncollapsed
@grid-float-breakpoint: @screen-sm-min;
// Point at which the navbar begins collapsing
@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
// Navbar
......@@ -321,7 +327,6 @@
@nav-disabled-link-hover-color: @gray-light;
@nav-open-link-hover-color: #fff;
@nav-open-caret-border-color: #fff;
// Tabs
@nav-tabs-border-color: #ddd;
......
......@@ -761,7 +761,7 @@ code,
kbd,
pre,
samp {
font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
}
code {
......@@ -2145,7 +2145,7 @@ textarea.input-sm {
}
.input-lg {
height: 66px;
height: 64px;
padding: 18px 30px;
font-size: 19px;
line-height: 1.33;
......@@ -2153,8 +2153,8 @@ textarea.input-sm {
}
select.input-lg {
height: 66px;
line-height: 66px;
height: 64px;
line-height: 64px;
}
textarea.input-lg {
......@@ -4094,7 +4094,7 @@ input[type="button"].btn-block {
.input-group-lg > .form-control,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn {
height: 66px;
height: 64px;
padding: 18px 30px;
font-size: 19px;
line-height: 1.33;
......@@ -4104,8 +4104,8 @@ input[type="button"].btn-block {
select.input-group-lg > .form-control,
select.input-group-lg > .input-group-addon,
select.input-group-lg > .input-group-btn > .btn {
height: 66px;
line-height: 66px;
height: 64px;
line-height: 64px;
}
textarea.input-group-lg > .form-control,
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -41,7 +41,7 @@
@font-family-sans-serif: "Open Sans", Calibri, Candara, Arial, sans-serif;
@font-family-serif: Georgia, "Times New Roman", Times, serif;
@font-family-monospace: Monaco, Menlo, Consolas, "Courier New", monospace;
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
@font-family-base: @font-family-sans-serif;
@font-size-base: 15px;
......@@ -84,6 +84,9 @@
@padding-small-vertical: 5px;
@padding-small-horizontal: 10px;
@padding-xs-vertical: 1px;
@padding-xs-horizontal: 5px;
@line-height-large: 1.33;
@line-height-small: 1.5;
......@@ -157,8 +160,8 @@
@input-color-placeholder: @gray-light;
@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
@input-height-large: (ceil(@font-size-large * @line-height-base) + (@padding-large-vertical * 2) + 2);
@input-height-small: (ceil(@font-size-small * @line-height-base) + (@padding-small-vertical * 2) + 2);
@input-height-large: (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
@input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
@legend-color: @text-color;
@legend-border-color: #e5e5e5;
......@@ -186,8 +189,6 @@
@dropdown-header-color: @text-muted;
@dropdown-caret-color: #000;
// COMPONENT VARIABLES
// --------------------------------------------------
......@@ -246,8 +247,13 @@
@grid-columns: 12;
// Padding, to be divided by two and applied to the left and right of all columns
@grid-gutter-width: 30px;
// Point at which the navbar stops collapsing
// Navbar collapse
// Point at which the navbar becomes uncollapsed
@grid-float-breakpoint: @screen-sm-min;
// Point at which the navbar begins collapsing
@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
// Navbar
......@@ -321,7 +327,6 @@
@nav-disabled-link-hover-color: @gray-light;
@nav-open-link-hover-color: #fff;
@nav-open-caret-border-color: #fff;
// Tabs
@nav-tabs-border-color: #ddd;
......
......@@ -527,35 +527,35 @@ cite {
}
.text-warning {
color: #c09853;
color: #8a6d3b;
}
.text-warning:hover {
color: #a47e3c;
color: #66512c;
}
.text-danger {
color: #b94a48;
color: #a94442;
}
.text-danger:hover {
color: #953b39;
color: #843534;
}
.text-success {
color: #468847;
color: #3c763d;
}
.text-success:hover {
color: #356635;
color: #2b542c;
}
.text-info {
color: #3a87ad;
color: #31708f;
}
.text-info:hover {
color: #2d6987;
color: #245269;
}
.text-left {
......@@ -759,7 +759,7 @@ code,
kbd,
pre,
samp {
font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
}
code {
......@@ -2143,7 +2143,7 @@ textarea.input-sm {
}
.input-lg {
height: 45px;
height: 46px;
padding: 10px 16px;
font-size: 18px;
line-height: 1.33;
......@@ -2151,8 +2151,8 @@ textarea.input-sm {
}
select.input-lg {
height: 45px;
line-height: 45px;
height: 46px;
line-height: 46px;
}
textarea.input-lg {
......@@ -2165,25 +2165,25 @@ textarea.input-lg {
.has-warning .checkbox,
.has-warning .radio-inline,
.has-warning .checkbox-inline {
color: #c09853;
color: #8a6d3b;
}
.has-warning .form-control {
border-color: #c09853;
border-color: #8a6d3b;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.has-warning .form-control:focus {
border-color: #a47e3c;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
border-color: #66512c;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
}
.has-warning .input-group-addon {
color: #c09853;
color: #8a6d3b;
background-color: #fcf8e3;
border-color: #c09853;
border-color: #8a6d3b;
}
.has-error .help-block,
......@@ -2192,25 +2192,25 @@ textarea.input-lg {
.has-error .checkbox,
.has-error .radio-inline,
.has-error .checkbox-inline {
color: #b94a48;
color: #a94442;
}
.has-error .form-control {
border-color: #b94a48;
border-color: #a94442;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.has-error .form-control:focus {
border-color: #953b39;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
border-color: #843534;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
}
.has-error .input-group-addon {
color: #b94a48;
color: #a94442;
background-color: #f2dede;
border-color: #b94a48;
border-color: #a94442;
}
.has-success .help-block,
......@@ -2219,25 +2219,25 @@ textarea.input-lg {
.has-success .checkbox,
.has-success .radio-inline,
.has-success .checkbox-inline {
color: #468847;
color: #3c763d;
}
.has-success .form-control {
border-color: #468847;
border-color: #3c763d;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.has-success .form-control:focus {
border-color: #356635;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
border-color: #2b542c;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
}
.has-success .input-group-addon {
color: #468847;
color: #3c763d;
background-color: #dff0d8;
border-color: #468847;
border-color: #3c763d;
}
.form-control-static {
......@@ -4092,7 +4092,7 @@ input[type="button"].btn-block {
.input-group-lg > .form-control,
.input-group-lg > .input-group-addon,
.input-group-lg > .input-group-btn > .btn {
height: 45px;
height: 46px;
padding: 10px 16px;
font-size: 18px;
line-height: 1.33;
......@@ -4102,8 +4102,8 @@ input[type="button"].btn-block {
select.input-group-lg > .form-control,
select.input-group-lg > .input-group-addon,
select.input-group-lg > .input-group-btn > .btn {
height: 45px;
line-height: 45px;
height: 46px;
line-height: 46px;
}
textarea.input-group-lg > .form-control,
......@@ -5650,7 +5650,7 @@ a.thumbnail.active {
}
.alert-success {
color: #468847;
color: #3c763d;
background-color: #dff0d8;
border-color: #d6e9c6;
}
......@@ -5660,11 +5660,11 @@ a.thumbnail.active {
}
.alert-success .alert-link {
color: #356635;
color: #2b542c;
}
.alert-info {
color: #3a87ad;
color: #31708f;
background-color: #d9edf7;
border-color: #bce8f1;
}
......@@ -5674,11 +5674,11 @@ a.thumbnail.active {
}
.alert-info .alert-link {
color: #2d6987;
color: #245269;
}
.alert-warning {
color: #c09853;
color: #8a6d3b;
background-color: #fcf8e3;
border-color: #faebcc;
}
......@@ -5688,11 +5688,11 @@ a.thumbnail.active {
}
.alert-warning .alert-link {
color: #a47e3c;
color: #66512c;
}
.alert-danger {
color: #b94a48;
color: #a94442;
background-color: #f2dede;
border-color: #ebccd1;
}
......@@ -5702,7 +5702,7 @@ a.thumbnail.active {
}
.alert-danger .alert-link {
color: #953b39;
color: #843534;
}
@-webkit-keyframes progress-bar-stripes {
......@@ -6160,7 +6160,7 @@ a.list-group-item.active:focus .list-group-item-text {
}
.panel-success > .panel-heading {
color: #468847;
color: #3c763d;
background-color: #dff0d8;
border-color: #d6e9c6;
}
......@@ -6178,7 +6178,7 @@ a.list-group-item.active:focus .list-group-item-text {
}
.panel-warning > .panel-heading {
color: #c09853;
color: #8a6d3b;
background-color: #fcf8e3;
border-color: #faebcc;
}
......@@ -6196,7 +6196,7 @@ a.list-group-item.active:focus .list-group-item-text {
}
.panel-danger > .panel-heading {
color: #b94a48;
color: #a94442;
background-color: #f2dede;
border-color: #ebccd1;
}
......@@ -6214,7 +6214,7 @@ a.list-group-item.active:focus .list-group-item-text {
}
.panel-info > .panel-heading {
color: #3a87ad;
color: #31708f;
background-color: #d9edf7;
border-color: #bce8f1;
}
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -41,7 +41,7 @@
@font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif;
@font-family-serif: Georgia, "Times New Roman", Times, serif;
@font-family-monospace: Monaco, Menlo, Consolas, "Courier New", monospace;
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
@font-family-base: @font-family-sans-serif;
@font-size-base: 14px;
......@@ -84,6 +84,9 @@
@padding-small-vertical: 5px;
@padding-small-horizontal: 10px;
@padding-xs-vertical: 1px;
@padding-xs-horizontal: 5px;
@line-height-large: 1.33;
@line-height-small: 1.5;
......@@ -157,7 +160,7 @@
@input-color-placeholder: @gray-light;
@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
@input-height-large: (floor(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
@input-height-large: (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
@input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
@legend-color: @gray-dark;
......@@ -186,8 +189,6 @@
@dropdown-header-color: @gray-light;
@dropdown-caret-color: #000;