Mark Otto
be74ad7e0d
Merge branch '3.0.0-wip' into bs3-normalize
...
Conflicts:
less/bootstrap.less
2012-12-20 14:02:54 -08:00
Mark Otto
72f13e2870
Merge branch '2.2.3' into 3.0.0-wip
...
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/responsive.less
less/type.less
package.json
2012-12-20 00:02:52 -08:00
Mark Otto
b6945a2168
Rename .hero-unit to .jumbotron becaue fuck dashes in filenames and sports metaphors are cooler than ad ones
2012-12-19 21:37:16 -08:00
Mark Otto
c6cc1b1a1d
Drop .label component. Instead, just use .badge because fuck dupe code and stuff.
2012-12-19 21:18:32 -08:00
Mark Otto
28c928f010
Use normalize as separate file instead of with other resets; still need to punt other styles
2012-12-19 18:43:55 -08:00
Mark Otto
529ecc5a77
Version bump
2012-12-10 18:31:04 -08:00
Mark Otto
ab5d7f863c
move reset after vars and mixins
2012-12-10 09:57:23 -08:00
Mark Otto
98b0d475ae
version bump to 3.0
2012-11-30 22:30:50 -08:00
Mark Otto
ebd2215e49
remove deleted css files, run make
2012-11-30 16:31:24 -08:00
Mark Otto
c0bbe1692c
Merge branch '2.2.2-wip' into exploratory
...
Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less
less/variables.less
2012-11-05 18:27:25 -08:00
Mark Otto
79b7017227
version bump
2012-11-05 09:32:48 -08:00
Mark Otto
a56de2b84f
Merge branch 'glyphicons_font' into exploratory
...
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
less/sprites.less
2012-11-03 16:15:54 -07:00
Mark Otto
1477e081d4
Merge branch '2.2.2-wip' into exploratory
...
Conflicts:
docs/assets/css/bootstrap.css
docs/getting-started.html
docs/templates/pages/getting-started.mustache
less/accordion.less
less/alerts.less
less/breadcrumbs.less
less/buttons.less
less/code.less
less/dropdowns.less
less/forms.less
less/navbar.less
less/progress-bars.less
less/responsive-navbar.less
less/tables.less
less/thumbnails.less
less/tooltip.less
less/wells.less
2012-11-02 09:36:51 -07:00
Mark Otto
72198a59c0
removing glyphicons images, swapping in new icon font with new classes
2012-11-02 01:20:06 -07:00
fat
3b3dd3ac3c
2.2.1 - hotfix for carousel
2012-10-30 21:59:56 -07:00
Mark Otto
41ad16fe40
v2.2.0 instead of v2.1.2
2012-10-29 21:00:53 -07:00
Mark Otto
de6ec034db
single CSS file for all css, including responsive
2012-09-30 23:24:07 -07:00
Mark Otto
0220015edd
remove all ie7 conditionals and mixins
2012-09-25 22:07:53 -07:00
Mark Otto
26ca131a95
Merge branch 'wpbrains-media-component' into 2.1.2-wip
2012-09-17 18:15:44 -07:00
Mark Otto
917b46a343
resolve conflicts and remake
2012-09-17 16:43:18 -07:00
Mark Otto
08b8571cb8
version bump to get this started
2012-09-05 10:00:57 -07:00
Mark Otto
1c134d9a7f
update version numbers to 2.1.1
2012-08-21 13:11:25 -07:00
Mark Otto
79e05d0c0e
change css version #
2012-08-17 11:24:48 -07:00
Mark Otto
b63543181a
fix examples collapse classes, rename navbar-redux to navbar and delete the old one
2012-07-30 10:08:27 -07:00
Mark Otto
a30045daef
reverse navbar styles to save code
2012-07-29 00:30:15 -07:00
Mark Otto
6662f62236
remove subnav file, instead add an optional class for .navbar
2012-06-24 21:03:39 -07:00
Mark Otto
71669dda63
tons of docs cleanup in css, adding subnav to official components
2012-06-24 20:26:48 -07:00
Jacob Thornton
ebc6935663
2.0.3 -> 2.0.4
2012-06-01 11:04:27 -07:00
Giuliano Velli
4fbb400754
Added Medias code and documentation
...
Fix for Issue #1711
Added media.less and edited bootstrap.less and responsive.less to
manage media components.
Added a section to the documentation (Media, in components.html) outlining how Medias work. Edited bootstrap.css and bootstrap-responsive.css to add the code for the demos
Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
2012-04-24 17:19:17 +02:00
Mark Otto
ab068f6fda
bump version numbers in css files to 2.0.3, break out responsive CSS into separate files for further customization
2012-03-22 21:33:06 -07:00
Mark Otto
d7af2714c6
remove separate badges and labels, add single file instead, remove hover from non-link badges/labels
2012-03-22 16:02:00 -07:00
Jacob Thornton
59503e71ff
2.0.2 derp
2012-03-12 14:09:38 -07:00
Mark Otto
06d4756114
adding basic badges support
2012-02-20 21:20:06 -08:00
Jacob Thornton
7ec09d0db9
2.0.1
2012-02-16 22:42:38 -08:00
Mark Otto
23e076c1bb
add in a navbar button for toggling the nav items
2012-01-28 15:09:23 -08:00
Jacob Thornton
15d3a4797f
simplify build process more - remove really annoying date.
2012-01-27 21:06:09 -08:00
Jacob Thornton
dc2deb9a1b
moving structure around + more work on builder...
2012-01-26 21:48:46 -08:00
Jacob Thornton
96c3e70996
cleanup old stuff
2011-05-03 18:12:43 -07:00
Mark Otto
a6d5f6743f
Changing up boostrap for better grid variable management and grid structuring
2011-05-03 17:35:08 -07:00
Mark Otto
eb81782cdb
Porting over all Blueprint styles to new Baseline repo
2011-04-27 13:53:51 -07:00
