Mark Otto
d02c6957d4
fixing up buttons and examples of implementing icons
2012-01-27 19:49:56 -08:00
Mark Otto
a624ac1edf
Merge branch '2.0/docs/base/icons' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0/docs/base/icons
2012-01-27 19:12:09 -08:00
Mark Otto
7e72eb5063
new tab focus style and mixin
2012-01-27 18:33:25 -08:00
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
Burak Tuyan
a2a10ae421
Adding new examples to the icons' docs.
...
- Button with dropdown menu.
- Small info button.
- Text alignment for navigation with no icon.
- Text input form with prepended icon
- Select input form with prepended icon
2012-01-28 02:13:53 +02: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
Mark Otto
b1f38bbea8
update icon examples to show icons in differently sized buttons
2012-01-27 13:39:19 -08:00
Jacob Thornton
3c7e3eb7d3
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 13:37:14 -08:00
Jacob Thornton
6fd1e9f4c0
rebuil update layout
2012-01-27 13:36:31 -08:00
Mark Otto
a0b40b361a
i18n download page
2012-01-27 13:35:25 -08:00
Mark Otto
ccd963e622
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/download.html
2012-01-27 13:21:01 -08:00
Mark Otto
e8647c1b11
huuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuge update to doces and stuff
2012-01-27 13:20:02 -08:00
Pete Hopkins
7b31f4a334
Brings back uneditable input
2012-01-27 16:09:58 -05:00
Jacob Thornton
3b3dbd7229
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 11:07:17 -08:00
Burak Tuyan
16a28d881c
Merge branch '2.0-wip' of git://github.com/twitter/bootstrap into 2.0-wip
2012-01-27 20:48:37 +02:00
Mark Otto
e44a7dd4ff
buttons for toggle links in js docs, code example for offsetting in grid
2012-01-27 09:36:49 -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
aa594501bd
change typeahead to data-source instead of data-data and add to docs
2012-01-26 23:16:02 -08:00
Jacob Thornton
ed64276e5b
move doc building into base make method + build bootstrap to doc assets
2012-01-26 22:05:45 -08:00
Jacob Thornton
dc2deb9a1b
moving structure around + more work on builder...
2012-01-26 21:48:46 -08:00
Jacob Thornton
e0e54d9c6c
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-26 20:23:28 -08:00
Mark Otto
576ae2f561
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-26 19:10:32 -08:00
Mark Otto
a4a8ea2328
flip order of content on home page
2012-01-26 19:09:59 -08:00
Marco Wise
6886022fe6
fix typo in docs/scaffolding.html
2012-01-26 18:10:36 -08:00
Jacob Thornton
12484a7471
more builder crap
2012-01-26 16:41:28 -08:00
Mark Otto
af96da6e89
adding white sprites
2012-01-26 16:27:37 -08:00
Jacob Thornton
c31ac846d7
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-26 16:12:51 -08:00
Jacob Thornton
d531f72645
some js for javascript for builder (stil incomplete)
2012-01-26 16:12:34 -08:00
Mark Otto
b260544de0
fix links to apple touch icons
2012-01-26 15:54:04 -08:00
Mark Otto
945870d778
small text change on downloads page
2012-01-26 14:54:24 -08:00
Mark Otto
8a6be6601d
make accordion links block level
2012-01-26 14:40:19 -08:00
Mark Otto
43c8f41895
add values to inputs for grid variables on download page
2012-01-26 14:40:09 -08:00
Mark Otto
b7f22e27ec
more docs homepage adjustments
2012-01-26 11:47:40 -08:00
Mark Otto
9c1ec6fb98
updated homepage docs to distill strapline
2012-01-26 11:40:29 -08:00
Mark Otto
358e3a53f7
Merge branch 'phopkins-ie_buttons' into 2.0-wip
2012-01-26 11:10:16 -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
b8c1950cbf
change label fo first subnav link on js docs
2012-01-26 10:43:08 -08:00
Mark Otto
34488a4500
fix tabs example on js docs page
2012-01-26 10:39:07 -08:00
Pete Hopkins
29f0e4c28b
Removes filters as a way to provide gradients for IE<=9
...
- Lets us use rounded corners in IE9
- Makes hover / active states work correctly in IE<=9
Only change for non-IE is that moving from hover -> not hovering
no longer animates (was a subtle blend) due to mismatch between the
bottom of the gradient and the background color.
Refactor: moves the primary button background to match the others.
2012-01-26 13:07:52 -05: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
106625a2ec
fix small icons on homepage
2012-01-26 00:36:40 -08:00
Mark Otto
94ea3b62f0
fix forms examples and allow for inputs in labels
2012-01-25 21:28:24 -08:00
Mark Otto
ce467f7091
consistency in download page heading
2012-01-25 20:11:13 -08:00
Mark Otto
e877d125d7
fix button group shadows, update js docs to fix alert js file link
2012-01-25 20:02:32 -08:00
Mark Otto
b6b7d1343b
finish the rest of the less page mixins docs
2012-01-25 15:03:44 -08:00
Mark Otto
7d83f45ebb
start filling out mixins tables
2012-01-25 14:08:51 -08:00
Mark Otto
7ca3b98d88
docs fixes
2012-01-25 13:56:44 -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
fd3c6733a2
missing icon class in code example
2012-01-25 11:11:22 -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
324ebb5990
spec'ed out an examples overview page with links to current examples; examples still need work themselves though
2012-01-25 10:47: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
c381199968
fix media queries in scaffolding
2012-01-25 09:57:40 -08:00
Mark Otto
29b4ba0fc5
fix modal examples on js page, update modal close button positioning
2012-01-25 09:53:53 -08:00
Mark Otto
b01de5fc56
updated icons to require a base class .icon
2012-01-25 09:51:03 -08:00
Mark Otto
de4ada3b88
spec out all mixins on less page
2012-01-25 01:45:15 -08:00
Mark Otto
bd36e2a163
remove checkboxes from js docs page overview, they'll be on the download page instead
2012-01-25 01:25:15 -08:00
Mark Otto
f4f7296fa8
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/less.html
docs/templates/pages/less.mustache
2012-01-25 01:23:50 -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
c5103d0ad1
Merge pull request #1181 from jwieland/updatelessdoc
...
Minor doc changes about less.js version
2012-01-25 00:41:05 -08:00
Jason Wieland
64f85e0371
caught another old reference to 1.1.3
2012-01-25 00:02:37 -08:00
Mark Otto
b0fb31be5e
fix js link on chop shop
2012-01-24 23:45:48 -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
c6d5dcd872
remove link from transitions on js page
2012-01-24 19:50:18 -08:00
Mark Otto
bacb05608f
redo the form examples to enable better responsive layout
2012-01-24 19:43:52 -08:00
Mark Otto
4a6d9106b8
fix the thumbnails more examples section
2012-01-24 19:36:42 -08:00
Mark Otto
672ba4c2fd
update the subnav on all pages
2012-01-24 19:19:50 -08:00
Mark Otto
f70895a605
remove rogue html elements
2012-01-24 19:01:38 -08:00
Mark Otto
8804860898
fix typo on js docs
2012-01-24 18:45:23 -08:00
Mark Otto
9ef4171d03
lighten alert on less page
2012-01-24 18:26:45 -08:00
Mark Otto
26ed8202ee
modify the scaffolding page to fix the language around preboot/grid variables
2012-01-24 18:24:38 -08:00
Mark Otto
805a965f2e
finish updating form state and alert variables in less docs page
2012-01-24 17:14:19 -08:00
Mark Otto
40e92221a6
revamp alert message and error state color/text/bg to be variables
2012-01-24 16:54:35 -08:00
Mark Otto
b9bd5c65e7
fix mailto link
2012-01-24 16:18:12 -08:00
Mark Otto
7e6797880a
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/index.html
docs/templates/pages/index.mustache
2012-01-24 16:09:32 -08:00
Mark Otto
8ff621aa26
fix broken index page heading, update variables and less pages
2012-01-24 16:07:30 -08:00
Jacob Thornton
655a96869c
typo with i18n
2012-01-24 15:51:28 -08:00
Jacob Thornton
3a840075dd
rebuild
2012-01-24 15:42:16 -08:00
Jacob Thornton
4c5497bfcc
Merge pull request #1158 from pokonski/wrap-stuff
...
Wrap stuff in components.mustache
2012-01-24 15:03:30 -08:00
Piotrek Okoński
ef869776e5
Wrap stuff in components.mustache
2012-01-25 00:00:35 +01:00
Jacob Thornton
5f209ed810
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/templates/pages/index.mustache
2012-01-24 14:33:52 -08:00
Jacob Thornton
fbc1ab14cc
Merge branch '2.0-wip' of https://github.com/MGaetan89/bootstrap into 2.0-wip
...
Conflicts:
docs/templates/pages/index.mustache
2012-01-24 14:31:10 -08:00
Mark Otto
58f7fd308a
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/templates/pages/index.mustache
2012-01-24 14:28:14 -08:00
Mark Otto
fecd4ddd13
docs updates to make the getting started section more responsive, updated the benefits to be clearer and swap x for checkmark
2012-01-24 14:25:30 -08:00
Gaëtan Muller
fea1dc906e
i18n for index page
2012-01-24 23:23:43 +01:00
Jacob Thornton
a800d6ceac
i18n index
2012-01-24 14:22:02 -08:00
Jacob Thornton
f4543ecb19
add i18n to upgrading
2012-01-24 14:14:01 -08:00
Jacob Thornton
f03e170054
scaffolding i18n
2012-01-24 14:08:03 -08:00
Jacob Thornton
72117c3f97
add i18n for less.mustache
2012-01-24 13:57:44 -08:00
Jacob Thornton
b0a351d8f7
Merge pull request #1153 from MGaetan89/2.0-wip
...
#1122 - i18n in Base CSS documentation
2012-01-24 13:43:13 -08:00
Gaëtan Muller
425e5bfb71
Final translation tags in Base CSS
2012-01-24 22:17:32 +01:00
Gaëtan Muller
a9c6dca094
More translation tags in Base CSS
2012-01-24 21:45:42 +01:00
Gaëtan Muller
bc9c89f157
Start adding tag for Base CSS translation
2012-01-24 21:29:55 +01:00
Jacob Thornton
222067b360
javascript pages markedup with {{_i}}
2012-01-24 12:11:05 -08:00
Jacob Thornton
16440eea92
move translation tag for bootstrap
2012-01-23 19:59:05 -08: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
f764aee4b9
add templates for doc generation
2012-01-23 14:14:16 -08:00