0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Commit Graph

1798 Commits

Author SHA1 Message Date
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
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
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
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
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
Mark Otto
c8d2c4e442 fix height of download button 2012-01-26 16:45:01 -08:00
Mark Otto
f398926e46 move down background iamge 2012-01-26 15:22:52 -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
ef4d0dd7db space out masthead a git more 2012-01-26 10:12:25 -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
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
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
a4b8cc2a9c darken active state on subnav with scrollspy added 2012-01-25 11:30:30 -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
ae70d2a8b6 refine spacing on fixed subnav 2012-01-24 23:44:59 -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
731821b78f updated docs css to fix subnav on iOS 2012-01-24 20:26:54 -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
d362223535 refine fixed docs bar 2012-01-24 18:29:17 -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
8ff621aa26 fix broken index page heading, update variables and less pages 2012-01-24 16:07:30 -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
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
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
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
fc053ac8b2 update dropdowns spacing and docs section spacing 2012-01-13 10:07:56 -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
cb9be7bd0c clean up dup css in responsive, fix navbar dropdown caret 2012-01-08 13:21:44 -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
bcf1136f2c fix form field sizing for selects, document form field grid sizing 2012-01-07 00:47:53 -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
c56e9d2d35 massive docs update, mostly to all our new forms, and to the buttons 2012-01-05 21:43:28 -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
fb9401b355 tweaks abound, updated prettify styles, new sidenav component started, sprite icons started 2012-01-05 01:34:14 -08: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
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
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
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
401f84a7ec center example sites in docs on mobile 2011-12-11 01:58:06 -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
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
Mark Otto
f2c40ee24d adding step nav to components 2011-11-30 00:39: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
98fddaa355 new plugin "collapse" for collapsible lists and "accordion" like support 2011-11-25 17:23:14 -08: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
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
Mark Otto
2534fee753 adding unofficial github buttons 2011-11-01 13:56:00 -07:00
Mark Otto
3f512adf95 updated docs and type styles for blockquotes and a few fixes for type 2011-10-30 20:14:27 -07:00
Mark Otto
0218d079ad fix some of the docs styles at 480 to 768 2011-10-29 18:11:17 -07:00
Mark Otto
9fd4e459fe adding more icons for the homepage for open source, twitter, and html5/css3 2011-10-27 23:34:48 -07:00
Mark Otto
f3128d0fa1 overhauled the front page to feel a bit more marketing-like, added the awesome glyphicons to bring some life to the docs 2011-10-27 23:00:09 -07:00
Mark Otto
20b9390a9e update docs for responsive 2011-10-27 09:35:58 -07:00
Mark Otto
b4c894961c address issue #414 and fix up a number of docs loose ends 2011-10-26 23:24:22 -07:00
Mark Otto
648c468927 breaking down the main page into subpages for easier, more comprehensive documentation 2011-10-26 23:11:56 -07:00
Mark Otto
e616026d67 update to docs to cleanup pagination for smartphones, fix some pagination inconsistencies 2011-10-26 21:04:14 -07:00
Mark Otto
b4c0d2a6b2 tweaks to the responsive layout to improve type 2011-10-22 22:49:37 -07:00
Mark Otto
d4675bf4ef updating the docs to include more responsive fixes, adding rows to the responsive changes as well to undo negative margin 2011-10-22 15:49:42 -07:00
Mark Otto
a5d2450e88 refinement to the responsive section 2011-10-18 08:11:18 -07:00
Mark Otto
369b9720c6 adding responsive stuff to docs to stub that out, updated type to make ul and ol margins match p tags 2011-10-17 23:45:35 -07:00
Mark Otto
27cbe7f63a add abbr styles, overhaul type docs section to remove lots of verbose text and put emphasis on tables and more scannable content 2011-10-17 14:17:29 -07:00
Mark Otto
6d2e39950d updated js docs page to new 12 column layout, fix subhead jumbotron styles to match new front page 2011-10-17 00:03:52 -07:00
Mark Otto
e7d2218b20 few tweaks to responsive stuff, updated docs for grid system (still needs copy editing) 2011-10-16 23:04:31 -07:00
Mark Otto
c62a0239bd update to responsive to fix new masthead 2011-10-16 19:12:33 -07:00
Mark Otto
1888511d67 updated docs to include quick links and twitter buttons, added updated blueprint pattern to background 2011-10-16 18:45:11 -07:00
Mark Otto
2a82b38cff tweak the h2s again for better spacing, adjust docs, remove white bg if possible on file input, few other tweaks 2011-10-16 18:01:05 -07:00
Mark Otto
6f44a90edb tweak line-height of h2 and h3 to not be gihugeous, updated responsive to improve tablet grid and phone styles 2011-10-16 11:35:24 -07:00
Mark Otto
9e9109469e biiiiiig update coming for responsiveness 2011-10-16 03:00:58 -07:00
Mark Otto
f919f6f94f huge update to forms, docs for the new forms, added a new link for js example to tabs/pills, add some new mixins 2011-09-29 01:40:27 -07:00
Mark Otto
e8d9eb264c update alert message for ie7 to adjust dismiss icon, update example pages to clean up a few things from testing 2011-09-16 10:51:44 -07:00
Mark Otto
8ff18a9ffc fixing conflict and recompiling 2011-09-16 09:47:36 -07:00
Mark Otto
b188c0da8b updated table styles a bit and floated the fluid columns to clear the row dropping problem we were having 2011-09-16 09:41:58 -07:00
Jacob Thornton
68f89d109f little fixes for ie 7 2011-09-15 22:27:41 -07:00
Mark Otto
121b62d54e updates to docs to include more example html, include links to javascript docs where necessary 2011-09-13 10:08:24 -07:00
Mark Otto
1d50fa77e4 adding quick and dirty favicons and touch icons for iOS 2011-09-13 09:35:43 -07:00
Mark Otto
bc2ae90e3a Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-12 22:19:44 -07:00
Mark Otto
5249483850 comment out box-shadow on masthead and footer in docs.css because Opera sucks at inset box-shadow :" 2011-09-12 22:19:28 -07:00
Jacob Thornton
5ee11ec8bd fix docs for opera 2011-09-12 21:06:29 -07:00
Mark Otto
6bc867ed5c change template diagrams to be .media-grid 2011-09-11 19:53:48 -07:00
Jacob Thornton
d9cbcfc20d wait for window load event before positioning images, doi 2011-09-10 22:54:47 -07:00
Jacob Thornton
a5964b07b1 add static sizes for images so tooltips get right size on load 2011-09-10 22:48:39 -07:00
Mark Otto
6a74a313a8 tweak css for topbar to bring back z-index fix; update javascript markup and some heading text 2011-09-10 21:10:18 -07:00
Mark Otto
00b7dff359 overhaul docs CSS since it was scalable, converted docs mastheads and footers to classes and HTML5 elements, add masthead to js docs page but make it slate so it looks cool and stands out 2011-09-10 21:05:23 -07:00
Jacob Thornton
a8d4475827 adds twipsy js to regular index for positioning 2011-09-10 14:52:45 -07:00
Mark Otto
dad058326e add version # to docs 2011-09-09 16:00:59 -07:00
Mark Otto
53135839f5 adding nested columns to the grid section 2011-09-09 10:04:07 -07:00
Jacob Thornton
5960711d0f some more js love - update the docs with tabs/pills plugin 2011-09-08 20:21:03 -07:00
Mark Otto
1c03a07591 bump css to 1.3.0, update makefile to reflect that, update form css to prepend form to the .clearfix to prevent some bullshit, small tweaks elsewhere 2011-09-08 10:36:56 -07:00
Jacob Thornton
fb8987148a move javascript from examples into docs 2011-09-06 23:20:56 -07:00
Mark Otto
d0882c580d first pass at enabling active states in dropdowns in topbar and fixing the bug of having an active class on parent dropdown 2011-09-06 21:54:00 -07:00
Mark Otto
dfbb591953 addng docs for the themes stuff and examples 2011-09-04 14:02:56 -07:00
Jacob Thornton
0e13f8dca1 Merge branch 'master' of github.com:twitter/bootstrap into js-examples
Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
	lib/patterns.less
	lib/scaffolding.less
