From afef81c0d79fc0c8bc313f7f46f4f92f7e3a9988 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Dec 2012 22:30:08 -0800 Subject: [PATCH] remove commented out buttons css, update docs --- docs/assets/css/bootstrap.css | 78 ++++--------------------------- docs/css.html | 2 +- docs/templates/pages/css.mustache | 2 +- less/buttons.less | 74 ++--------------------------- 4 files changed, 16 insertions(+), 140 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 87b2942a15..e3214cbc5d 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2546,11 +2546,17 @@ button.close { font-size: 14px; font-weight: bold; line-height: 20px; + color: #555555; text-align: center; vertical-align: middle; cursor: pointer; + background-color: #eee; border: 0; border-radius: 4px; + -webkit-transition: all 0.075s ease-in-out; + -moz-transition: all 0.075s ease-in-out; + -o-transition: all 0.075s ease-in-out; + transition: all 0.075s ease-in-out; } .btn:focus { @@ -2561,13 +2567,14 @@ button.close { .btn:hover { text-decoration: none; + background-color: #ddd; } .btn:active, .btn.active { outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 0 rgba(255, 255, 255, 0.1); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 0 rgba(255, 255, 255, 0.1); } .btn.disabled, @@ -2579,73 +2586,6 @@ button.close { box-shadow: none; } -.btn-default { - padding: 6px 12px; - color: #5a5a5a; - background-color: #fff; - border: 1px solid #ccc; -} - -.btn-default:hover { - color: #fff; - background-color: #999; - border-color: #999; -} - -/* -// Core -.btn { - display: inline-block; - padding: 6px 12px; - margin-bottom: 0; // For input.btn - font-size: @font-size-base; - line-height: @line-height-base; - text-align: center; - vertical-align: middle; - cursor: pointer; - white-space: nowrap; - .buttonBackground(@btn-background, @btn-background-highlight, @grayDark, 0 1px 1px rgba(255,255,255,.75)); - border: 1px solid @btn-border; - border-bottom-color: darken(@btn-border, 10%); - border-radius: @border-radius-base; - .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)"); - - // Hover state - &:hover { - color: @grayDark; - text-decoration: none; - background-position: 0 -15px; - - // transition is only when going to hover, otherwise the background - // behind the gradient (there for IE<=9 fallback) gets mismatched - .transition(background-position .1s linear); - } - - // Focus state for keyboard and accessibility - &:focus { - .tab-focus(); - } - - // Active state - &.active, - &:active { - background-image: none; - outline: 0; - .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)"); - } - - // Disabled state - &.disabled, - &[disabled] { - cursor: default; - background-image: none; - .opacity(65); - .box-shadow(none); - } - -} -*/ - .btn-large { padding: 11px 19px; font-size: 17.5px; diff --git a/docs/css.html b/docs/css.html index dd279a6b4c..fdf1fe5958 100644 --- a/docs/css.html +++ b/docs/css.html @@ -1730,7 +1730,7 @@ For example, <code><section></code> should be wrapped as inlin - btn btn-default + btn Standard gray button with gradient diff --git a/docs/templates/pages/css.mustache b/docs/templates/pages/css.mustache index ff73aef5b7..78bf7febf2 100644 --- a/docs/templates/pages/css.mustache +++ b/docs/templates/pages/css.mustache @@ -1670,7 +1670,7 @@ For example, <code><section></code> should be wrapped as inlin - btn btn-default + btn Standard gray button with gradient diff --git a/less/buttons.less b/less/buttons.less index 0aca982b2b..72a70f535b 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -15,11 +15,13 @@ font-weight: bold; line-height: @line-height-base; text-align: center; + color: @gray; vertical-align: middle; cursor: pointer; + background-color: #eee; border: 0; border-radius: @border-radius-base; - //.transition(all .075s ease-in-out); + .transition(all .075s ease-in-out); &:focus { .tab-focus(); @@ -27,12 +29,13 @@ &:hover { text-decoration: none; + background-color: #ddd; } &:active, &.active { outline: 0; - .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)"); + .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 0 rgba(255,255,255,.1)"); } &.disabled, @@ -44,73 +47,6 @@ } -// Default button visuals -.btn-default { - padding: 6px 12px; - color: #5a5a5a; - background-color: #fff; - border: 1px solid #ccc; - - &:hover { - color: #fff; - background-color: #999; - border-color: #999; - } -} - -/* -// Core -.btn { - display: inline-block; - padding: 6px 12px; - margin-bottom: 0; // For input.btn - font-size: @font-size-base; - line-height: @line-height-base; - text-align: center; - vertical-align: middle; - cursor: pointer; - white-space: nowrap; - .buttonBackground(@btn-background, @btn-background-highlight, @grayDark, 0 1px 1px rgba(255,255,255,.75)); - border: 1px solid @btn-border; - border-bottom-color: darken(@btn-border, 10%); - border-radius: @border-radius-base; - .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)"); - - // Hover state - &:hover { - color: @grayDark; - text-decoration: none; - background-position: 0 -15px; - - // transition is only when going to hover, otherwise the background - // behind the gradient (there for IE<=9 fallback) gets mismatched - .transition(background-position .1s linear); - } - - // Focus state for keyboard and accessibility - &:focus { - .tab-focus(); - } - - // Active state - &.active, - &:active { - background-image: none; - outline: 0; - .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)"); - } - - // Disabled state - &.disabled, - &[disabled] { - cursor: default; - background-image: none; - .opacity(65); - .box-shadow(none); - } - -} -*/ // Button Sizes // -------------------------