From 94dec1bbd2e12eb6ef1c8b4f277041a8acbb278e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 May 2013 18:37:00 -0700 Subject: [PATCH 1/3] Update readme link to Bower per #7790 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b76a8da238..cc7011ea5a 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Three quick start options are available: * [Download the latest release](https://github.com/twitter/bootstrap/zipball/master). * Clone the repo: `git clone git://github.com/twitter/bootstrap.git`. -* Install with Twitter's [Bower](http://github.com/bower/bower): `bower install bootstrap`. +* Install with Twitter's [Bower](http://bower.io): `bower install bootstrap`. Read the [Getting Started page](http://getbootstrap.com/getting-started/) for information on the framework contents, basic template guidelines, and more. From d2b588b10eafc8b1d36ff23cf59f0f46d5f5e31e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 May 2013 18:38:09 -0700 Subject: [PATCH 2/3] nuke unfinished readme section --- README.md | 9 --------- 1 file changed, 9 deletions(-) diff --git a/README.md b/README.md index cc7011ea5a..35e9295eb8 100644 --- a/README.md +++ b/README.md @@ -17,15 +17,6 @@ Three quick start options are available: Read the [Getting Started page](http://getbootstrap.com/getting-started/) for information on the framework contents, basic template guidelines, and more. -## Bootstrap elsewhere - -Beyond getting started with the Bootstrap core, there are ways to use Bootstrap in other tools and services: - -* [Roots WordPress theme](https://github.com/retlehs/roots) - A WordPress starter theme based on HTML5 Boilerplate & Bootstrap from Twitter. - -Have suggestions? Let us know with a [new issue](https://github.com/twitter/bootstrap/issues). - - ## Bugs and feature requests From c73588b3132b8c848f10561ad8f946f8c58a636b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 16 May 2013 18:46:12 -0700 Subject: [PATCH 3/3] Drop .form-actions --- docs/_includes/nav-css.html | 1 - docs/assets/css/bootstrap.css | 28 ---------------------------- docs/css.html | 15 --------------- less/forms.less | 13 ------------- 4 files changed, 57 deletions(-) diff --git a/docs/_includes/nav-css.html b/docs/_includes/nav-css.html index f1596f7efa..437b2e3bdb 100644 --- a/docs/_includes/nav-css.html +++ b/docs/_includes/nav-css.html @@ -54,7 +54,6 @@
  • Control states
  • Input groups
  • Control sizing
  • -
  • Form actions
  • Help text
  • diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index bec7260c29..326ae49906 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1535,34 +1535,6 @@ select:focus:invalid:focus { box-shadow: 0 0 6px #f8b9b7; } -.form-actions { - padding: 20px 20px; - margin-top: 20px; - margin-bottom: 20px; - background-color: #f5f5f5; - border-top: 1px solid #e5e5e5; -} - -.form-actions:before, -.form-actions:after { - display: table; - content: " "; -} - -.form-actions:after { - clear: both; -} - -.form-actions:before, -.form-actions:after { - display: table; - content: " "; -} - -.form-actions:after { - clear: both; -} - .help-block { display: block; margin-top: 5px; diff --git a/docs/css.html b/docs/css.html index 36b5208e6e..90f6f490fe 100644 --- a/docs/css.html +++ b/docs/css.html @@ -1661,21 +1661,6 @@ For example, <section> should be wrapped as inline. -{% endhighlight %} - -

    Form actions

    -

    End a form with a group of actions (buttons). When placed within a .form-horizontal, the buttons will automatically indent to line up with the form controls.

    -
    -
    - - -
    -
    -{% highlight html %} -
    - - -
    {% endhighlight %}

    Help text

    diff --git a/less/forms.less b/less/forms.less index 2c696945d0..4e028bf495 100644 --- a/less/forms.less +++ b/less/forms.less @@ -295,19 +295,6 @@ select:focus:invalid { -// FORM ACTIONS -// ------------ - -.form-actions { - padding: @line-height-computed 20px; - margin-top: @line-height-computed; - margin-bottom: @line-height-computed; - background-color: @form-actions-bg; - border-top: 1px solid #e5e5e5; - .clearfix(); // Adding clearfix to allow for .pull-right button containers -} - - // HELP TEXT // ---------