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

180 Commits

Author SHA1 Message Date
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
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
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
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
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
b9a53b1468 button tweaks 2011-09-02 12:02:20 -07: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
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
f6a4dd95b6 try daves background thing again... 2011-08-31 10:55:53 -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
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
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
a63fb4d234 Merge branch '1.1.1-wip' 2011-08-26 15:21:20 -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
8c2df3ac3a resolve conflicts in merging in other branch 2011-08-25 23:12:29 -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
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
Daniel Hoelbling
96ec9ee083 Fixed a syntax error preventing less compilation with dotless 2011-08-22 09:36:35 +02: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
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
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
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
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
c3143b4729 Fix for alert box gradients in IE7/8 2011-08-21 19:49:31 -07:00
Jacob Thornton
48c3c6f1b6 make topbar .fill wrap 2011-08-21 18:14:53 -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
Jacob Thornton
22dbf9d8e4 fix up the modals for ie8 2011-08-21 13:36:06 -07:00
Jacob Thornton
d019c677ad no gradients on alerts for <= ie8 2011-08-21 13:04:09 -07:00
Jacob Thornton
f8e9c6cf4e ie hack 2011-08-21 12:48:29 -07:00
Jacob Thornton
8ec7566f8b rgba breaks whole def 2011-08-21 12:42:43 -07:00
Jacob Thornton
7e67ddf788 another attempt at getting ie border thign working 2011-08-21 12:40:47 -07:00
Jacob Thornton
d671d566e1 more ie border junk 2011-08-21 12:35:14 -07:00
Jacob Thornton
971336c808 don't display right border for ie 2011-08-21 12:31:55 -07:00
Jacob Thornton
2435b6417a give pagination nav borders in ie 2011-08-21 12:26:51 -07:00
Jacob Thornton
b18e76f990 introduce .fill class to top-nav for overflow bug 2011-08-21 12:19:01 -07:00
Jacob Thornton
bb94457b4b blah 2011-08-21 12:01:27 -07:00
Jacob Thornton
d97fb89480 just disable filter 2011-08-21 11:59:50 -07:00
Jacob Thornton
612e5c3c9e add # to color 2011-08-21 11:57:25 -07:00
Jacob Thornton
0e8e30bf1d ie8 dropdown tweaks 2011-08-21 11:56:16 -07:00
Jacob Thornton
2203ba3df1 ie Xp 2011-08-21 11:53:06 -07:00
Jacob Thornton
3d73e674dd more debugging of ie nav display issues 2011-08-21 11:45:24 -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
2fcb67777a merging in misc fixes to docs and css from other branch 2011-08-20 20:19:03 -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