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

350 Commits

Author SHA1 Message Date
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
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
813c55489f fix for dropdown 2011-09-02 00:42:22 -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
5ef4519ca8 move comment so less compiles 2011-09-02 00:29:54 -07:00
Mark Otto
1b06f3e84e resolve conflict 2011-09-02 00:29:27 -07:00
Mark Otto
479e0ccd6b add backwards compatability for dropdowns in topbar 2011-09-02 00:28:54 -07:00
Jacob Thornton
c098225cd5 this works O_O 2011-09-02 00:26:58 -07:00
Jacob Thornton
3f1706f5f6 > seems to work O_O 2011-09-02 00:21:55 -07:00
Jacob Thornton
0ed544a82e backwards compat for old nav o_O 2011-09-02 00:17:13 -07:00
Mark Otto
02abdd6037 remove inset shadow from disabled buttons 2011-09-02 00:02:44 -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
f6a4dd95b6 try daves background thing again... 2011-08-31 10:55:53 -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
Jacob Thornton
588cb1c06d revert dhg mdo suggestion for fixing ie 2011-08-30 23:25:37 -07:00
Jacob Thornton
49e343c464 ie7 background toggle open 2011-08-30 23:08:34 -07:00
Jacob Thornton
2ed869c2ee remove * hack for ie7 + remove -1 margin bug for ie7 2011-08-30 23:03:01 -07:00
Mark Otto
ed1139e838 change type of comment 2011-08-30 08:27:55 -07:00
Jacob Thornton
afec7859cc fix background color for ie7 -- negative margin bug still there though ;_; 2011-08-29 22:43:40 -07:00
Jacob Thornton
efd6fd609c fix open ui for ie 7 2011-08-29 22:36:05 -07:00
Mark Otto
d42a00c19d remove repeated table reset 2011-08-29 21:42:44 -07:00
Mark Otto
7070d44aed adding more grid docs 2011-08-29 21:41:32 -07:00
Jacob Thornton
589204803b remove duplicate defined btn class O_O 2011-08-29 21:41:12 -07:00
Mark Otto
f17fc367f7 le merging conflicts 2011-08-29 21:26:53 -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
58cc70531a drop top position a bit 2011-08-28 17:50:14 -07:00
Jacob Thornton
484ed088fc blah 2011-08-28 17:45:57 -07:00
Jacob Thornton
ebff554430 remake with opacity thin 2011-08-28 17:42:09 -07:00
Jacob Thornton
9059a72bf8 try using tricker opacity thingy 2011-08-28 17:40:25 -07:00
Jacob Thornton
a0cb72f9ae change window to 'body' 2011-08-28 16:36:44 -07:00
Jacob Thornton
1a5f8205ff alpha for ie 2011-08-28 16:23:57 -07:00
Jacob Thornton
0b1d2cc03c change backdrop for ie 2011-08-28 14:06:37 -07:00
Jacob Thornton
e05d39d4cc make generic fade animation css class 2011-08-27 18:03:01 -07:00
Jacob Thornton
2ee7c20692 adds popover js 2011-08-27 17:22:49 -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
Jacob Thornton
11721f376d add boostrap-twipsy and bootstrap-alerts 2011-08-27 13:03:06 -07:00
Jacob Thornton
1cbda504a0 clean up show logic 2011-08-27 00:28:58 -07:00
Jacob Thornton
24c4ca0391 display none for inactive modals 2011-08-27 00:03:11 -07:00
Jacob Thornton
c26eb016fb starting up bootstrap-js... 2011-08-26 23:57:35 -07:00
Mark Otto
b552281558 make dropdowns in the topbar black again 2011-08-26 23:18:39 -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
df8b65445c small typo in offset generation 2011-08-26 19:31:50 -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
Weslly Honorato
9e0a526a66 fixed background-color for disabled links in pagination ('none' isn't a valid value for background-color property http://www.w3.org/TR/CSS2/colors.html#propdef-background-color) 2011-08-26 13:30:38 -03:00
Mark Otto
0fcda16209 be more specific in gradient mixin 2011-08-25 23:31:16 -07:00
Mark Otto
ab77d7abd3 spacing 2011-08-25 23:19:01 -07:00
Mark Otto
8c2df3ac3a resolve conflicts in merging in other branch 2011-08-25 23:12:29 -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
Igor Bozato
9a00619d6e .sidebar and .content in fluid layouts don't need to be divs 2011-08-26 03:17:38 -03:00
Mark Otto
7d821f18ac resolve issue #87 in this branch 2011-08-25 22:44:23 -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
04b8e667d0 clean up btn selectors a bit 2011-08-25 13:52:04 -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
Mark Otto
2d99e3f8a6 base import of normalize into the reset css, tweaks to selector specificity across the board 2011-08-25 00:13:40 -07:00
Jacob Thornton
0739583a46 optimize btn for outputted code + line-height: normal for firefox with adjusted padding 2011-08-24 15:55:08 -07:00
Jacob Thornton
7d7156bff9 optimized grid system from @necolas 2011-08-23 20:16:39 -07:00
Jacob Thornton
0bfce13983 add delete button + give .btn cursor:pointer 2011-08-22 23:53:02 -07:00
Jacob Thornton
411b90e4ff comment out button method with // so less doesn't compile it into source 2011-08-22 22:02:31 -07:00
Jacob Thornton
40aba9ca1d append checkbox to password input #36 2011-08-22 21:51:17 -07:00
Jacob Thornton
899c6f8d12 remake 2011-08-22 21:47:34 -07:00
Jacob Thornton
8a27d281a9 goodbye -ms-filter. 2011-08-22 21:31:30 -07:00
Mark Otto
d324a24268 adding first template to the repo for a generic website page 2011-08-22 12:50:30 -07:00
Mark Otto
16064bed2d Bugfix and copy changes 2011-08-22 12:34:55 -07:00
Jacob Thornton
8497d935ad Merge branch 'master' of github.com:twitter/bootstrap 2011-08-22 11:27:21 -07:00
Mark Otto
ee6402b6c8 Merge pull request #51 from Tigraine/master
Fixed syntax error in patterns.less
2011-08-22 09:35:09 -07:00
Mark Otto
ebec320395 Merge pull request #58 from sankage/master
fixed #10: color-stop() function removed, @colorStop fixed for moz to be unitless
2011-08-22 09:34:39 -07:00
sankage
6145fd2931 changed @colorStop to be unitless 2011-08-22 18:19:39 -03:00
sankage
e45dbf52de fixed color-stop for opera, ie10, w3c, new webkit 2011-08-22 18:01:11 -03:00
Daniel Hoelbling
96ec9ee083 Fixed a syntax error preventing less compilation with dotless 2011-08-22 09:36:35 +02: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
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
b39a9a680d go with greyed out next 2011-08-21 21:30:19 -07:00
Jacob Thornton
d8d12e20b4 fix border for popover ie6-7 2011-08-21 21:20:51 -07:00
Jacob Thornton
d90136b585 remove ie8 hack 2011-08-21 21:18:36 -07:00
Jacob Thornton
8ebdf4483f ie-6/7 hack for border colors 2011-08-21 21:09:54 -07:00
Mark Otto
0df17f06d8 re-add div to error class 2011-08-21 20:53:52 -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
Jacob Thornton
2f6f9ec6e0 Merge branch 'misc_css_fixes' of github.com:twitter/bootstrap into misc_css_fixes
Conflicts:
	lib/forms.less
2011-08-21 20:42:54 -07:00
Jacob Thornton
0e92acd9ff more little ie6-7 hacks :/ 2011-08-21 20:41:34 -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
027538e66d fix topbar dropdown active and hover states 2011-08-21 20:30:58 -07:00
Mark Otto
f630615d26 remove tags from form selectors 2011-08-21 20:27:19 -07:00
Jacob Thornton
842ad01fce fix color for alert blocks in ie6-7 2011-08-21 20:21:59 -07:00
Mark Otto
59aea3bafd give popovers and modals border colors you can see in IE8 and down 2011-08-21 20:17:10 -07:00
Mark Otto
12efeccdf7 tweak pagination styles to include better border and box shadow 2011-08-21 20:12:18 -07:00