Mark Otto
d9759abeeb
Merge branch 'ie_7_components' of https://github.com/phopkins/bootstrap into phopkins-ie_7_components
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 16:35:32 -08:00
Mark Otto
3807a88ee9
update the docs for icons
2012-01-27 13:56:50 -08:00
Mark Otto
8da1c176ec
Merge branch '2.0-wip' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0-wip
2012-01-27 13:43:51 -08:00
Mark Otto
335a8686da
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 13:43:28 -08:00
Pete Hopkins
84b9a1bfb6
Rebuild css and html
2012-01-27 16:39:38 -05:00
Mark Otto
b1f38bbea8
update icon examples to show icons in differently sized buttons
2012-01-27 13:39:19 -08:00
Jacob Thornton
6fd1e9f4c0
rebuil update layout
2012-01-27 13:36:31 -08:00
Mark Otto
e8647c1b11
huuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuge update to doces and stuff
2012-01-27 13:20:02 -08:00
Burak Tuyan
942d1b4595
Updating to latest version of Glyphicons Halflings set (v.1.5) along with some icon enhancements like:
...
- Updated the Gylphicons Halflings set to version 1.5 (30 new icons)
- Optimized the sprite PNG files for minimum filesize without any quality loss
- Made some fixes for horizontal alignment at the LESS/CSS level (tags, bold, arrow-up, minus, chevron-down)
- Made some fixes for vertical alignment at the LESS/CSS level (chevron-down, resize-vertical, resize-horizontal)
- Renamed the old "calendar" class as "list-alt" class (because now we've a real calendar icon)
- Changed the "background-position" of the icon class to "14px 14px", so that a wrong class name will not be showing the glass icon and instead will show a blank icon (which is useful for just positioning the text after the icons in some cases)
- Added new icons (classes) to the base-css Docs (to both HTML file and Mustache template)
- Changed one of the button examples to danger style and used a white icon
- Renamed the sprite image files to save a few bytes here and there (from glyphicons-halflings-sprite.png to lyphicons-halflings.png and from glyphicons-halflings-sprite-white.png to glyphicons-halflings-white.png)
2012-01-27 16:33:18 +02:00
Jacob Thornton
ed64276e5b
move doc building into base make method + build bootstrap to doc assets
2012-01-26 22:05:45 -08:00
Mark Otto
af96da6e89
adding white sprites
2012-01-26 16:27:37 -08:00
Mark Otto
b260544de0
fix links to apple touch icons
2012-01-26 15:54:04 -08:00
Mark Otto
edef89f30e
move around some comments in buttons.less, update labels to use correct variables, add snippet to docs about IE9
2012-01-26 11:10:07 -08:00
Mark Otto
0ef4b6419f
overhaul frontpage jumbotron, add js for twitter buttons back in, fix up some form ids and classes, straighten out the use of primary button variable
2012-01-26 10:00:09 -08:00
Mark Otto
94ea3b62f0
fix forms examples and allow for inputs in labels
2012-01-25 21:28:24 -08:00
Mark Otto
4ea63e5261
finish off the static stuff for build and download page
2012-01-25 13:33:55 -08:00
Mark Otto
9c4a70c597
swap fieldsets for divs
2012-01-25 12:43:38 -08:00
Mark Otto
58d08a2db3
enable support for form states on select elements
2012-01-25 11:35:08 -08:00
Mark Otto
e24bd40b4a
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
2012-01-25 11:27:29 -08:00
Mark Otto
b851156863
change form fields back to inline-block to allow for inline-help text in default form markup
2012-01-25 11:26:45 -08:00
Jacob Thornton
25519bacd5
rebuild + add spy to template
2012-01-25 11:25:35 -08:00
Mark Otto
e49e49ff95
fix mention of old vertical forms class'
2012-01-25 10:51:26 -08:00
Mark Otto
97bad784b5
update remaining icons in docs
2012-01-25 10:50:08 -08:00
Mark Otto
1fa3eab20c
fix location of favicon
2012-01-25 10:19:29 -08:00
Mark Otto
9553b1e3e9
update docs to include separate responsive css, update docs to highlight proper file name, updated makefile to build responsive separately
2012-01-25 10:02:52 -08:00
Mark Otto
b01de5fc56
updated icons to require a base class .icon
2012-01-25 09:51:03 -08:00
Mark Otto
b8fa6cfacf
move css builder and downloader to dedicated page, start to update remaining sections on LESS docs page
2012-01-25 01:22:29 -08:00
Mark Otto
6ab56051fd
fix up docs css for responsive and subnav, fix forms error states
2012-01-24 23:35:34 -08:00
Mark Otto
a5c1d1f182
adding actual images to carousel to ensure you can see things are animating; updated styles of carousel controls to work on light and dark backgrounds and use opacity for effects
2012-01-24 20:45:38 -08:00
Mark Otto
8ce9b3a676
Merge pull request #1175 from Xaro/2.0-wip
...
Typo in pre type section
2012-01-24 20:16:33 -08:00
Roberto Poo
74b5dc8d3b
Fixed typo
2012-01-25 02:06:50 -02:00
Mark Otto
bacb05608f
redo the form examples to enable better responsive layout
2012-01-24 19:43:52 -08:00
Mark Otto
672ba4c2fd
update the subnav on all pages
2012-01-24 19:19:50 -08:00
Mark Otto
b9bd5c65e7
fix mailto link
2012-01-24 16:18:12 -08:00
Jacob Thornton
3aea86370d
rebuild base-css
2012-01-24 13:48:05 -08:00
Jacob Thornton
7d52e1dcd4
remake
2012-01-24 13:47:24 -08:00
Mark Otto
72861dfbf2
Merge branch 'apostrophe-grammar' of https://github.com/phopkins/bootstrap into phopkins-apostrophe-grammar
2012-01-24 10:45:51 -08:00
Pete Hopkins
91b32f4783
Fixes apostrophe usage in base-css.html
2012-01-24 12:12:35 -05:00
Jacob Thornton
82de03b67c
start wrapping text in {{_i}} for translation
2012-01-23 19:55:00 -08:00
Jacob Thornton
b4b1ef6839
rebuild with new templates
2012-01-23 15:17:32 -08:00
Jacob Thornton
74521e8354
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
docs/base-css.html
docs/components.html
docs/index.html
docs/javascript.html
docs/less.html
docs/scaffolding.html
2012-01-23 15:06:56 -08:00
Jacob Thornton
f764aee4b9
add templates for doc generation
2012-01-23 14:14:16 -08:00
Mark Otto
a7bf0295fb
remove dropdowns, add in sub nav instead
2012-01-23 11:55:04 -08:00
Jacob Thornton
155b72e873
share -> share-alt
2012-01-22 20:02:56 -08:00
Mark Otto
47b8184bbb
scope table styles to a class, .table, instead of on the generic element as a smarter default
2012-01-17 23:39:18 -08:00
Mark Otto
41a410b8e6
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
bootstrap.min.css
docs/javascript.html
lib/accordion.less
2012-01-17 23:19:21 -08:00
Mark Otto
f1a88eede3
fix js link in docs nav, restyle accordion with new css
2012-01-16 17:27:30 -08:00
Jon Stevens
b4dd2b9a10
fix typo
2012-01-15 19:38:30 -08:00
Mark Otto
dab6d2b17c
change up classes on tables and forms, fix nav list styles in example
2012-01-14 21:28:47 -08:00
Mark Otto
74c0fc17c8
fix duplicate icons
2012-01-14 16:56:47 -08:00