Commit a92aeda6 authored by Mark Otto's avatar Mark Otto

Merge branch 'master' of http://git.local.twitter.com/baseline

parents 4e95e558 88e93d1c
...@@ -5,6 +5,6 @@ ...@@ -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
\ No newline at end of file
...@@ -597,7 +597,7 @@ pre { ...@@ -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 @@ ...@@ -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>
......
...@@ -3,6 +3,8 @@ ...@@ -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";
......
/* /*
* 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
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment