rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-04 16:24:22 +01:00
Code Issues Actions Packages Releases Activity
1,724 Commits 108 Branches 89 Tags 547 MiB
a84092d225
Commit Graph

1017 Commits

Author SHA1 Message Date
Mark Otto
d7b8a9c930 align text in buttons so folks can easily make them different widths 2012-01-27 13:36:08 -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
97546adc90 Merge branch 'ie_7_base' of https://github.com/phopkins/bootstrap into phopkins-ie_7_base 2012-01-27 09:40:04 -08: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
Pete Hopkins
f51e703ba6 Rebuild bootstrap.css 2012-01-27 12:16:36 -05:00
Mark Otto
9d0328ff00 adding outline callout as a fallback for IE--needs testing though, thought I already added this 2012-01-27 08:21:39 -08:00
Burak Tuyan
acaa3b5977 Changing the color of the default icons from black (#000) to grayDark (#333) 2012-01-27 18:02:57 +02: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
c63175dc1d change endpoint to point to actual server... 2012-01-26 22:52:44 -08:00
Jacob Thornton
815a2ae9f2 rebuild + copy images to docs when making 2012-01-26 22:39:17 -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
Jacob Thornton
1e9c2fb9d4 getting closer.... 2012-01-26 20:23:15 -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
Mark Otto
c8d2c4e442 fix height of download button 2012-01-26 16:45:01 -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
f398926e46 move down background iamge 2012-01-26 15:22:52 -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
Mark Otto
5d465fab4c Merge branch 'ie_buttons' of https://github.com/phopkins/bootstrap into phopkins-ie_buttons 2012-01-26 10:12:50 -08:00
Mark Otto
ef4d0dd7db space out masthead a git more 2012-01-26 10:12:25 -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
f62c9379fb remove all tablesorter assets and css 2012-01-25 20:07:27 -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
a4b8cc2a9c darken active state on subnav with scrollspy added 2012-01-25 11:30:30 -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
ae70d2a8b6 refine spacing on fixed subnav 2012-01-24 23:44:59 -08:00
Mark Otto
e555f38ae4 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/less.html
 2012-01-24 23:36:39 -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
Jason Wieland
6be91368c0 minor doc updates to inform user they need the current less.js 1.2.1 or they will be hit by this bug #952 2012-01-24 23:24:46 -08:00
Jacob Thornton
5d3175e84b fix sub navs fer the otherrzz 2012-01-24 22:48:30 -08:00
Jacob Thornton
5a54a98925 subnav spy scrolls blaawerh 2012-01-24 22:37:35 -08:00
Jacob Thornton
5e5e87fbd0 scrollspy working for sub navs 2012-01-24 22:33:33 -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
aa59f123c0 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-24 20:30:39 -08:00
Mark Otto
731821b78f updated docs css to fix subnav on iOS 2012-01-24 20:26:54 -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
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
d362223535 refine fixed docs bar 2012-01-24 18:29:17 -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
4793a6f8fa Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-24 17:14:34 -08:00
Mark Otto
805a965f2e finish updating form state and alert variables in less docs page 2012-01-24 17:14:19 -08:00
Jacob Thornton
a40d4993ed make subnav fix 2012-01-24 17:13:02 -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
03d2128f50 Merge pull request #1149 from Calvein/2.0-wip 
[base-css] Fixed a nasty "mailto" typo and added jquery.tablesorter
 2012-01-24 16:08:09 -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
3aea86370d rebuild base-css 2012-01-24 13:48:05 -08:00
Jacob Thornton
9e7f4ebd77 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-24 13:47:41 -08:00
Jacob Thornton
7d52e1dcd4 remake 2012-01-24 13:47:24 -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
François Robichet
5fb31670af Added jquery.tablesorter js file 2012-01-24 22:12:37 +01:00
François Robichet
925fef4110 Typo on tablesorter 2012-01-24 22:11:09 +01:00
François Robichet
540d229eba Fixed a mailto typo 2012-01-24 21:57:30 +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
b5503c4c28 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-24 12:11:26 -08:00
Jacob Thornton
222067b360 javascript pages markedup with {{_i}} 2012-01-24 12:11:05 -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
04efc8d0a8 Fixes apostrophe in less.html 2012-01-24 12:52:06 -05:00
Pete Hopkins
37b38fe2a0 Spelling and typos in components.html and javascript.html 2012-01-24 12:49:30 -05:00
Pete Hopkins
91b32f4783 Fixes apostrophe usage in base-css.html 2012-01-24 12:12:35 -05:00
Christian Nennemann
774d8d8d17 Fix typo in docs/index.html 2012-01-24 14:46:44 +01: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
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
1954cf0019 comment in forms' 2012-01-23 13:46:26 -08:00
Mark Otto
ea8f5883fd clean up subnav aesthetics 2012-01-23 12:04:48 -08:00
Mark Otto
a7bf0295fb remove dropdowns, add in sub nav instead 2012-01-23 11:55:04 -08:00
Jacob Thornton
dc5bedda14 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-22 20:03:17 -08:00
Jacob Thornton
155b72e873 share -> share-alt 2012-01-22 20:02:56 -08:00
Jacob Thornton
87c676335c Merge pull request #1053 from scottwater/patch-1 
Added missing 'data-dismiss="modal"' on the first example model source.
 2012-01-22 19:38:48 -08:00
Olivier Laviale
0523c053a7 Fixed typo 2012-01-22 21:45:20 +01:00
Chris Gunther
c3625ebb23 Move placement of ID in docs example for dropdowns 
The ID specified by an href or data-target attribute should match the
li.dropdown, not the ul.dropdown-menu
 2012-01-22 11:46:44 -05:00
Jacob Thornton
373a54187e add ability to cycle carousel to a particular frame 2012-01-21 23:02:29 -08:00
Jacob Thornton
d3817cf466 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-21 21:35:53 -08:00
Jacob Thornton
2187e0838f change scrollspy offset to be option + fix typo in scrollspy 2012-01-21 21:35:20 -08:00
Burak Tuyan
4a5867b18b Optimizing all PNG files, saving 60.02 KB in total without any quality lost. (Using PNGOUTWin 1.5.0.100, Xtreme strategy in compability mode) 2012-01-21 23:52:39 +02:00
Jacob Thornton
7444310c4d only prevent default of links in sections 2012-01-20 20:05:16 -08:00
Scott Watermasysk
9c94078415 Added missing 'data-dismiss="modal"' on the first example model source. 2012-01-18 14:53:59 -05:00
Mark Otto
8c1a908754 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-17 23:39:28 -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
51f5b7b8af cleanup accordion css and add comments 2012-01-17 23:24:59 -08:00
Mark Otto
4f12627604 Merge pull request #1042 from boberkfell/2.0-wip 
2.0 wip Small typo fix in docs
 2012-01-17 23:21:52 -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
Ben Oberkfell
4d098a7f8e typo fix in component docs 2012-01-18 00:37:24 -06:00
Mark Otto
f1a88eede3 fix js link in docs nav, restyle accordion with new css 2012-01-16 17:27:30 -08:00
Jacob Thornton
810bba97a4 make accordions little bit smoother 2012-01-15 21:48:58 -08:00
Jon Stevens
b4dd2b9a10 fix typo 2012-01-15 19:38:30 -08:00
Mark Otto
f48278dac6 updated accordion and carousel; accordion still needs work 2012-01-15 18:40:17 -08:00
Mark Otto
c02501e1b7 move carousel to separate stylesheet, update popovers to fix ie7 bug, fix pagination, fix alerts 2012-01-15 16:27:36 -08:00
Mark Otto
3d9298b04b fix the js alerts examples 2012-01-15 15:06:30 -08:00
Mark Otto
127c0d0b52 make dl and child elements less specific 2012-01-15 13:12:29 -08:00
Mark Otto
fe160261e4 normalize the alert classes to match last night's flip for form and table classes 2012-01-15 11:30:24 -08:00
Mark Otto
1385540d0a Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-15 11:26:21 -08:00
Mark Otto
8ceea1f559 fix some ie7 bugs, improve dropdowns for ie due to lack of a shadow, fix pager example code 2012-01-15 11:26:06 -08:00
Paul Kauders
ed9903f797 Fix typo in Responsive design content 2012-01-15 07:46:25 -06: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
6d916763f8 adding the pager component after rewriting the pagination docs and css 2012-01-14 20:54:37 -08:00
Mark Otto
1c6048bac2 restore top bar on home page 2012-01-14 19:17:48 -08:00
Mark Otto
2c3365f99e allow btn-groups to work in navbars 2012-01-14 17:16:46 -08:00
Mark Otto
74c0fc17c8 fix duplicate icons 2012-01-14 16:56:47 -08:00
Mark Otto
7455dd6b45 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-14 16:18:39 -08:00
Mark Otto
f587e81b7d rewrite alert messages to use less code, combine the look of default and block messages, simplify docs 2012-01-14 16:18:15 -08:00
Chris Gunther
ec7f8917b1 add Progress Bars to Components narbar dropdown 2012-01-14 15:24:35 -05:00
Chris Gunther
1f54ff91b2 fix section ID for thumbnails 2012-01-14 15:21:57 -05:00
Chris Gunther
b723db1e42 fix section ID for pagination 2012-01-14 15:21:09 -05:00
Chris Gunther
f82fb2a197 fix navbar links to base CSS > typography 2012-01-14 15:18:59 -05:00
Chris Gunther
a4b107bf87 fix navbar links to scaffolding > grid system 2012-01-14 15:15:24 -05:00
Mark Otto
fc053ac8b2 update dropdowns spacing and docs section spacing 2012-01-13 10:07:56 -08:00
Mark Otto
b958ac77c1 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-13 09:55:43 -08:00
Mark Otto
8f09028cff updated js includes to make nav work everywhere 2012-01-13 09:55:15 -08:00
Purwandi
7b321e9c1f Remove sidebar with icon from my own repo 2012-01-13 15:03:23 +07:00
Purwandi
2623f325ec Merge branch '2.0-wip' of github.com:purwandi/bootstrap into 2.0-wip 2012-01-13 14:58:13 +07:00
Purwandi
11be9cd163 Fix id anchor javascript 2012-01-13 14:57:21 +07:00
Mark Otto
391248c0e3 nuke uber footer, bring back topbar dropdowns 2012-01-12 15:29:16 -08:00
Davide Bellini
1fa94bdbf4 Fixed broken anchors on js docs page 2012-01-12 12:04:17 +01:00
Jacob Thornton
19090ea333 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 
Conflicts:
	bootstrap.css
 2012-01-11 21:43:43 -08:00
Jacob Thornton
6f2f947a43 add build tool for js + rename twipsy to tooltip + lots of little doc cleanup 2012-01-11 21:42:55 -08:00
Mark Otto
f2fdbd9113 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-10 16:22:19 -08:00
Mark Otto
a34231d94d typo 2012-01-10 15:58:44 -08:00
Jacob Thornton
51e4e77034 remove some tabs from demo + fix dropdowns for pills 2012-01-09 19:53:52 -08:00
Mark Otto
5032ef9b54 remove static popovers, modals, and twipsies from components in favor of full javascript page 2012-01-08 23:14:07 -08:00
Mark Otto
83c0896999 updated js pages to put examples first 2012-01-08 21:48:07 -08:00
Mark Otto
e654ec1336 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-08 15:33:55 -08:00
Jacob Thornton
a24cdb3e40 Merge pull request #932 from blizzy78/typo 
Tiny typo fix
 2012-01-08 15:13:56 -08:00
Jacob Thornton
7aca72322e move hover state out of timeout duh 2012-01-08 15:12:34 -08:00
Maik Schreiber
dbe5e666af fix typo 2012-01-09 00:02:13 +01:00
Jacob Thornton
6e8a3bba32 add note about firefox persisting disabled state on buttons 2012-01-08 14:54:36 -08:00
Mark Otto
ac68bc39ff Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-08 14:33:52 -08:00
Mark Otto
2c79030439 fix navbar styles for .brand 2012-01-08 14:33:14 -08:00
Mark Otto
cb38d08ed4 updated js docs page to use grid of plugins instead of table 2012-01-08 14:33:03 -08:00
Jacob Thornton
561fc8cf2a document slide and slid methods 2012-01-08 13:54:00 -08:00
Mark Otto
0d62778b28 correct navbar scaffolding code snippet 2012-01-08 13:22:20 -08:00
Mark Otto
cb9be7bd0c clean up dup css in responsive, fix navbar dropdown caret 2012-01-08 13:21:44 -08:00
Jacob Thornton
fbd686ad65 get tabs working in ie9 2012-01-08 12:08:00 -08:00
Mark Otto
cb52458698 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-08 03:19:06 -08:00
Mark Otto
21eb2dac8a add icons in nav list example and markup 2012-01-08 03:18:48 -08:00
Mark Otto
2376da40fb cleanup organization of tabbable nav section 2012-01-08 03:11:51 -08:00
Purwandi
b14426c176 Added example sidebar navigation with icon in docs 2012-01-08 17:44:19 +07:00
Jacob Thornton
0bbb64be4d add nav class to tabs in javascript demo 2012-01-08 02:04:23 -08:00
Mark Otto
9daf1661c5 fix docs for fluid layout, update topbar to fix active text color for links 2012-01-08 01:54:59 -08:00
Mark Otto
19986b3dd8 remove / on js, fix link to typeahead, remove old gradient on dropdown hover 2012-01-08 01:45:49 -08:00
Jacob Thornton
bc505560a0 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 
Conflicts:
	bootstrap.css
	bootstrap.min.css
 2012-01-08 00:50:48 -08:00
Jacob Thornton
4478df7681 first pass at ultra basic autocomplete 2012-01-08 00:49:38 -08:00
Mark Otto
d170224457 fix progress bars by removing border and negative margins 2012-01-07 23:21:40 -08:00
Mark Otto
22e0c5f7c8 redoing the tabs on bottom, left, and right 2012-01-07 22:06:44 -08:00
Mark Otto
d0eecc85f8 remove tabbable stuff to try new approach 2012-01-07 21:18:47 -08:00
Mark Otto
ecffa03890 nuke unused code, add to upgrading page 2012-01-07 21:10:17 -08:00
Mark Otto
95f47026cf fix up dropdowns and navbar docs for the new dropdown styles 2012-01-07 21:09:02 -08:00
Mark Otto
343dd9616d Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-07 20:40:49 -08:00
Mark Otto
2948d1c3b2 overhaul the entire tabs component structure and docs; remove side nav and make it a nav list to build on new .nav base class 2012-01-07 20:40:28 -08:00
Purwandi
4961aa8c23 Fix line number pretyprint in javascript docs 2012-01-08 08:17:54 +07:00
Mark Otto
1438b14f74 overhauled docs to include example markup, add language around browser support and classes 2012-01-07 15:52:57 -08:00
Mark Otto
418e2c7d58 Merge branch '2.0-wip' of https://github.com/pokonski/bootstrap into pokonski-2.0-wip 
Conflicts:
	bootstrap.css
 2012-01-07 13:52:36 -08:00
Mark Otto
b81b0e2b15 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-07 13:42:35 -08:00
Mark Otto
28420311d8 more table docs cleanup 2012-01-07 13:40:05 -08:00
Mark Otto
a339f0051b fixing tablesorter styles by adding the jquery plugin back to the lib, fixing the docs examples 2012-01-07 12:22:51 -08:00
Jacob Thornton
402c480097 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-07 10:56:28 -08:00
Jacob Thornton
fbb42ccbbb update link to collapse plugin 2012-01-07 10:56:00 -08:00
Greg Roodt
62e504715a Small spelling correction. 2012-01-07 17:30:47 +00:00
Mark Otto
95c88a2953 scratch that, tweaking dropdowns in tabs 2012-01-07 04:41:51 -08:00
Piotrek Okoński
3eb80591b2 Progress bars 2012-01-07 13:39:46 +01:00
Mark Otto
e594107f37 change up the z-indexing and add some popover/twipsy content to the test modal on the js docs to help avoid future bugs 2012-01-07 04:17:33 -08:00
Mark Otto
8ccc3bcf03 overhauled dropdowns now require use of .caret for dropdown arrow, redid the button group docs section, added the split button dropdown docs section 2012-01-07 03:45:24 -08:00
Mark Otto
5fb2c666ac update the fluid examples to use new classes and clear the floats properly from sidebar 2012-01-07 01:59:53 -08:00
Mark Otto
45d671d97f tweak spacing once more on prettify; add support for uneditable inputs to input-append and prepend 2012-01-07 01:22:52 -08:00
Mark Otto
d6a1402f2a update form shadows and tweak prettyprint styles 2012-01-07 01:03:26 -08:00
Mark Otto
bcf1136f2c fix form field sizing for selects, document form field grid sizing 2012-01-07 00:47:53 -08:00
Mark Otto
36e7660383 fix forms in navbars, fix examples' navbars 2012-01-07 00:26:58 -08:00
Mark Otto
cfc2353059 front page docs updated to include old getting started section, update code styles to look like github gists, and lots more docs updates 2012-01-06 23:59:22 -08:00
Mark Otto
5cb76037ae fixing conflict in dividers in navbar, fix navbar docs, fix search form in navbar 2012-01-05 23:24:19 -08:00
Mark Otto
7582520808 docs cleanup and navbar brand hover 2012-01-05 22:37:23 -08:00
Mark Otto
9bedfa447c Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-05 21:43:54 -08:00
Mark Otto
c56e9d2d35 massive docs update, mostly to all our new forms, and to the buttons 2012-01-05 21:43:28 -08:00
Jacob Thornton
314feb702f listen to window for dropdown clear 2012-01-05 18:32:08 -08:00
Mark Otto
90e3a706ba add jank js back to docs application.js for responsive dropdown in topbar 2012-01-05 16:03:05 -08:00
Mark Otto
621dd13d87 move mega link footer to scaffolding to try it out, fix broken button text shadow, change UL/OL margins back, make li color same as body 2012-01-05 15:43:07 -08:00
Mark Otto
23e5fc2133 Tweak the docs and address the new forms list of controls: radios and checkboxes are now hanging controls to wrap text properly 2012-01-05 14:11:41 -08:00
Mark Otto
20add59de3 breaking out patterns.less even more, removing unnecessary div from checkbox and radio lists--now just labels and inputs 2012-01-05 10:01:42 -08:00
Mark Otto
bdc22e71c8 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	bootstrap.css
 2012-01-05 01:37:06 -08:00
Mark Otto
a13ab64870 add a quick little example of icons in buttons 2012-01-05 01:36:05 -08:00
Mark Otto
fb9401b355 tweaks abound, updated prettify styles, new sidenav component started, sprite icons started 2012-01-05 01:34:14 -08:00
Jacob Thornton
3237047ac3 Merge branch 'master' of https://github.com/twitter/bootstrap 2012-01-04 10:03:11 -08:00
Jacob Thornton
eb123f6b83 switch to async widget.js script 2012-01-04 10:02:51 -08:00
Jacob Thornton
e89618a47f clean up options implementation for carousel 2012-01-02 22:55:51 -08:00
Jacob Thornton
3fb6f6ee86 basic carousel implementation 2012-01-02 22:30:57 -08:00
Jacob Thornton
8b58a1c3d9 placeholder design for carousel 2012-01-02 19:13:02 -08:00
Jacob Thornton
f8c0efbcb4 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 
Conflicts:
	bootstrap.css
 2012-01-02 16:04:35 -08:00
Jacob Thornton
2d092dfeea start playing with carousel stuff 2012-01-02 16:04:01 -08:00
Mark Otto
53c6dbff0d add appended input example to docs, fix help-text wrapping issue by clearing float 2011-12-27 17:04:55 -06:00
Mark Otto
e78d5f8ff3 fix tables for rowspan 2011-12-27 16:25:22 -06:00
Mark Otto
fec02f5045 clean up some css for github issues: input prepend z-index, modals revamped for responsive 2011-12-27 15:40:58 -06:00
Mark Otto
b9adae14fc remove button from topbar for testing 2011-12-27 12:40:30 -06:00
Mark Otto
324246e4f9 remove negative margin from .brand in docs, update navbar to support buttons up thurr 2011-12-27 12:39:39 -06:00
Mark Otto
058f47b33b clean up some comments and fix a bug with buttons in navbar by removing too generic of a link color 2011-12-26 17:25:25 -06:00
Jacob Thornton
a3822cfa84 Merge pull request #842 from jonathaningram/patch-2 
Add close and closed hooks for alert
 2011-12-24 22:16:48 -08:00
Jacob Thornton
04fee21121 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2011-12-24 22:15:29 -08:00
Jacob Thornton
1a295491b2 update docs for placement 2011-12-24 22:15:04 -08:00
Purwandi
3aba68f832 Fix id tabs on docs component 2011-12-23 21:39:29 +07:00
Jacob Thornton
49fb910b11 more js cleanup after gnarly merge 2011-12-22 19:25:29 -08:00
Jacob Thornton
3396fc0542 check for prettyprint on window 2011-12-22 19:17:41 -08:00
Jacob Thornton
35fdbad24b Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 
Conflicts:
	bootstrap.css
	docs/assets/js/application.js
	docs/base-css.html
	docs/components.html
	docs/index.html
	docs/javascript.html
	docs/less.html
	docs/scaffolding.html
	docs/upgrading.html
 2011-12-22 19:15:09 -08:00
Jacob Thornton
87ac818253 change above below to top bottom and add "inside" placement option 2011-12-22 19:10:32 -08:00
Jonathan Ingram
2ebc0ad2ef Update docs to show available events on alert 2011-12-22 16:47:42 +11:00
Jacob Thornton
efacac0d6c clean up all the js across all the doc pages 2011-12-21 18:42:43 -08:00
Mark Otto
9fb380151d Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	bootstrap.css
	docs/javascript.html
 2011-12-21 18:39:02 -06:00
Mark Otto
12a0d69454 fix dropdowns in components docs page 2011-12-21 18:38:03 -06:00
Mark Otto
af5793e1cd fix mobile example sites, remove unused JS from docs index 2011-12-21 16:41:46 -06:00
Mark Otto
c854ed167c rename media grid to thumbnails, recompile bootstrap, fix examples for mobile phones 2011-12-21 16:26:21 -06:00
Mark Otto
20aecb9838 updated all docs to jQuery 1.7, move all docs JS to application.js, and move dropdowns css to dedicated file 2011-12-21 16:22:20 -06:00
Jacob Thornton
a5a98a8a98 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 
Conflicts:
	bootstrap.css
 2011-12-21 14:03:18 -08:00
Mark Otto
8a7abc7493 docs updates, forms updated to include error states and more examples, remove text-shadow from gradientbar mixin to fix bug 2011-12-21 16:00:50 -06:00
Jacob Thornton
80cb760fac animate -> animation 2011-12-21 13:29:12 -08:00
Jacob Thornton
f72a94ae28 update more readme changes - introduce target specificty convention to more plugins 2011-12-20 23:28:48 -08:00
Jacob Thornton
0980a33b47 update all to new on api + add animation support to tabs 2011-12-20 19:37:41 -08:00
Jacob Thornton
1ef5fa7d6b giant refactor - all spec passing again... 2011-12-20 18:02:47 -08:00
Mark Otto
069ef6a020 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2011-12-19 22:59:20 -08:00
Mark Otto
72a536393c mostly docs updates, but also some bug fixes per github issues 2011-12-19 22:58:56 -08:00
Jacob Thornton
7df0d1c7d1 rename transitions to transition and fix scrollspy example 2011-12-14 18:45:33 -08:00
Alexander Pirsig
e28b080c79 changed npm package name to less 2011-12-14 16:48:50 +01:00
Mark Otto
aa69286c30 rename transitions js file, fix link in js docs 2011-12-13 10:05:19 -08:00
Mark Otto
d681ae9f51 updated docs to include other less apps 2011-12-12 09:51:41 -08:00
Mark Otto
4e8c26d409 updated buttons docs 2011-12-11 02:38:58 -08:00
Mark Otto
54a84f0f7f clearer grid vars docs language 2011-12-11 02:05:50 -08:00
Mark Otto
ecbc9ec4a2 updated footers everywhere 2011-12-11 02:03:16 -08:00
Mark Otto
401f84a7ec center example sites in docs on mobile 2011-12-11 01:58:06 -08:00
Mark Otto
6de3ed5322 Merge branch 'add-vertical-nav-divider' of https://github.com/evnm/bootstrap into evnm-add-vertical-nav-divider 
Conflicts:
	bootstrap.css
 2011-12-11 00:58:10 -08:00
Mark Otto
200fe25d0a Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2011-12-10 22:30:17 -08:00
Mark Otto
d587845149 tweaks and increase specificity of pills and active classes 2011-12-10 22:21:08 -08:00
Mark Otto
e240aac6cb Merge pull request #777 from ceejayoz/2.0-wip 
Updated bordered-table example to use correct class in docs
 2011-12-10 15:05:09 -08:00
Mark Otto
5c8df1d285 updated index page to add featured sites, more docs tweaks 2011-12-09 14:34:38 -08:00
Mark Otto
97b285896f help tables not look like shit on mobile maybe? also fix bordered table example 2011-12-09 12:51:54 -08:00
Mark Otto
7b810bf9a6 update js in footer, add max-width to img 2011-12-09 12:10:01 -08:00
Mark Otto
1d1805ee5c add jank js for prototyping new topbar to all docs pages 2011-12-09 11:41:00 -08:00
Mark Otto
312ee6cdfb Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	bootstrap.css
 2011-12-09 11:33:02 -08:00
Mark Otto
b12b71bf7c updated to include sub nav and pip nav, new docs updates, topbar nav refinements for media queried settings 2011-12-09 11:32:07 -08:00
Troy Murray
5f54e4aad1 Add code block for condensed table example 2011-12-09 11:34:58 -05:00
Chris Sternal-Johnson
e603009fca fix docs for bordered-table 2011-12-08 14:42:42 -05:00
Evan Meagher
6e70d490e1 Add vertical nav divider example in components doc page. 2011-12-02 11:37:39 -08:00
Jacob Thornton
cee2f61898 define constructor on prototypes 2011-11-30 22:42:22 -08:00
Mark Otto
bc51c15709 adding temp idea for subnav to docs 2011-11-30 01:00:55 -08:00
Mark Otto
f2c40ee24d adding step nav to components 2011-11-30 00:39:38 -08:00
Mark Otto
447c9322e9 update all leads on docs pages 2011-11-29 23:56:01 -08:00
Mark Otto
90c190d4ef updates to add warning for bordered tables to docs, fix to spacing on prettyprint pre blocks 2011-11-29 23:48:27 -08:00
Mark Otto
0c8d2e37e7 adding bordered table to docs and showing it works with colspan 2011-11-29 23:16:38 -08:00
Mark Otto
cbb291b8ab Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	bootstrap.css
	bootstrap.min.css
 2011-11-29 22:35:58 -08:00
Mark Otto
b36df46310 misc docs updates, revamped tables CSS save for grid columns and tablesorter options 2011-11-29 22:35:03 -08:00
Jacob Thornton
7eb340ec58 add code to reset data for collapsed element so that item can be intitialized with correct options 2011-11-27 17:31:12 -08:00
Jacob Thornton
46fe38386a rename tabs to tab - clean up lots of api stuff make href acceptable target val 2011-11-27 17:04:55 -08:00
Mark Otto
ecc9764c83 Remove static github buttons and replace with iframe versions 2011-11-27 00:44:30 -08:00
Jacob Thornton
3157de8d1d clean up comments for better built files 2011-11-25 21:34:55 -08:00
Jacob Thornton
bd8745a98b allow scrollspy to target a specific nav 2011-11-25 17:30:52 -08:00
Jacob Thornton
98fddaa355 new plugin "collapse" for collapsible lists and "accordion" like support 2011-11-25 17:23:14 -08:00
Jacob Thornton
53ff2682cd clean up scrollspy a bit - add public api method 2011-11-24 20:27:18 -08:00
Jacob Thornton
1fa02fbda2 refactor modal 2011-11-24 20:04:07 -08:00
Jacob Thornton
71654cbf69 refactor alerts + add new readme which idefientifies goals for 2.0 js 2011-11-24 18:55:44 -08:00
Jacob Thornton
b2650859d6 update buttons js for button groups 2011-11-24 14:43:26 -08:00
Martin Bean
fe68f708ce Removed funky characters. 2011-11-24 19:06:00 +00:00
Martin Bean
2b5b87db7d Fixed a typo. Because I'm a Grammar Nazi. 2011-11-24 11:37:08 +00:00
Jacob Thornton
bc65b58551 merge in js from 1.4... start working through js docs 2011-11-20 20:58:04 -08:00
Mark Otto
18d2a879ae Merge pull request #621 from vshih/master 
Fix tab event selector in tabs JS docs example
 2011-11-17 00:40:42 -08:00
Mark Otto
5abb4b3200 update tables docs after merging in the condensed styles 2011-11-17 00:09:12 -08:00
Mark Otto
b1ce89c24a Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2011-11-17 00:07:34 -08:00
Mark Otto
a8e88d14a4 make form classes match table classes (readable left to right), update docs associated with it 2011-11-17 00:06:16 -08:00
Mark Otto
a017932285 start breaking down patterns.less into more distinct files, update docs for forms to use correct classes 2011-11-16 23:58:36 -08:00
Jon Stevens
275da020c2 added condensed example 2011-11-16 11:10:27 -08:00
Maxim Kaschenko
4be902741b Fix dropdown anchor 2011-11-17 01:25:36 +07:00
Leo Cassarani
e3cfd2f5b3 Fix grammatically incorrect sentence (copy-paste oversight?) 2011-11-13 21:45:43 +00:00
Vic
638211b896 Fixes tab event selector in tabs example 2011-11-12 13:18:08 -08:00
Mark Otto
cabf993bc6 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2011-11-12 01:23:37 -08:00
Mark Otto
a4d6e7e9a3 Merge pull request #579 from raulriera/2.0-wip 
Add meta tag to all new docs pages for mobile responsiveness
 2011-11-12 01:03:16 -08:00
Mark Otto
1fb98bed91 updated docs pages (still wip), adding misc css classes, added form styles from 1.4, added github buttons to homepage 2011-11-12 00:46:02 -08:00
Raul Riera
0e6cd670ca Removed trailing backslash :) 2011-11-08 20:32:28 +01:00
Jacob Thornton
0c7a80c79b remove selector options for popover, in favor of more generic content selector 2011-11-08 11:04:26 -08:00
Raul Riera
74dc83f211 Added the view port meta tag for proper responsiveness 2011-11-07 10:22:28 +01:00
Silumesii Maboshe
ae5badc9fb Removed the 'View javascript docs' link because it is the page we are currently on. Copy tweak for intro paragraphy of the javascript docs. 2011-11-07 09:09:17 +02:00
Silumesii Maboshe
4af6dac20e Use 'fluid-container' instead of 'container-fluid' in the docs. 2011-11-07 09:06:13 +02:00