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

328 Commits

Author SHA1 Message Date
Mark Otto
72ce695cfd add links 2011-09-12 09:24:54 -07:00
Mark Otto
6a5fb52bb1 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-12 08:58:46 -07:00
Jacob Thornton
89465f8ce1 few more js doc wording changes 2011-09-12 00:03:24 -07:00
Jacob Thornton
cc05bce597 docs coppyy 2011-09-11 23:56:44 -07:00
Jacob Thornton
44e2c73668 data-attribute="x" annndddd... now all js with ie7+ support 2011-09-11 23:48:43 -07:00
Jacob Thornton
fcf816a236 index to use data attr for scrollspy initilizing 2011-09-11 23:36:59 -07:00
Jacob Thornton
02d668fd2e data-attributes need values to be picked up by jquery in ie8 and below :/ 2011-09-11 23:29:34 -07:00
Mark Otto
88f2f848b3 change modal buttons back to be primary first 2011-09-11 22:02:26 -07:00
Mark Otto
0afba3867d Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-11 21:13:09 -07:00
Mark Otto
b77e3e2f30 theme.less file cleanup; fixing blockquotes in wells 2011-09-11 21:12:55 -07:00
Jacob Thornton
f8aaec5260 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-11 21:04:01 -07:00
Jacob Thornton
200f5817ba method invocation jqueryui style 2011-09-11 21:03:17 -07:00
Mark Otto
b7c9a639d6 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-11 20:17:49 -07:00
Mark Otto
bd3448cf78 make input prepend styles look a bit better 2011-09-11 20:17:34 -07:00
Jacob Thornton
e255b4f51d Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-11 20:09:20 -07:00
Jacob Thornton
173be3f1e8 change hella js... broke all the tests. i <3 wip 2011-09-11 20:08:43 -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
6bc867ed5c change template diagrams to be .media-grid 2011-09-11 19:53:48 -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
3ad034ea96 fix legends in ie7 2011-09-11 17:36:15 -07:00
Mark Otto
1ae603fda0 make the less compile docs text now have widows, fix broken table markup 2011-09-10 23:05:30 -07:00
Mark Otto
62edafa1a4 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 22:55:59 -07:00
Jacob Thornton
d9cbcfc20d wait for window load event before positioning images, doi 2011-09-10 22:54:47 -07:00
Mark Otto
0c656e29fc updated styles for the media grids 2011-09-10 22:50:59 -07:00
Jacob Thornton
b781f6ca59 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 22:49:05 -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
d0f7637a7d adding more media sizes 2011-09-10 22:47:38 -07:00
Jacob Thornton
68865002af Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 22:44:22 -07:00
Jacob Thornton
2655117747 add some notes on installing from command line and from makefile 2011-09-10 22:43:52 -07:00
Mark Otto
3755ee158f Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 22:31:55 -07:00
Mark Otto
40693f2618 adding media grid styles 2011-09-10 22:31:43 -07:00
Jacob Thornton
c40e0de3c1 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Conflicts:
	docs/index.html
