mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-20 17:54:23 +01:00
Merge branch 'master' of http://git.local.twitter.com/baseline
This commit is contained in:
commit
a92aeda6a1
2
Makefile
2
Makefile
@ -5,6 +5,6 @@
|
|||||||
build:
|
build:
|
||||||
@lessc ./lib/bootstrap.less > ./bootstrap-1.0.0.css
|
@lessc ./lib/bootstrap.less > ./bootstrap-1.0.0.css
|
||||||
@lessc ./lib/bootstrap.less > ./bootstrap-1.0.0.min.css --compress
|
@lessc ./lib/bootstrap.less > ./bootstrap-1.0.0.min.css --compress
|
||||||
@echo "bootstrap successfully built!"
|
@echo "Bootstrap successfully built! - `date`"
|
||||||
|
|
||||||
.PHONY: build
|
.PHONY: build
|
2
bootstrap-1.0.0.css
vendored
2
bootstrap-1.0.0.css
vendored
@ -597,7 +597,7 @@ pre {
|
|||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
* Forms.less
|
* Forms.less
|
||||||
* Base line styles for various input types, form layouts, and states
|
* Base styles for various input types, form layouts, and states
|
||||||
*/
|
*/
|
||||||
/* Global form styles
|
/* Global form styles
|
||||||
-------------------------------------------------- */
|
-------------------------------------------------- */
|
||||||
|
@ -535,7 +535,6 @@
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<section id="tables">
|
<section id="tables">
|
||||||
<div class="page-header">
|
<div class="page-header">
|
||||||
<h1>Tables <small>For, you guessed it, tabular data</small></h1>
|
<h1>Tables <small>For, you guessed it, tabular data</small></h1>
|
||||||
|
2
lib/bootstrap.less
vendored
2
lib/bootstrap.less
vendored
@ -3,6 +3,8 @@
|
|||||||
* This file is only for importing all required stylesheets for LESS to include and then compile.
|
* This file is only for importing all required stylesheets for LESS to include and then compile.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// CSS Reset
|
// CSS Reset
|
||||||
@import "reset.less";
|
@import "reset.less";
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Forms.less
|
* Forms.less
|
||||||
* Base line styles for various input types, form layouts, and states
|
* Base styles for various input types, form layouts, and states
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user