0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Commit Graph

499 Commits

Author SHA1 Message Date
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
c56e9d2d35 massive docs update, mostly to all our new forms, and to the buttons 2012-01-05 21:43:28 -08:00
Mark Otto
aa5342888b default cursor for disabled links in pagination 2012-01-05 15:48:40 -08:00
Mark Otto
03d7c1a65e make dropdowns use unicode character for :after 2012-01-05 15:46:48 -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
fb9401b355 tweaks abound, updated prettify styles, new sidenav component started, sprite icons started 2012-01-05 01:34:14 -08:00
Jacob Thornton
f5bcfaec2c ease-in-out slide transition 2012-01-02 22:33:49 -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
0c3bf7275c add quotes to courier new 2012-01-02 16:05:14 -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
553030ca7d missing parantheses 2011-12-30 16:01:29 -08:00
Mark Otto
704d713aad border radius on large button toolbar 2011-12-27 17:39:34 -06: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
550879cf66 fix quotes in font-family usage 2011-12-27 16:50:27 -06:00
Mark Otto
46d2ad5e22 allow select with size attr to not have fixed height 2011-12-27 16:08:07 -06:00
Mark Otto
3426877c89 add ie7 inline block mixin and add ability to center pagination 2011-12-27 15:51:36 -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
5801c4d766 capitalize Less in makefile, add print less file (not yet compiled) 2011-12-27 13:51:50 -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
Mark Otto
544120264d Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2011-12-26 16:47:10 -06: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
Mark Otto
690d3f4d1a remove inline input field CSS since that's not required as all inputs are inline-block anyway 2011-12-21 19:32:14 -06:00
Mark Otto
369cedd87c update comment on select bg bug and confirmed it was fixed, scoped responsive .span* to .row 2011-12-21 19:31:01 -06: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
00cbadf994 update thumbnails to keep images from going past edges of thumbnails 2011-12-21 18:21:55 -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
c4364285e4 add default margin for popover and twipsy 2011-12-20 22:12:23 -08:00
Mark Otto
72a536393c mostly docs updates, but also some bug fixes per github issues 2011-12-19 22:58:56 -08:00
Mark Otto
95048c271e fix specificity on pills 2011-12-11 01:03:57 -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
d2e56ad53d unstyle image inputs 2011-12-10 22:29:49 -08:00
Mark Otto
d587845149 tweaks and increase specificity of pills and active classes 2011-12-10 22:21:08 -08:00
Mark Otto
4d55356e9b remove uber large responsive stuff 2011-12-09 14:39:23 -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
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
Evan Meagher
3726df695e Merge remote-tracking branch 'upstream/2.0-wip' into add-vertical-nav-divider 2011-12-02 10:47:46 -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
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
Evan Meagher
61e84d8762 Add vertical nav divider. 2011-11-29 23:16:09 -08:00
Mark Otto
8f3150cf71 Merge branch 'form-feedback-fix' of https://github.com/tinyfly/bootstrap into tinyfly-form-feedback-fix
Conflicts:
	bootstrap.css
