rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity

moving structure around + more work on builder...

Browse Source
This commit is contained in:
Jacob Thornton 2012-01-26 21:48:46 -08:00
parent e0e54d9c6c
commit dc2deb9a1b
47 changed files with 100 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -1,10 +1,10 @@
VERSION=2.0.0
BOOTSTRAP = ./bootstrap.css
BOOTSTRAP_MIN = ./bootstrap.min.css
BOOTSTRAP_LESS = ./lib/bootstrap.less
BOOTSTRAP_LESS = ./less/bootstrap.less
BOOTSTRAP_RESPONSIVE = ./bootstrap-responsive.css
BOOTSTRAP_RESPONSIVE_MIN = ./bootstrap-responsive.min.css
BOOTSTRAP_RESPONSIVE_LESS = ./lib/responsive.less
BOOTSTRAP_RESPONSIVE_LESS = ./less/responsive.less
LESS_COMPRESSOR ?= `which lessc`
UGLIFY_JS ?= `which uglifyjs`
WATCHR ?= `which watchr`
@ -36,7 +36,7 @@ build:
watch:
@@if test ! -z ${WATCHR}; then \
echo "Watching less files..."; \
watchr -e "watch('lib/.*\.less') { system 'make' }"; \
watchr -e "watch('less/.*\.less') { system 'make' }"; \
else \
echo "You must have the watchr installed in order to watch Bootstrap Less files."; \
echo "You can install it by running: gem install watchr"; \

