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

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

Browse Source
This commit is contained in:
Mark Otto
2013-07-23 22:49:13 -07:00
parent 1d1bd62598 330f40c864
commit 1803b2f09e
9 changed files with 72 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/variables.less
+46
View File
@@ -117,6 +117,7 @@
@btn-info-bg: @brand-info;
@btn-info-border: @btn-info-bg;
@btn-hover-color: #fff;
// Forms
@@ -134,12 +135,18 @@
@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);
@legend-border-color: #e5e5e5;
@input-group-addon-text-shadow: 0 1px 0 #fff;
@input-group-addon-border-color: #ccc;
// Dropdowns
// -------------------------
@dropdown-bg: #fff;
@dropdown-border: rgba(0,0,0,.15);
@dropdown-fallback-border: #ccc;
@dropdown-divider-top: #e5e5e5;
@dropdown-divider-bottom: #fff;
@@ -150,6 +157,10 @@
@dropdown-link-hover-color: #fff;
@dropdown-link-hover-bg: @dropdown-link-active-bg;
@caret-border-top-color: #000;
@dropup-caret-border-color: #000;
// COMPONENT VARIABLES
// --------------------------------------------------
@@ -278,6 +289,9 @@
@label-warning-bg: @brand-warning;
@label-danger-bg: @brand-danger;
@label-color: #fff;
@label-link-hover-color: #fff;
// Modals
// -------------------------
@@ -327,6 +341,9 @@
@list-group-active-bg: @component-active-bg;
@list-group-active-border: @list-group-active-bg;
@link-list-group-color: #555;
@link-list-group-heading-color:#333;
// Panels
// -------------------------
@panel-bg: #fff;
@@ -390,6 +407,35 @@
@breadcrumb-color: #ccc;
@breadcrumb-active-color: @gray-light;
// Carousel
// ------------------------
@carousel-control-color: #fff;
@carousel-control-hover-color: #fff;
@carousel-control-text-shadow: 0 1px 2px rgba(0,0,0,.6);
@carousel-indicators-active-bg: #fff;
@carousel-indicators-li-border-color: #fff;
@carousel-caption-color: #fff;
@carousel-caption-text-shadow: 0 1px 2px rgba(0,0,0,.6);
// Close
// ------------------------
@close-color: #000;
@close-hover-color: #000;
@close-text-shadow: 0 1px 0 rgba(255,255,255,1);
// Code
// ------------------------
@code-bg: #f9f2f4;
@code-color: #c7254e;
@pre-bg: #f5f5f5;
@pre-border-color: rgba(0,0,0,.15);
@pre-fallback-border-color: #ccc;
// Miscellaneous
// -------------------------