2011-09-02 21:04:25 -07:00
Mark Otto
cb244d5d51 fix docs.css spacing, add gradient support for ie9 back 2011-09-02 12:31:14 -07:00
Mark Otto
e0722fcb1b cleanup docs and fix gradient in masthead 2011-09-02 12:24:28 -07:00
Jacob Thornton
2a5d829c4a add doc styles back to topbar-inner 2011-09-02 00:47:06 -07:00
Jacob Thornton
ed96f181c8 add topbar dropdown js 2011-08-27 21:46:50 -07:00
Mark Otto
ce615d016a merged in my pending changes from 1.2-wip branch, resolve diffs as best as i could, update docs and alerts to use original classes, updated docs to include smaller section for layouts 2011-08-25 22:41:45 -07:00
Mark Otto
50f484eed6 big update to change the alerts, normal and block level, to have simpler css and new colors independent of the base color scheme 2011-08-25 02:00:07 -07:00
Jacob Thornton
e11c49cc48 Merge branch 'master' of github.com:twitter/bootstrap
Conflicts:
	bootstrap-1.0.0.css
	bootstrap-1.0.0.min.css
	docs/index.html
2011-08-21 21:42:56 -07:00
Jacob Thornton
dd92f4e6e2 hide overflow for ie 7 2011-08-21 21:26:15 -07:00
Mark Otto
a98d2cccb8 merge in master, resolve conflicts 2011-08-21 20:47:24 -07:00
Jacob Thornton
48c3c6f1b6 make topbar .fill wrap 2011-08-21 18:14:53 -07:00
Mark Otto
254e70550e remove 60px top margin on body and tweak a few other things 2011-08-21 17:06:37 -07:00
Jacob Thornton
b18e76f990 introduce .fill class to top-nav for overflow bug 2011-08-21 12:19:01 -07:00
Mark Otto
aaf9f752c4 docs spacing, spare divs in a few places, updating css spacing 2011-08-20 23:25:22 -07:00
Mark Otto
72899a4ee8 updated docs to fix inconsistent display of code elements, update scaffolding to fix padding issue on fluid containers, add placeholder hero unit in patterns for future use, continue to refactor some rgba to hex values 2011-08-20 18:58:12 -07:00
Mark Otto
4a567fcb10 updated docs and docs css to not use rgba colors on the layout modules so IE can see that shiz 2011-08-20 01:11:48 -07:00
Jacob Thornton
7f99892b86 change popover stufff 2011-07-28 17:50:38 -07:00
Mark Otto
3117fc979d getting popovers in 2011-07-01 23:10:39 -07:00
Mark Otto
460a84a926 Updated offset columns, fix app.js bug, misc tweaks to copy 2011-06-30 15:56:25 -07:00
Mark Otto
cde63b98bc remove unnecessary js lang files from prettify, update styles for prettify 2011-06-30 13:36:47 -07:00
Mark Otto
588b2da937 updated docs, fixed language, added copy-code js for selecting text on focus 2011-06-30 10:40:28 -07:00
Mark Otto
6aae3930c9 updated docs styles, notes in header of master file, etc 2011-06-30 10:21:27 -07:00
Mark Otto
ced32d5ceb adding note in the masthead about less.js and browser support 2011-06-30 00:31:56 -07:00
Mark Otto
9e33ab20ab clean up commented out css, slightly updated docs again 2011-06-30 00:15:37 -07:00
Mark Otto
1905a992d9 updated docs call to actions for using bootstrap, tweaks to aesthetic 2011-06-29 23:47:54 -07:00
Mark Otto
f47b576574 yo dawg i heard you liked mastheads 2011-06-29 17:10:53 -07:00
Mark Otto
936d7acb31 trying out new doc style stuff 2011-06-29 15:51:27 -07:00
Mark Otto
25d9a2f2b8 update grid bg to 18px baseline, updated docs for disabled buttons 2011-06-28 15:54:25 -07:00
Mark Otto
b11784fec0 adding attribution in footer, link up names, clean up button styles 2011-06-28 15:31:05 -07:00
Mark Otto
4e95e558db reseting baseline to 18px, fixing wells, moving pre styles for chili to docs 2011-06-28 15:11:41 -07:00
Mark Otto
9660f6f18d new buttons, new modal updates around spacing and placeholder content 2011-06-28 11:56:49 -07:00
Mark Otto
243fc873d9 mucho updato around buttons to fix some stuff that was introduced with the bootstrap update 2011-06-27 17:15:26 -07:00
Mark Otto
dd769f9a6e update to use latest version of bootstrap, docs cleanup, etc 2011-06-27 16:47:12 -07:00
Jacob Thornton
037bf9fec5 clean up org more 2011-05-04 23:49:31 -07:00