From 3157de8d1d4b69c0f5152b4a784bd185f76c9ac4 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Fri, 25 Nov 2011 21:34:55 -0800 Subject: [PATCH] clean up comments for better built files --- bootstrap.css | 50 +++---------------------------------- bootstrap.min.css | 3 +-- docs/javascript.html | 10 ++++---- js/bootstrap-collapsible.js | 37 --------------------------- lib/forms.less | 7 +++--- lib/mixins.less | 6 ++--- lib/patterns.less | 19 +++++--------- lib/reset.less | 8 +++--- lib/responsive.less | 6 ++--- lib/scaffolding.less | 8 +++--- lib/tables.less | 8 +++--- lib/type.less | 6 ++--- lib/variables.less | 6 ++--- 13 files changed, 44 insertions(+), 130 deletions(-) delete mode 100644 js/bootstrap-collapsible.js diff --git a/bootstrap.css b/bootstrap.css index 19d07745e4..4c4d85aa9e 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,11 +6,8 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Nov 25 12:09:37 PST 2011 + * Date: Fri Nov 25 21:33:58 PST 2011 */ -/* Reset.less - * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). - * ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */ html, body { margin: 0; padding: 0; @@ -170,16 +167,6 @@ textarea { overflow: auto; vertical-align: top; } -/* Variables.less - * Variables to customize the look and feel of Bootstrap - * ----------------------------------------------------- */ -/* Mixins.less - * Snippets of reusable CSS to develop faster and keep code readable - * ----------------------------------------------------------------- */ -/* - * Scaffolding - * Basic and global styles for generating a grid system, structural layout, and page templates - * ------------------------------------------------------------------------------------------- */ body { margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -344,9 +331,6 @@ a:hover { .offset11 { margin-left: 900px; } -/* Typography.less - * Headings, body text, lists, code, and more for a versatile and durable typography system - * ---------------------------------------------------------------------------------------- */ p { margin-bottom: 9px; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; @@ -534,9 +518,6 @@ pre code { padding: 0; background-color: transparent; } -/* Forms.less - * Base styles for various input types, form layouts, and states - * ------------------------------------------------------------- */ form { margin-bottom: 18px; } @@ -999,10 +980,6 @@ form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-app .horizontal-form .form-actions { padding-left: 150px; } -/* - * Tables.less - * Tables for, you guessed it, tabular data - * ---------------------------------------- */ table { width: 100%; padding: 0; @@ -1198,9 +1175,6 @@ table .purple { table .headerSortUp.purple, table .headerSortDown.purple { background-color: #e2d5f0; } -/* Patterns.less - * Repeatable UI elements outside the base styles provided from the scaffolding - * ---------------------------------------------------------------------------- */ .navbar { height: 40px; overflow: visible; @@ -1880,31 +1854,18 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { opacity: 1; } .collapse { - position: relative; - overflow: hidden; -} -.collapse.height { -webkit-transition: height 0.35s ease; -moz-transition: height 0.35s ease; -ms-transition: height 0.35s ease; -o-transition: height 0.35s ease; transition: height 0.35s ease; + position: relative; + overflow: hidden; height: 0; } -.collapse.height.in { +.collapse.in { height: auto; } -.collapse.width { - -webkit-transition: width 0.35s ease; - -moz-transition: width 0.35s ease; - -ms-transition: width 0.35s ease; - -o-transition: width 0.35s ease; - transition: width 0.35s ease; - width: 0; -} -.collapse.width.in { - width: auto; -} .label { padding: 1px 3px 2px; font-size: 9.75px; @@ -2470,9 +2431,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); } -/* Responsive.less - * For phone and tablet devices - * ------------------------------------------------------------- */ @media (max-width: 480px) { .container { width: auto; diff --git a/bootstrap.min.css b/bootstrap.min.css index f0e1a8dec4..2a802744cf 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -278,8 +278,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .alert-message.block-message.info{background-color:#ddf4fb;border-color:#c6edf9;} .well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} .fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;} -.collapse{position:relative;overflow:hidden;}.collapse.height{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;height:0;}.collapse.height.in{height:auto;} -.collapse.width{-webkit-transition:width 0.35s ease;-moz-transition:width 0.35s ease;-ms-transition:width 0.35s ease;-o-transition:width 0.35s ease;transition:width 0.35s ease;width:0;}.collapse.width.in{width:auto;} +.collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;} .label{padding:1px 3px 2px;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;background-color:#bfbfbf;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.label.important{background-color:#c43c35;} .label.warning{background-color:#f89406;} .label.success{background-color:#46a546;} diff --git a/docs/javascript.html b/docs/javascript.html index 3e2bacc9d4..e57e452236 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -903,7 +903,7 @@ $('.tabs a').bind('change', function (e) { simple collapsible </button> -<div id="demo" class="collapse height in"> … </div> +<div id="demo" class="collapse in"> … </div>

Notice To add accordion like group management to a collapsible control just add the additional data attribute data-parent="#selector". Refer to the demo below to see this in action.

Methods

.collapse(options)

@@ -964,13 +964,13 @@ $('#myCollapsible').bind('hidden', function () {

-
+
Collapsible Group Item #1
-
+

Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.

@@ -978,7 +978,7 @@ $('#myCollapsible').bind('hidden', function () {
Collapsible Group Item #2
-
+

Blog +1 eiusmod, williamsburg chambray craft beer brooklyn. Trust fund squid whatever, sunt hoodie skateboard mustache 3 wolf moon art party wes anderson ad leggings officia. Skateboard keytar incididunt gluten-free retro sartorial, single-origin coffee et viral. Art party blog sunt, readymade fugiat 8-bit aesthetic ex echo park fanny pack keytar. Thundercats sustainable labore, mustache adipisicing tattooed dolore aute occaecat velit 8-bit raw denim letterpress. In occaecat freegan, next level single-origin coffee chambray excepteur nihil duis exercitation adipisicing ex sartorial twee squid. You probably haven't heard of them fugiat ea retro eiusmod quis cosby sweater, +1 fap sapiente biodiesel banksy.

@@ -986,7 +986,7 @@ $('#myCollapsible').bind('hidden', function () {
Collapsible Group Item #3
-
+

Tempor gentrify pariatur nihil salvia, irony synth incididunt odio commodo brunch aute. Four loko est vice echo park wes anderson jean shorts, tempor ea vero locavore. Seitan DIY dolore readymade williamsburg viral. Dolor fap master cleanse delectus, ad butcher labore duis vice mollit cillum exercitation eu banh mi. Austin banksy 3 wolf moon locavore sed, helvetica next level VHS you probably haven't heard of them ethical odio. Incididunt locavore minim, do seitan consequat qui thundercats labore before they sold out retro laborum. Esse twee readymade laboris fap vice, voluptate DIY.

diff --git a/js/bootstrap-collapsible.js b/js/bootstrap-collapsible.js deleted file mode 100644 index 273eb22720..0000000000 --- a/js/bootstrap-collapsible.js +++ /dev/null @@ -1,37 +0,0 @@ -/* ============================================================= - * bootstrap-collapsible.js v2.0.0 - * http://twitter.github.com/bootstrap/javascript.html#collapsible - * ============================================================= - * Copyright 2011 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - -(function( $ ){ - - var Collapsible = function ( element, options ) {} - - Collapsible.prototype = {} - - /* collapsible PLUGIN DEFINITION - * ======================= */ - - $.fn.collapsible = function ( options ) { - - return this.each(function () { - new Collapsible(this, options) - }) - } - - -})( window.jQuery || window.ender ) \ No newline at end of file diff --git a/lib/forms.less b/lib/forms.less index 845eec185e..39c2937999 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -1,7 +1,6 @@ -/* Forms.less - * Base styles for various input types, form layouts, and states - * ------------------------------------------------------------- */ - +// Forms.less +// Base styles for various input types, form layouts, and states +// ------------------------------------------------------------- // GENERAL STYLES diff --git a/lib/mixins.less b/lib/mixins.less index d77ecf6215..0effdfa37a 100644 --- a/lib/mixins.less +++ b/lib/mixins.less @@ -1,6 +1,6 @@ -/* Mixins.less - * Snippets of reusable CSS to develop faster and keep code readable - * ----------------------------------------------------------------- */ +// Mixins.less +// Snippets of reusable CSS to develop faster and keep code readable +// ----------------------------------------------------------------- // Clearfix for clearing floats like a boss h5bp.com/q diff --git a/lib/patterns.less b/lib/patterns.less index 1b4c5a9416..15c3c9c067 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -1,6 +1,6 @@ -/* Patterns.less - * Repeatable UI elements outside the base styles provided from the scaffolding - * ---------------------------------------------------------------------------- */ +// Patterns.less +// Repeatable UI elements outside the base styles provided from the scaffolding +// ---------------------------------------------------------------------------- // NAVBAR (FIXED AND STATIC) @@ -643,18 +643,11 @@ input[type=submit].btn { } .collapse { + .transition(height .35s ease); position:relative; overflow:hidden; - &.height { - .transition(height .35s ease); - height: 0; - &.in { height: auto; } - } - &.width { - .transition(width .35s ease); - width: 0; - &.in { width: auto; } - } + height: 0; + &.in { height: auto; } } diff --git a/lib/reset.less b/lib/reset.less index 8bff573352..c95c7b04c5 100644 --- a/lib/reset.less +++ b/lib/reset.less @@ -1,6 +1,8 @@ -/* Reset.less - * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). - * ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */ +// Reset.less +// Props to Eric Meyer (meyerweb.com) for his CSS reset file. +// We're using an adapted version here that cuts out some of the reset HTML +// elements we will never need here (i.e., dfn, samp, etc). +// ------------------------------------------------------------------------ // ERIC MEYER RESET diff --git a/lib/responsive.less b/lib/responsive.less index 75c33b1a8e..f63f90c982 100644 --- a/lib/responsive.less +++ b/lib/responsive.less @@ -1,6 +1,6 @@ -/* Responsive.less - * For phone and tablet devices - * ------------------------------------------------------------- */ +// Responsive.less +// For phone and tablet devices +// ------------------------------------------------------------- // UP TO LANDSCAPE PHONE diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 179ef26387..3e231aae5e 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -1,7 +1,7 @@ -/* - * Scaffolding - * Basic and global styles for generating a grid system, structural layout, and page templates - * ------------------------------------------------------------------------------------------- */ +// +// Scaffolding +// Basic and global styles for generating a grid system, structural layout, and page templates +// ------------------------------------------------------------------------------------------- // STRUCTURAL LAYOUT diff --git a/lib/tables.less b/lib/tables.less index 4aed466b11..22a3199185 100644 --- a/lib/tables.less +++ b/lib/tables.less @@ -1,7 +1,7 @@ -/* - * Tables.less - * Tables for, you guessed it, tabular data - * ---------------------------------------- */ +// +// Tables.less +// Tables for, you guessed it, tabular data +// ---------------------------------------- // BASELINE STYLES diff --git a/lib/type.less b/lib/type.less index 8e25fd9c51..407a20ec29 100644 --- a/lib/type.less +++ b/lib/type.less @@ -1,6 +1,6 @@ -/* Typography.less - * Headings, body text, lists, code, and more for a versatile and durable typography system - * ---------------------------------------------------------------------------------------- */ +// Typography.less +// Headings, body text, lists, code, and more for a versatile and durable typography system +// ---------------------------------------------------------------------------------------- // BODY TEXT diff --git a/lib/variables.less b/lib/variables.less index 92d09de709..caa9c0f602 100644 --- a/lib/variables.less +++ b/lib/variables.less @@ -1,6 +1,6 @@ -/* Variables.less - * Variables to customize the look and feel of Bootstrap - * ----------------------------------------------------- */ +// Variables.less +// Variables to customize the look and feel of Bootstrap +// ----------------------------------------------------- // LINK COLORS