2011-09-10 22:17:37 -07:00
Jacob Thornton
64176caa97 add bootstrap-scrollspy 2011-09-10 22:14:57 -07:00
Mark Otto
536fe2c743 add footer to js docs 2011-09-10 21:54:11 -07:00
Mark Otto
8130b113bb add stubbed out table for how to compile less 2011-09-10 21:50:12 -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
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
57a8672b77 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 16:51:03 -07:00
Jacob Thornton
23d2fed905 tooltip 1 word 2011-09-10 16:50:42 -07:00
Mark Otto
0914027609 spelling mistake 2011-09-10 15:32:06 -07:00
Mark Otto
f556da42fc zebra stripe that shit 2011-09-10 15:30:42 -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
Jacob Thornton
5f65df9e2d add some more events to alerts and modal and update docs 2011-09-10 14:04:22 -07:00
Jacob Thornton
5bc455d370 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-10 13:17:43 -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
48aa209348 more tests, more js goodness 2011-09-10 12:49:21 -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
0b43bc9bb9 adding docs for customizing the grid 2011-09-09 21:50:41 -07:00
Mark Otto
a0c3d48342 fix the stacked form legend style 2011-09-09 21:43:19 -07:00
Mark Otto
c56e229ed7 start updating the grid docs for customizing it 2011-09-09 20:47:38 -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
b086d94253 remove aria-control stuff 2011-09-09 00:00:03 -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
Jacob Thornton
346122a0c7 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-08 19:13:26 -07:00
Jacob Thornton
8d2f14d8d0 tabssss 2011-09-08 19:13:08 -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
f6d20a8939 remove active state from dropdown 2011-09-06 23:32:20 -07:00
Mark Otto
daf903f847 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-06 23:30:45 -07:00
Mark Otto
d640c3b14b update diagrams to use smaller border radius, add new container-app example 2011-09-06 23:30:21 -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
Mark Otto
0b70eb630e Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-02 23:35:44 -07:00
Mark Otto
bfa5ce70d4 updated address examples 2011-09-02 23:35:28 -07:00
Mark Otto
df8eccbfe1 adding support for and example ul in block-messages 2011-09-02 23:28:01 -07:00
Jacob Thornton
cf23dc4f24 Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip 2011-09-02 23:16:06 -07:00
Jacob Thornton
2883888a57 adds small js section to docs index 2011-09-02 23:15:38 -07:00
Mark Otto
6d118411e1 resolve conflict 2011-09-02 22:09:49 -07:00
Mark Otto
d5e42cf81a tweak readonly, disabled, and uneditable form elements 2011-09-02 21:54:11 -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
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
411e324340 fix dropdown bug, remove second topbar from docs now 2011-09-02 00:58:07 -07:00
Mark Otto
251882892f resolve conflicts 2011-09-02 00:52:22 -07:00
Mark Otto
fa94b264fa add temp second topbar to nav section, fix it's compatibility issues 2011-09-02 00:50:05 -07:00
Jacob Thornton
2a5d829c4a add doc styles back to topbar-inner 2011-09-02 00:47:06 -07:00
Jacob Thornton
ec82b613d3 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
	lib/patterns.less
2011-09-02 00:32:09 -07:00
Jacob Thornton
462287e25e div > ul ftw 2011-09-02 00:31:19 -07:00
Mark Otto
479e0ccd6b add backwards compatability for dropdowns in topbar 2011-09-02 00:28:54 -07:00
Jacob Thornton
0159524413 Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
	bootstrap-1.2.0.css
2011-09-01 22:54:59 -07:00
Jacob Thornton
72da5dd54d for html5 style all inputs -- then unstyle checkbox, radio, button, reset, submit 2011-09-01 22:53:24 -07:00
Mark Otto
0cb6804b69 merging in remote and recompiling 2011-08-31 16:27:28 -07:00
Mark Otto
6258832776 spelling mistakes and undo of one comment 2011-08-31 16:26:47 -07:00
Jacob Thornton
90d174a34d Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
	README.md
	bootstrap-1.2.0.css
