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

447 Commits

Author SHA1 Message Date
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
Jacob Thornton
9c76070cbd rework the transitions for the modal a bit 2011-09-10 18:13:37 -07:00
Mark Otto
a95a0ed71c conflict 2011-09-10 15:29:53 -07:00
Mark Otto
99ede580cf adding code and .label sections to type section 2011-09-10 15:29:38 -07:00
Jacob Thornton
a8d4475827 adds twipsy js to regular index for positioning 2011-09-10 14:52:45 -07:00
Mark Otto
e5b4a1ced5 adding .brand to topbar for alternative to using an h3 for wordmark; spelling mistakes fixed 2011-09-10 13:18:10 -07:00
Mark Otto
c797cb61a6 conflict 2011-09-10 13:04:17 -07:00
Mark Otto
5b16150159 trying to solve firefox active outline, make .input less specific 2011-09-10 13:00:07 -07:00
Jacob Thornton
79d5f90713 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Conflicts:
	bootstrap-1.3.0.css
2011-09-09 22:48:57 -07:00
Jacob Thornton
5f4e30ed1d move js plugins to root dir, begin writing tests, and change modal plugin to be more boss like 2011-09-09 22:47:49 -07:00
Mark Otto
a0c3d48342 fix the stacked form legend style 2011-09-09 21:43:19 -07:00
Mark Otto
a40690a17c fix the grid before 1.3.0 drops soon 2011-09-09 20:48:45 -07:00
Mark Otto
dad058326e add version # to docs 2011-09-09 16:00:59 -07:00
Mark Otto
1d4e345ec1 bug fixing 2011-09-09 00:02:47 -07:00
Mark Otto
3a99b98ad9 make dropdown menus appear above other elements on the page with a z-index 2011-09-08 23:08:38 -07:00
Mark Otto
1a8fb2dbf7 resolve conflict 2011-09-08 23:02:13 -07:00
Mark Otto
ba08055a7b update the modals and alert-messages to use the same .close styles, save for some positioning in the modal after knocking down the modal padding 2011-09-08 23:01:28 -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
c474f996a9 tweaks to table styles to make them use @basefont and @baseline 2011-09-08 10:47:05 -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
Mark Otto
1af96b9a58 what up breadcrumbs, we added you 2011-09-08 09:43:37 -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
Mark Otto
7882f0f64b adding temp theme file to help with customization; still needs work 2011-09-03 22:53:21 -07:00
yury
fe8cb55cc1 use @VERSION var in build script 2011-09-03 20:10:42 +04:00
Mark Otto
df8eccbfe1 adding support for and example ul in block-messages 2011-09-02 23:28:01 -07:00
Mark Otto
168551cd4f adding link support to regular text in the topbar 2011-09-02 23:09:59 -07:00
Mark Otto
4dbd2334bd updated hero example, added fluid example, resolved issue with tabs and fluid nav 2011-09-02 23:01:38 -07:00
Mark Otto
6d118411e1 resolve conflict 2011-09-02 22:09:49 -07:00
Mark Otto
1625341391 fix repeated margin-left 2011-09-02 22:09:12 -07:00
Mark Otto
5c3f0e32e6 updated container mixin to be fixed-container instead so we can keep the .container in scaffolding while removing the repeated code 2011-09-02 22:08:38 -07:00
Mark Otto
d5e42cf81a tweak readonly, disabled, and uneditable form elements 2011-09-02 21:54:11 -07:00
Jacob Thornton
3c9c85b1ed Merge branch 'js-examples' into 1.3-wip
Conflicts:
	bootstrap-1.2.0.css
2011-09-02 21:06:49 -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
c4481b54a8 improve CSS properties for centering content, the container, and fluid container so as to not override properties where possible 2011-09-02 21:00:01 -07:00
Mark Otto
298e1b59bb fix broken checkbox in ie7 2011-09-02 12:46:47 -07:00
Mark Otto
2f4c84bba9 remove rounded corners on buttons from IE9 so gradients don't bleed out 2011-09-02 12:35:41 -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
8c1e60c638 add reset filter to preboot for turning off gradients in IE when necessary; make :disabled [disabled] for crossbrowser usage 2011-09-02 12:19:43 -07:00
Mark Otto
ac57331323 resolve 2011-09-02 12:02:36 -07:00
Mark Otto
b9a53b1468 button tweaks 2011-09-02 12:02:20 -07:00
Jacob Thornton
60409660d7 \9 for 8 or less ie 2011-09-02 12:01:41 -07:00
Mark Otto
6638f87f50 resolve conflicts 2011-09-02 11:54:17 -07:00
Mark Otto
62f8916407 update the file input to undo the damage of the generic input selector 2011-09-02 11:53:58 -07:00
Jacob Thornton
db43777ddf Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
2011-09-02 11:49:41 -07:00
Jacob Thornton
3f242bc70c Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
	bootstrap-1.2.0.css
2011-09-02 11:49:03 -07:00
Mark Otto
a4dc2c8955 merge in master after merging a pull request, add comment 2011-09-02 09:52:33 -07:00
pthrasher
5960afc349 incorporated idea from @markdotto in #138 2011-09-02 12:45:03 -04:00
Mark Otto
3f22925144 remove fixed width from topbar form to allow for applying classes to resize it 2011-09-02 09:35:26 -07:00
pthrasher
e6ffd3a86f Fix for issue #136. Now nests fine in both layouts. 2011-09-02 10:43:26 -04:00
Mark Otto
db830140ee add old dropdown support to tabs dropdowns 2011-09-02 01:03:16 -07:00
Mark Otto
411e324340 fix dropdown bug, remove second topbar from docs now 2011-09-02 00:58:07 -07:00
Mark Otto
46e4fb3133 remove active state from buttons by moving the :active before :disabled 2011-09-02 00:56:03 -07:00