2011-11-29 22:53:12 -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
Jeff Adams
1da19bf65f scope form feedback states to .control-group instead of unused .clearfix 2011-11-29 14:06:31 -06:00
Jeff Adams
d48027d495 add input width calculation fix from #408 to the 2.0 branch 2011-11-29 11:12:32 -06:00
Jacob Thornton
3157de8d1d clean up comments for better built files 2011-11-25 21:34:55 -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
b2650859d6 update buttons js for button groups 2011-11-24 14:43:26 -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
4e6275d0fe update property order and do some misc cleanup 2011-11-17 01:28:42 -08:00
Mark Otto
159c7a7fda remove code styling if it's in a pre tag 2011-11-17 00:52:11 -08:00
Mark Otto
ba9fcd8b57 make uneditable inputs work with span* classes 2011-11-17 00:49:51 -08:00
Mark Otto
6418a40675 spelling mistake in comment 2011-11-17 00:41:26 -08:00
Mark Otto
160970560b updated font mixins courtesy of @apancutt 2011-11-17 00:37:14 -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
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
31ea003046 remove alt tab styles for now, too complicated to accomplish both static and tabble; fix up CSS a bit 2011-10-31 21:45:46 -07:00
Mark Otto
ac9073e1e4 Merge branch '2.0-left-and-right-tabs' of https://github.com/avalanche123/bootstrap into avalanche123-2.0-left-and-right-tabs 2011-10-31 21:25:21 -07:00
Mark Otto
02bf27592c overhaul the table styles and update those everywhere in the docs, update the button docs, spec out the forms docs 2011-10-31 19:37:10 -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
2764cfda6d remove html from body background 2011-10-28 18:38:06 -07:00
Bulat Shakirzyanov
cb13f010e2 implement left and right tabs styles 2011-10-27 18:51:49 -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
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
f48baceeda remove bottom margin from h1 2011-10-17 12:45:09 -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
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
756e7c8739 more tweaks to responsive 2011-10-16 12:11:48 -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
d1d3807958 add responsive.less file 2011-10-16 03:15:36 -07:00
Mark Otto
3a4760637f tweak navbar styles for static version to not cause problems on responsive layouts 2011-10-16 03:15:17 -07:00
Mark Otto
be926a04bc fix uber size in responsive; remove @extraspace variable by changing grid to use :first-child over negative margin 2011-10-16 03:08:14 -07:00
Mark Otto
9e9109469e biiiiiig update coming for responsiveness 2011-10-16 03:00:58 -07:00
Mark Otto
fbe22f0580 updated index of docs to use html5 self closing tags, add responsive shell to bootstrap file 2011-10-15 17:21:39 -07:00
Mark Otto
f4fc56b1b3 first pass at moving over the new tabs stuff to 2.0 2011-10-12 08:31:16 -07:00
Mark Otto
fa8b1dc12d remove color scheme variables, remove font-face mixin 2011-10-11 19:31:25 -07:00
Mark Otto
b644390541 update navbar search form 2011-10-11 09:52:50 -07:00
Mark Otto
8ba005d38d new navbar introduced to replace topbar 2011-10-11 09:44:51 -07:00
Mark Otto
dd1efdf0d5 update input prepend and append to use baseline variable 2011-10-09 21:25:28 -07:00
Mark Otto
f61fe3c474 refactor fluid layout to be more specific to not interfere with modal content while adding right sidebar option 2011-10-09 21:13:26 -07:00
Mark Otto
913338f930 fixing multi select on chromium ubuntu by setting background color explicitly 2011-10-04 01:15:31 -07:00
Mark Otto
bdbc352066 adding new mixins 2011-10-04 00:55:35 -07:00
Mark Otto
cde17c9491 adding placeholder font-face mixin which doesn't work yet 2011-10-04 00:48:31 -07:00
Mark Otto
96dd7a2903 update variables to inlude @baseFontSize, @baseFontFamily, @baseLineHeight for easier customization; added placeholder for @primaryButtonColor, but didn't implement 2011-10-04 00:20:38 -07:00
Mark Otto
0a6d8c30db adding button groups and toolbars like a boss 2011-09-29 02:21:02 -07:00
Mark Otto
f54568fa31 round the corners on the search form inputs like a boss 2011-09-29 01:47:55 -07:00
Mark Otto
00204a80cf change h4 back to lineheight * 2 2011-09-29 01:44:51 -07:00
Mark Otto
4e9849966d update topbar dropdown arrow to match link and hover colors 2011-09-29 01:43:14 -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
1b21d5e321 updated forms.less to have better comments while pulling out all the old classes for input elements 2011-09-28 19:15:31 -07:00
Mark Otto
6d541a6066 pulling out more stuff and fixing file name at top of file 2011-09-28 19:06:10 -07:00
Mark Otto
ec8619a980 update docs to remove old stuff, update to all new classes; no more backwards compatibility 2011-09-17 17:21:43 -07:00
Mark Otto
732ff9ed1c fix fluid example 2011-09-16 14:07:18 -07:00
Jacob Thornton
c7c5ce8dcd Merge branch 'master' of github.com:twitter/bootstrap into 1.3-wip
Conflicts:
	Makefile
	README.md
	bootstrap.css
	bootstrap.min.css
	lib/bootstrap.less
	lib/scaffolding.less
