mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00
Code Activity

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

Browse Source 
Conflicts:
	customize.html
	less/alerts.less
	less/badges.less
	less/button-groups.less
	less/buttons.less
	less/carousel.less
This commit is contained in:
Mark Otto
2013-08-05 16:03:10 -07:00
parent 9bbe8a020a 1aedb7862c
commit 04dc221037
10 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/variables.less
+18 -2
View File
@@ -78,6 +78,8 @@
@component-active-bg: @brand-primary;
@caret-width-base: 4px;
@caret-width-large: 5px;
// Tables
// -------------------------
@@ -96,6 +98,8 @@
// Buttons
// -------------------------
@btn-font-weight: bold;
@btn-default-color: #333;
@btn-default-bg: #fff;
@btn-default-border: #ccc;
@@ -120,6 +124,8 @@
@btn-info-bg: @brand-info;
@btn-info-border: darken(@btn-info-bg, 5%);
@btn-link-disabled-color: @gray-light;
// Forms
// -------------------------
@@ -404,6 +410,7 @@
// -------------------------
@alert-padding: 15px;
@alert-border-radius: @border-radius-base;
@alert-link-font-weight: bold;
@alert-bg: @state-warning-bg;
@alert-text: @state-warning-text;
@@ -500,11 +507,15 @@
// -------------------------
@badge-color: #fff;
@badge-link-hover-color: #fff;
@badge-bg: @gray-light;
@badge-active-color: @link-color;
@badge-active-bg: #fff;
@badge-font-weight: bold;
@badge-line-height: 1;
@badge-border-radius: 10px;
// Breadcrumbs
// -------------------------
@@ -515,12 +526,16 @@
// Carousel
// ------------------------
@carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6);
@carousel-control-color: #fff;
@carousel-control-width: 15%;
@carousel-control-opacity: .5;
@carousel-control-font-size: 20px;
@carousel-indicator-border-color: #fff;
@carousel-indicator-active-bg: #fff;
@carousel-indicator-border-color: #fff;
@carousel-caption-color: #fff;
@@ -528,6 +543,7 @@
// Close
// ------------------------
@close-color: #000;
@close-font-weight: bold;
@close-text-shadow: 0 1px 0 #fff;