2011-08-30 23:37:46 -07:00
Jacob Thornton
4fb1c5bd4b rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html 2011-08-30 23:34:19 -07:00
David Haywood Smith
55022228bc Fixed duplicate element ids
Also updated labels where required
2011-08-30 11:47:40 +01:00
Jacob Thornton
fc0471a450 lulz nbsp 2011-08-29 22:34:13 -07:00
Jacob Thornton
e8f1ae0073 btn's need &nbps; seperating them for ie7 2011-08-29 21:52:45 -07:00
Mark Otto
7070d44aed adding more grid docs 2011-08-29 21:41:32 -07:00
Mark Otto
654cc5ad3f resolving deltas between that epic css selector specifity pull request and latest changes here 2011-08-29 21:24:00 -07:00
Jacob Thornton
ed96f181c8 add topbar dropdown js 2011-08-27 21:46:50 -07:00
Mark Otto
650251228b redefine the grid to use attribute selectors with css regex, make previously fixed grid values use variables we use elsewhere 2011-08-27 15:30:18 -07:00
Mark Otto
4f67e135dc adding dropdowns to tabs by refactoring the shizzzz out of them 2011-08-26 20:38:23 -07:00
Jacob Thornton
a63fb4d234 Merge branch '1.1.1-wip' 2011-08-26 15:21:20 -07:00
Jacob Thornton
273659c8e7 update everything to 1.1.1 2011-08-26 11:13:47 -07:00
Jacob Thornton
5193619ab0 clean up redundant google prettify code 2011-08-26 10:53:21 -07:00
Mark Otto
fc1118c87c bump less version number in docs 2011-08-26 10:09:57 -07:00
Karthik Viswanathan
0a34a6d4b2 Made JavaScript unobtrusive by factoring out prettyPrint() to application.js. Also removed unused class from hero demo. 2011-08-26 00:00:05 -07:00
Mark Otto
74a18b341c updated le docs to include note about topbar and padding on box (issue #86) and add snippet about @basefont and @baseline to type section 2011-08-25 23:25:21 -07:00
Mark Otto
c715584428 pull table class from docs again 2011-08-25 23:18:15 -07:00
Mark Otto
dd4bb95c2d updated docs for b/i tags based on issue #62 2011-08-25 23:10:18 -07:00
Mark Otto
0758f64045 updated classnames in the docs for the alerts, updated colors on error and info alerts/buttons 2011-08-25 22:52:21 -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
Jacob Thornton
0e9d7c1c4d update alert and button styling aproach 2011-08-25 13:31:46 -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
8368cfd523 add opera to browser support 2011-08-24 19:55:11 -07:00
David Haywood Smith
70bac36a22 Fixed empty for fields on select labels
Also added id fields to selects where needed
2011-08-24 00:05:07 +01:00
Jacob Thornton
0bfce13983 add delete button + give .btn cursor:pointer 2011-08-22 23:53:02 -07:00
Mark Otto
16064bed2d Bugfix and copy changes 2011-08-22 12:34:55 -07:00
Jacob Thornton
621f358dc0 fix copy for ie in docs 2011-08-22 11:26:04 -07:00
Jacob Thornton
fef3672ad3 update copy for browser support 2011-08-21 22:48:01 -07:00
Jacob Thornton
3ef86aa703 v1.1.0 2011-08-21 22:30:39 -07:00
Jacob Thornton
109027433d finish cleaning up ie 7-8 support 2011-08-21 22:26:54 -07:00
Jacob Thornton
f408f5c29b update few things for ie 2011-08-21 22:13:35 -07:00
Jacob Thornton
b62b15c5e3 link docs to correct css 2011-08-21 22:05:49 -07:00
Jacob Thornton
25e21bab96 fix crappy merge 2011-08-21 22:05: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
b54dc13535 Merge branch 'misc_css_fixes'
Conflicts:
	bootstrap-1.0.0.css
	lib/patterns.less
2011-08-21 21:42:10 -07:00
Jacob Thornton
dd92f4e6e2 hide overflow for ie 7 2011-08-21 21:26:15 -07:00
Jacob Thornton
1db73edc5f fix conflict 2011-08-21 21:06:09 -07:00
Jacob Thornton
17f9aca698 1 more space for disabled 2011-08-21 20:57:09 -07:00
Mark Otto
f169c99f72 more tweaks to resolve some missed conflicts 2011-08-21 20:56:06 -07:00
Jacob Thornton
c6b162f6ca nonbreaking spaces for ie7 after buttons :/ 2011-08-21 20:53:54 -07:00
Mark Otto
23ec21d049 resolve conflicts 2011-08-21 20:51:13 -07:00
Mark Otto
a98d2cccb8 merge in master, resolve conflicts 2011-08-21 20:47:24 -07:00
Mark Otto
b59b82b032 updated to resolve conflicts 2011-08-21 20:38:57 -07:00
Mark Otto
34a19915f4 resolve conflicts 2011-08-21 20:33:54 -07:00
Mark Otto
80e0e9c413 updated list html, tweaks to patterns 2011-08-21 20:03:12 -07:00
Jacob Thornton
f17b2633ad fix btn borders ie7/ie8 2011-08-21 19:56:43 -07:00
Jacob Thornton
48c3c6f1b6 make topbar .fill wrap 2011-08-21 18:14:53 -07:00
Jacob Thornton
e1e4ceee3f fix disabled button for ie 8 and below 2011-08-21 18:07:47 -07:00
Mark Otto
2aeed35f24 pull filter gradients out completely because IE can't render them correctly in half of all instances and they are performance problems with them; tweak alert message styles, particularly close button; 2011-08-21 17:30:45 -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
22dbf9d8e4 fix up the modals for ie8 2011-08-21 13:36:06 -07:00
Jacob Thornton
b18e76f990 introduce .fill class to top-nav for overflow bug 2011-08-21 12:19:01 -07:00
Jacob Thornton
1fc4491cd6 simplify drop down logic - fix color of search hover for ie 2011-08-21 11:22:33 -07:00
Mark Otto
6db39d0ec3 fix error styles a bit on stacked form fields 2011-08-20 23:56:32 -07:00