2011-09-16 11:24:07 -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
e663cfb43f fix tabs jitter bug when there is no active class 2011-09-16 10:14:35 -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
5675d8f00a remove table border seperate for ie 2011-09-15 22:40:50 -07:00
Jacob Thornton
39aca918d0 move clearfix logic back onto clearfix class for ie7 2011-09-15 22:36:32 -07:00
Jacob Thornton
68f89d109f little fixes for ie 7 2011-09-15 22:27:41 -07:00
Mark Otto
dcf6a051e7 allow multi-select lists in forms 2011-09-14 08:58:20 -07:00
Mark Otto
32a690af98 apply clearfix to appended input pattern to clear the floats 2011-09-13 22:23:08 -07:00
Mark Otto
2af3eb6ce2 fix tab-content and pre funkiness, convert p in tab content to div 2011-09-13 14:47:18 -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
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
Mark Otto
206334ba70 remove theme.less and split preboot.less to mixins.less and variables.less to isolate customization from function 2011-09-12 20:07:26 -07:00
Mark Otto
2978934bd5 remove adaptive, recomment theme.less to avoid comments in compiled 2011-09-12 19:40:48 -07:00
Mark Otto
3f64aaf82b fix topbar link with button bug 2011-09-12 19:00:44 -07:00
Mark Otto
7af4a4cfa1 really make modals cover topbars and not cover the modal itself 2011-09-12 13:32:46 -07:00
Mark Otto
bc41c58472 make modals cover topbars 2011-09-12 13:31:58 -07:00
Mark Otto
b729ade54f quick fix for .clearfix with unqualified selector in forms.less 2011-09-12 09:25:57 -07:00
Mark Otto
88f2f848b3 change modal buttons back to be primary first 2011-09-11 22:02:26 -07:00
Mark Otto
c73533ac73 fix problem with error styles in forms that clashed with alert-messages by qualifying the .error with .clearfix 2011-09-11 21:43:23 -07:00
Mark Otto
b77e3e2f30 theme.less file cleanup; fixing blockquotes in wells 2011-09-11 21:12:55 -07:00
Mark Otto
c876835a02 update preboot comments about color scheme 2011-09-11 20:47:35 -07:00
Mark Otto
96e59eed20 update theme.less todos and darken link hover color more 2011-09-11 20:46:40 -07:00
Mark Otto
af2223efb1 remove border from dropdowns in topbar to prevent it from looking 1px off 2011-09-11 20:38:45 -07:00
Mark Otto
bd3448cf78 make input prepend styles look a bit better 2011-09-11 20:17:34 -07:00
Mark Otto
2674210ff0 move the .brand from the parent to the a tag in the topbar; fix the moving text in IE7 2011-09-11 20:00:45 -07:00
Mark Otto
53812bc2d8 remove qualifying tags in .span selectors for built in grid so that we can use .span-n classes in form styles 2011-09-11 18:44:25 -07:00
Mark Otto
f3f60b21a6 oops, double commit last time; apply fixes to make select elements line up in IE7 with their labels, but no height fix 2011-09-11 18:09:01 -07:00
Mark Otto
18a5ef83ef fix legends in ie7 2011-09-11 18:01:29 -07:00
Mark Otto
3ad034ea96 fix legends in ie7 2011-09-11 17:36:15 -07:00
Mark Otto
0c656e29fc updated styles for the media grids 2011-09-10 22:50:59 -07:00
Mark Otto
d0f7637a7d adding more media sizes 2011-09-10 22:47:38 -07:00
Mark Otto
40693f2618 adding media grid styles 2011-09-10 22:31:43 -07:00
Mark Otto
3407ed948d resolved conflict 2011-09-10 21:06:09 -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
a71d5d8e99 add the dhg flavor back 2011-09-10 19:01:16 -07:00
Jacob Thornton
235246d6fc not feeling the slide in 2011-09-10 18:26:37 -07:00