2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00
Commit Graph

228 Commits

Author SHA1 Message Date
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
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