6
bootstrap.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Thu Jan 26 19:09:35 PST 2012
* Date: Thu Jan 26 21:48:03 PST 2012
*/
article,
aside,
@ -1066,7 +1066,7 @@ table .span12 {
margin-left: 0;
}
.icon {
background-image: url(docs/assets/img/glyphicons-halflings-sprite.png);
background-image: url(img/glyphicons-halflings-sprite.png);
background-position: 0 0;
background-repeat: no-repeat;
display: inline-block;
@ -1075,7 +1075,7 @@ table .span12 {
height: 14px;
}
.icon.white {
background-image: url(docs/assets/img/glyphicons-halflings-sprite-white.png);
background-image: url(img/glyphicons-halflings-sprite-white.png);
}
.icon.glass {
background-position: 0 0;

4
bootstrap.min.css vendored
View File

@ -207,8 +207,8 @@ table .span9{float:none;width:684px;margin-left:0;}
table .span10{float:none;width:764px;margin-left:0;}
table .span11{float:none;width:844px;margin-left:0;}
table .span12{float:none;width:924px;margin-left:0;}
.icon{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);background-position:0 0;background-repeat:no-repeat;display:inline-block;vertical-align:text-top;width:14px;height:14px;}
.icon.white{background-image:url(docs/assets/img/glyphicons-halflings-sprite-white.png);}
.icon{background-image:url(img/glyphicons-halflings-sprite.png);background-position:0 0;background-repeat:no-repeat;display:inline-block;vertical-align:text-top;width:14px;height:14px;}
.icon.white{background-image:url(img/glyphicons-halflings-sprite-white.png);}
.icon.glass{background-position:0 0;}
.icon.music{background-position:-24px 0;}
.icon.search{background-position:-48px 0;}

10
docs/assets/js/application.js
View File

@ -171,6 +171,7 @@ $(function () {
var inputsComponent = $("#components.download input")
, inputsPlugin = $("#plugins.download input")
, inputsVariables = $("#variables.download input")
// toggle all plugin checkboxes
$('#components.download .toggle-all').on('click', function (e) {
@ -183,6 +184,11 @@ $(function () {
inputsPlugin.attr('checked', !inputsPlugin.is(':checked'))
})
$('#variables.download .toggle-all').on('click', function (e) {
e.preventDefault()
inputsVariables.val('')
})
// request built javascript
$('.download-btn').on('click', function () {
@ -193,10 +199,11 @@ $(function () {
.map(function () { return this.value })
.toArray()
, vars = {}
, img = ['glyphicons-halflings-sprite.png', 'glyphicons-halflings-sprite-white.png']
$("#variables.download input")
.each(function () {
return vars[ $(this).prev().text() ] = $(this).val()
$(this).val() && (vars[ $(this).prev().text() ] = $(this).val())
})
// , url: "http://bootstrap.herokuapp.com"
@ -209,6 +216,7 @@ $(function () {
, js: js
, css: css
, vars: vars
, img: img
}
})
})

74
docs/download.html
View File

@ -108,24 +108,24 @@
<div class="span3">
<h3>Components</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="button-groups.less"> Button groups</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="button-combo.less"> Combo buttons</label>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Combo buttons</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="navs.less"> Navs, tabs, and pills</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="navbar.less"> Navbar</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="breadcrumbs.less"> Breadcrumbs</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="pagination.less"> Pagination</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="page.less"> Pager</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="pager.less"> Pager</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="thumbnails.less"> Thumbnails</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="alerts.less"> Alerts</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="progres-bars.less"> Progress bars</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="progress-bars.less"> Progress bars</label>
</div><!-- /span -->
<div class="span3">
<h3>JS Components</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="tooltips.less"> Tooltips</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="popover.less"> Popovers</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="tooltip.less"> Tooltips</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="popovers.less"> Popovers</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="modals.less"> Modals</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="dropdowns.less"> Dropdowns</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="tabs.less"> Tabs</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="collapse.less"> Collapse</label>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Tabs</label>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Collapse</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="carousel.less"> Carousel</label>
</div><!-- /span -->
<div class="span3">
@ -135,9 +135,9 @@
<label class="checkbox"><input checked="checked" type="checkbox" value="utilities.less"> Utilities</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="component-animations.less"> Component animations</label>
<h3>Responsive</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="resopnsive-480.less"> Max-width 480px</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="resopnsive-768.less"> Max-width 768px</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="resopnsive-1210.less"> Max-width 1210px</label>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Max-width 480px</label>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Max-width 768px</label>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Max-width 1210px</label>
</div><!-- /span -->
</div><!-- /row -->
</section>
@ -154,68 +154,68 @@
<div class="span4">
<h3>Links</h3>
<label>@linkColor</label>
<input type="text" class="span3" value="#08c">
<input type="text" class="span3" placeholder="#08c">
<label>@linkColorHover</label>
<input type="text" class="span3" value="darken(@linkColor, 15%)">
<input type="text" class="span3" placeholder="darken(@linkColor, 15%)">
<h3>Grid system</h3>
<label>@gridColumns</label>
<input type="text" class="span3" value="12">
<input type="text" class="span3" placeholder="12">
<label>@gridColumnWidth</label>
<input type="text" class="span3" value="40px">
<input type="text" class="span3" placeholder="40px">
<label>@gridGutterWidth</label>
<input type="text" class="span3" value="20px">
<input type="text" class="span3" placeholder="20px">
<label>@siteWidth</label>
<input type="text" class="span3" value="(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));">
<input type="text" class="span3" placeholder="(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));">
<label>@fluidSidebarWidth</label>
<input type="text" class="span3" value="220px">
<input type="text" class="span3" placeholder="220px">
</div><!-- /span -->
<div class="span4">
<h3>Typography</h3>
<label>@baseFontSize</label>
<input type="text" class="span3" value="13px">
<input type="text" class="span3" placeholder="13px">
<label>@baseFontFamily</label>
<input type="text" class="span3" value="'Helvetica Neue', Helvetica, Arial, sans-serif">
<input type="text" class="span3" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif">
<label>@baseLineHeight</label>
<input type="text" class="span3" value="18px">
<input type="text" class="span3" placeholder="18px">
<h3>Forms</h3>
<label>@primaryButtonColor</label>
<input type="text" class="span3" value="@blue">
<input type="text" class="span3" placeholder="@blue">
<label>@placeholderText</label>
<input type="text" class="span3" value="@grayLight">
<input type="text" class="span3" placeholder="@grayLight">
<h3>Navbar</h3>
<label>@navbarHeight</label>
<input type="text" class="span3" value="40px">
<input type="text" class="span3" placeholder="40px">
<label>@navbarBackground</label>
<input type="text" class="span3" value="@grayDarker">
<input type="text" class="span3" placeholder="@grayDarker">
<label>@navbarBackgroundHighlight</label>
<input type="text" class="span3" value="@grayDark">
<input type="text" class="span3" placeholder="@grayDark">
</div><!-- /span -->
<div class="span4">
<h3>Form states &amp; alerts</h3>
<label>@warningText</label>
<input type="text" class="span3" value="#c09853">
<input type="text" class="span3" placeholder="#c09853">
<label>@warningBackground</label>
<input type="text" class="span3" value="#fcf8e3">
<input type="text" class="span3" placeholder="#fcf8e3">
<label>@warningBorder</label>
<input type="text" class="span3" value="#f3edd2">
<input type="text" class="span3" placeholder="#f3edd2">
<label>@errorText</label>
<input type="text" class="span3" value="#b94a48">
<input type="text" class="span3" placeholder="#b94a48">
<label>@errorBackground</label>
<input type="text" class="span3" value="#f2dede">
<input type="text" class="span3" placeholder="#f2dede">
<label>@errorBorder</label>
<input type="text" class="span3" value="#e9c7c7">
<input type="text" class="span3" placeholder="#e9c7c7">
<label>@successText</label>
<input type="text" class="span3" value="#468847">
<input type="text" class="span3" placeholder="#468847">
<label>@successBackground</label>
<input type="text" class="span3" value="#dff0d8">
<input type="text" class="span3" placeholder="#dff0d8">
<label>@successBorder</label>
<input type="text" class="span3" value="#cfe8c4">
<input type="text" class="span3" placeholder="#cfe8c4">
<label>@infoText</label>
<input type="text" class="span3" value="#3a87ad">
<input type="text" class="span3" placeholder="#3a87ad">
<label>@infoBackground</label>
<input type="text" class="span3" value="#d9edf7">
<input type="text" class="span3" placeholder="#d9edf7">
<label>@infoBorder</label>
<input type="text" class="span3" value="#bfe1f2">
<input type="text" class="span3" placeholder="#bfe1f2">
</div><!-- /span -->
</div><!-- /row -->
</section>

1
docs/scaffolding.html
View File

@ -381,6 +381,7 @@
</div>
</section>
<!-- Footer
================================================== -->
<footer class="footer">

74
docs/templates/pages/download.mustache vendored
View File

@ -43,24 +43,24 @@
<div class="span3">
<h3>Components</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="button-groups.less"> Button groups</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="button-combo.less"> Combo buttons</label>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Combo buttons</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="navs.less"> Navs, tabs, and pills</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="navbar.less"> Navbar</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="breadcrumbs.less"> Breadcrumbs</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="pagination.less"> Pagination</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="page.less"> Pager</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="pager.less"> Pager</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="thumbnails.less"> Thumbnails</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="alerts.less"> Alerts</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="progres-bars.less"> Progress bars</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="progress-bars.less"> Progress bars</label>
</div><!-- /span -->
<div class="span3">
<h3>JS Components</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="tooltips.less"> Tooltips</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="popover.less"> Popovers</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="tooltip.less"> Tooltips</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="popovers.less"> Popovers</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="modals.less"> Modals</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="dropdowns.less"> Dropdowns</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="tabs.less"> Tabs</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="collapse.less"> Collapse</label>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Tabs</label>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Collapse</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="carousel.less"> Carousel</label>
</div><!-- /span -->
<div class="span3">
@ -70,9 +70,9 @@
<label class="checkbox"><input checked="checked" type="checkbox" value="utilities.less"> Utilities</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="component-animations.less"> Component animations</label>
<h3>Responsive</h3>
<label class="checkbox"><input checked="checked" type="checkbox" value="resopnsive-480.less"> Max-width 480px</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="resopnsive-768.less"> Max-width 768px</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="resopnsive-1210.less"> Max-width 1210px</label>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Max-width 480px</label>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Max-width 768px</label>
<label class="checkbox"><input type="checkbox" value=""> MARK PLS FIX Max-width 1210px</label>
</div><!-- /span -->
</div><!-- /row -->
</section>
@ -89,68 +89,68 @@
<div class="span4">
<h3>Links</h3>
<label>@linkColor</label>
<input type="text" class="span3" value="#08c">
<input type="text" class="span3" placeholder="#08c">
<label>@linkColorHover</label>
<input type="text" class="span3" value="darken(@linkColor, 15%)">
<input type="text" class="span3" placeholder="darken(@linkColor, 15%)">
<h3>Grid system</h3>
<label>@gridColumns</label>
<input type="text" class="span3" value="12">
<input type="text" class="span3" placeholder="12">
<label>@gridColumnWidth</label>
<input type="text" class="span3" value="40px">
<input type="text" class="span3" placeholder="40px">
<label>@gridGutterWidth</label>
<input type="text" class="span3" value="20px">
<input type="text" class="span3" placeholder="20px">
<label>@siteWidth</label>
<input type="text" class="span3" value="(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));">
<input type="text" class="span3" placeholder="(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));">
<label>@fluidSidebarWidth</label>
<input type="text" class="span3" value="220px">
<input type="text" class="span3" placeholder="220px">
</div><!-- /span -->
<div class="span4">
<h3>Typography</h3>
<label>@baseFontSize</label>
<input type="text" class="span3" value="13px">
<input type="text" class="span3" placeholder="13px">
<label>@baseFontFamily</label>
<input type="text" class="span3" value="'Helvetica Neue', Helvetica, Arial, sans-serif">
<input type="text" class="span3" placeholder="'Helvetica Neue', Helvetica, Arial, sans-serif">
<label>@baseLineHeight</label>
<input type="text" class="span3" value="18px">
<input type="text" class="span3" placeholder="18px">
<h3>Forms</h3>
<label>@primaryButtonColor</label>
<input type="text" class="span3" value="@blue">
<input type="text" class="span3" placeholder="@blue">
<label>@placeholderText</label>
<input type="text" class="span3" value="@grayLight">
<input type="text" class="span3" placeholder="@grayLight">
<h3>Navbar</h3>
<label>@navbarHeight</label>
<input type="text" class="span3" value="40px">
<input type="text" class="span3" placeholder="40px">
<label>@navbarBackground</label>
<input type="text" class="span3" value="@grayDarker">
<input type="text" class="span3" placeholder="@grayDarker">
<label>@navbarBackgroundHighlight</label>
<input type="text" class="span3" value="@grayDark">
<input type="text" class="span3" placeholder="@grayDark">
</div><!-- /span -->
<div class="span4">
<h3>Form states &amp; alerts</h3>
<label>@warningText</label>
<input type="text" class="span3" value="#c09853">
<input type="text" class="span3" placeholder="#c09853">
<label>@warningBackground</label>
<input type="text" class="span3" value="#fcf8e3">
<input type="text" class="span3" placeholder="#fcf8e3">
<label>@warningBorder</label>
<input type="text" class="span3" value="#f3edd2">
<input type="text" class="span3" placeholder="#f3edd2">
<label>@errorText</label>
<input type="text" class="span3" value="#b94a48">
<input type="text" class="span3" placeholder="#b94a48">
<label>@errorBackground</label>
<input type="text" class="span3" value="#f2dede">
<input type="text" class="span3" placeholder="#f2dede">
<label>@errorBorder</label>
<input type="text" class="span3" value="#e9c7c7">
<input type="text" class="span3" placeholder="#e9c7c7">
<label>@successText</label>
<input type="text" class="span3" value="#468847">
<input type="text" class="span3" placeholder="#468847">
<label>@successBackground</label>
<input type="text" class="span3" value="#dff0d8">
<input type="text" class="span3" placeholder="#dff0d8">
<label>@successBorder</label>
<input type="text" class="span3" value="#cfe8c4">
<input type="text" class="span3" placeholder="#cfe8c4">
<label>@infoText</label>
<input type="text" class="span3" value="#3a87ad">
<input type="text" class="span3" placeholder="#3a87ad">
<label>@infoBackground</label>
<input type="text" class="span3" value="#d9edf7">
<input type="text" class="span3" placeholder="#d9edf7">
<label>@infoBorder</label>
<input type="text" class="span3" value="#bfe1f2">
<input type="text" class="span3" placeholder="#bfe1f2">
</div><!-- /span -->
</div><!-- /row -->
</section>

0
docs/assets/img/glyphicons-halflings-sprite-white.png → img/glyphicons-halflings-sprite-white.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
docs/assets/img/glyphicons-halflings-sprite.png → img/glyphicons-halflings-sprite.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
lib/accordion.less → less/accordion.less
View File

0
lib/alerts.less → less/alerts.less
View File

0
lib/bootstrap.less → less/bootstrap.less vendored
View File

0
lib/breadcrumbs.less → less/breadcrumbs.less
View File

0
lib/button-groups.less → less/button-groups.less
View File

0
lib/buttons.less → less/buttons.less
View File

0
lib/carousel.less → less/carousel.less
View File

0
lib/close.less → less/close.less
View File

0
lib/code.less → less/code.less
View File

0
lib/component-animations.less → less/component-animations.less
View File

0
lib/dropdowns.less → less/dropdowns.less
View File

0
lib/forms.less → less/forms.less
View File

0
lib/grid.less → less/grid.less
View File

0
lib/hero-unit.less → less/hero-unit.less
View File

0
lib/labels.less → less/labels.less
View File

0
lib/layouts.less → less/layouts.less
View File

0
lib/mixins.less → less/mixins.less
View File

0
lib/modals.less → less/modals.less
View File

0
lib/navbar.less → less/navbar.less
View File

0
lib/navs.less → less/navs.less
View File

0
lib/pager.less → less/pager.less
View File

0
lib/pagination.less → less/pagination.less
View File

0
lib/patterns.less → less/patterns.less
View File

0
lib/popovers.less → less/popovers.less
View File

0
lib/print.less → less/print.less
View File

0
lib/progress-bars.less → less/progress-bars.less
View File

0
lib/reset.less → less/reset.less
View File

0
lib/responsive.less → less/responsive.less
View File

0
lib/scaffolding.less → less/scaffolding.less
View File

4
lib/sprites.less → less/sprites.less
View File

@ -12,7 +12,7 @@
// will look like <i class="inbox"></i>.
.icon {
background-image: url(docs/assets/img/glyphicons-halflings-sprite.png);
background-image: url(img/glyphicons-halflings-sprite.png);
background-position: 0 0;
background-repeat: no-repeat;
display: inline-block;
@ -21,7 +21,7 @@
height: 14px;
}
.icon.white {
background-image: url(docs/assets/img/glyphicons-halflings-sprite-white.png);
background-image: url(img/glyphicons-halflings-sprite-white.png);
}
.icon.glass { background-position: 0 0; }

0
lib/tables.less → less/tables.less
View File

0
lib/thumbnails.less → less/thumbnails.less
View File

0
lib/tooltip.less → less/tooltip.less
View File

0
lib/type.less → less/type.less
View File

0
lib/utilities.less → less/utilities.less
View File

0
lib/variables.less → less/variables.less
View File

0
lib/wells.less → less/wells.less
View File