mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

Change error to danger for all classes; add panels component

Browse Source
This commit is contained in:
Mark Otto
2013-03-30 14:15:18 -07:00
parent aee25786a7
commit 9fff2d3fb6
11 changed files with 256 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/alerts.less
+5 -5
View File
@@ -58,15 +58,15 @@
}
.alert-danger,
.alert-error {
background-color: @state-error-background;
border-color: @state-error-border;
color: @state-error-text;
background-color: @state-danger-background;
border-color: @state-danger-border;
color: @state-danger-text;
hr {
border-top-color: darken(@state-error-border, 5%);
border-top-color: darken(@state-danger-border, 5%);
}
> a,
> p > a {
color: darken(@state-error-text, 10%);
color: darken(@state-danger-text, 10%);
}
}
.alert-info {
less/bootstrap.less
Vendored
+1
View File
@@ -30,6 +30,7 @@
@import "component-animations.less";
@import "glyphicons.less";
@import "dropdowns.less";
@import "panels.less";
@import "wells.less";
@import "close.less";
less/forms.less
+1 -1
View File
@@ -311,7 +311,7 @@ input[type="checkbox"] {
}
// Error
.has-error {
.formFieldState(@state-error-text, @state-error-text, @state-error-background);
.formFieldState(@state-danger-text, @state-danger-text, @state-danger-background);
}
// Success
.has-success {
less/panels.less
+60
View File
@@ -0,0 +1,60 @@
//
// Panels
// --------------------------------------------------
// Base class
.panel {
padding: 15px;
margin-bottom: 20px;
background-color: @panel-bg;
border: 1px solid @panel-border;
border-radius: @panel-border-radius;
.box-shadow(0 1px 1px rgba(0,0,0,.05));
}
// Optional heading
.panel-heading {
margin: -15px -15px 15px;
padding: 10px 15px;
.font-size(16);
font-weight: 500;
background-color: @panel-heading-bg;
border-bottom: 1px solid @panel-border;
border-top-left-radius: (@panel-border-radius - 1);
border-top-right-radius: (@panel-border-radius - 1);
}
// Contextual variations
.panel-success {
border-color: @panel-success-border;
.panel-heading {
color: @panel-success-text;
background-color: @panel-success-heading-bg;
border-color: @panel-success-border;
}
}
.panel-warning {
border-color: @panel-warning-border;
.panel-heading {
color: @panel-warning-text;
background-color: @panel-warning-heading-bg;
border-color: @panel-warning-border;
}
}
.panel-danger {
border-color: @panel-danger-border;
.panel-heading {
color: @panel-danger-text;
background-color: @panel-danger-heading-bg;
border-color: @panel-danger-border;
}
}
.panel-info {
border-color: @panel-info-border;
.panel-heading {
color: @panel-info-text;
background-color: @panel-info-heading-bg;
border-color: @panel-info-border;
}
}
less/tables.less
+10 -10
View File
@@ -200,11 +200,11 @@ table th[class*="col-span-"] {
background-color: @state-success-background;
border-color: @state-success-border;
}
> td.error,
> th.error,
&.error > td {
background-color: @state-error-background;
border-color: @state-error-border;
> td.danger,
> th.danger,
&.danger > td {
background-color: @state-danger-background;
border-color: @state-danger-border;
}
> td.warning,
> th.warning,
@@ -222,11 +222,11 @@ table th[class*="col-span-"] {
background-color: darken(@state-success-background, 5%);
border-color: darken(@state-success-border, 5%);
}
> td.error:hover,
> th.error:hover,
&.error:hover > td {
background-color: darken(@state-error-background, 5%);
border-color: darken(@state-error-border, 5%);
> td.danger:hover,
> th.danger:hover,
&.danger:hover > td {
background-color: darken(@state-danger-background, 5%);
border-color: darken(@state-danger-border, 5%);
}
> td.warning:hover,
> th.warning:hover,
less/type.less
+3 -3
View File
@@ -36,9 +36,9 @@ a.text-muted:focus { color: darken(@grayLight, 10%); }
a.text-warning:hover,
a.text-warning:focus { color: darken(@state-warning-text, 10%); }
.text-error { color: @state-error-text; }
a.text-error:hover,
a.text-error:focus { color: darken(@state-error-text, 10%); }
.text-danger { color: @state-danger-text; }
a.text-danger:hover,
a.text-danger:focus { color: darken(@state-danger-text, 10%); }
.text-success { color: @state-success-text; }
a.text-success:hover,
less/variables.less
+32 -7
View File
@@ -240,9 +240,9 @@
@state-warning-background: #fcf8e3;
@state-warning-border: darken(spin(@state-warning-background, -10), 3%);
@state-error-text: #b94a48;
@state-error-background: #f2dede;
@state-error-border: darken(spin(@state-error-background, -10), 3%);
@state-danger-text: #b94a48;
@state-danger-background: #f2dede;
@state-danger-border: darken(spin(@state-danger-background, -10), 3%);
@state-success-text: #468847;
@state-success-background: #dff0d8;
@@ -280,7 +280,6 @@
// Modals
// -------------------------
@modal-inner-padding: 20px;
@@ -294,6 +293,35 @@
@progress-bar-info-bg: @brand-info;
// Panels
// -------------------------
@panel-bg: #fff;
@panel-border: #ddd;
@panel-border-radius: @border-radius-base;
@panel-heading-bg: #f5f5f5;
@panel-success-text: @state-success-text;
@panel-success-border: @state-success-border;
@panel-success-heading-bg: @state-success-background;
@panel-warning-text: @state-warning-text;
@panel-warning-border: @state-warning-border;
@panel-warning-heading-bg: @state-warning-background;
@panel-danger-text: @state-danger-text;
@panel-danger-border: @state-danger-border;
@panel-danger-heading-bg: @state-danger-background;
@panel-info-text: @state-info-text;
@panel-info-border: @state-info-border;
@panel-info-heading-bg: @state-info-background;
// Wells
// -------------------------
@well-background: #f5f5f5;
// Miscellaneous
// -------------------------
@@ -303,9 +331,6 @@
// Horizontal forms & lists
@component-offset-horizontal: 180px;
// Wells
@well-background: #f5f5f5;
// Grid system