root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 10 Packages Projects Releases Wiki Activity
4,227 Commits 104 Branches 92 Tags 676 MiB
Commit Graph

925 Commits

Author SHA1 Message Date
Mark Otto 0dea8b0c74 Fixes #6897: Print styles get own .less file 2013-02-28 19:42:51 -08:00
Mark Otto 9d763e805b Remove margin between buttons in button groups; use border-radius mixins to avoid reseting border-radii that don't need resetting 2013-02-28 19:34:02 -08:00
Mark Otto e2e5580c0e nuke glyphicons changes in buttons for now because it's whack 2013-02-26 00:44:15 -08:00
Mark Otto 023568fe3d Navbar realignment: 
* Change .brand to .navbar-brand
* Change .btn-navbar to .navbar-toggle
* Redesign navbar toggle to be a bit lighter and wider
* Center align the navbar brand with a max-width of 200px (to minimize hit area) while still centering
 2013-02-18 01:28:35 -08:00
Mark Otto acdffe696c Bring back the label, make it scale somewhat with the font-size of the parent using percentages and ems 2013-02-17 22:20:49 -08:00
Mark Otto f6ec2c5dac Drop the recently added .counter class for .badge 2013-02-17 21:06:20 -08:00
Mark Otto 53091be6d2 remove unnecessary select border reset 2013-02-17 20:26:21 -08:00
Mark Otto 82d059de87 fix broken marketing section with updated class 2013-02-17 20:18:29 -08:00
Mark Otto 36aec5e484 decrease top/bottom padding a bit in mobile fixed navbars 2013-02-17 18:47:44 -08:00
Mark Otto c0ea077fb4 Revert the statis navbar in mobile views--they're back to being fixed all the time 2013-02-17 18:33:55 -08:00
Mark Otto 6ccf588a8e Restore submenu support 2013-02-17 13:35:14 -08:00
Mark Otto 6dce3f63d8 Scrach that: carousel caption is always left aligned, but still hidden for mobile views 2013-02-16 02:47:48 -08:00
Mark Otto 6d048471c4 Re-add carousel captions as optional 
* They're hidden by default in the mobile-first views because otherwise they just cover up the slides
* In mobile they're centered, and then are shown left aligned at larger viewports
 2013-02-16 02:47:15 -08:00
Mark Otto ce21926704 All Glyphicons now require a base class, e.g. .glyphicon.glyphicon-star 2013-02-16 01:26:43 -08:00
Mark Otto d8e2668c1d Overhaul carousel a bit more: 
* Drop custom type arrow controls for glyphicons icons instead for more consistent rendering
* Remove the captions and instead let folks implement what they want in the carousel
* Move the indicators to the bottom middle instead of top right
* Lighten up gradients on the edges for less harsh lighting
 2013-02-16 01:22:15 -08:00
Mark Otto f38e50cdf1 Don't affix the fixed navbars in mobile views 2013-02-16 00:19:17 -08:00
Mark Otto 96953c2072 update makefile to work again; gitignore the compiled docs _gh_pages folder; test makefile with darkened navbar active bg 2013-02-13 12:30:56 -08:00
Mark Otto e45f12ad42 rearrange jekyll and docs 2013-02-12 12:44:41 -08:00
Mark Otto 8b9733b288 nuke what we don't need for jekyll 2013-02-12 12:25:05 -08:00
Mark Otto 63c1377ee7 Fixes #6852: add cursor pointer to carousel indicators 2013-02-08 09:56:04 -08:00
Mark Otto 1b2b049ef8 Fixes #6841: Add new Firefox placeholder, comments 2013-02-08 08:32:29 -08:00
Mark Otto 3eed90c187 Fixes #6837: Enable text alignment utility classes on tables 
* Removes text-align from td elements (no need to set that one)
* Specifically sets th to text-align: left; at a global level (no longer within .table) to override browser defaults
* Removes font-weight: bold; from th while we're at it since that's browser default already
 2013-02-08 08:24:10 -08:00
Mark Otto b04acb37e8 finish modal tweaks 2013-02-07 19:31:12 -08:00
Mark Otto a623b8c10f update docs modals 2013-02-07 19:21:56 -08:00
Mark Otto 8ca70bd83a Overhaul modal to make it responsive and not super lame 2013-02-06 02:07:40 -08:00
Mark Otto 421f9f67c4 Merge branch '2.3.0-wip' into 3.0.0-wip 
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	js/bootstrap-popover.js
	less/mixins.less
	less/tooltip.less
 2013-02-05 22:42:54 -08:00
fat 4814281540 clean up styles 2013-02-05 22:29:59 -08:00
Mark Otto 37a6879ca5 White navbar brand text for inverted navbar 2013-02-05 20:39:09 -08:00
Mark Otto 28e1702052 nuke rogue conflict comment and remake 2013-02-05 19:59:02 -08:00
Mark Otto 43da258bd9 Merge branch '2.3.0-wip' into 3.0.0-wip 
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/examples/hero.html
	less/buttons.less
	less/carousel.less
	less/close.less
	less/dropdowns.less
	less/labels-badges.less
	less/mixins.less
	less/navbar.less
	less/navs.less
	less/pagination.less
	less/responsive-navbar.less
	less/scaffolding.less
	less/sprites.less
	less/thumbnails.less
	less/type.less
 2013-02-05 19:53:44 -08:00
Mark Otto c97d304c0c derp, fix broke css and recompile 2013-02-05 19:43:49 -08:00
Mark Otto 15c7e73abd Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
 2013-02-05 19:39:49 -08:00
Mark Otto 74c8a5611d Increase margins and line-height on h3; overhaul button dropdown docs 2013-02-05 00:49:54 -08:00
Mark Otto c09b994eea Add justified button groups for link buttons; reorganize dropdowns and button groups docs sections 2013-02-05 00:30:03 -08:00
Mark Otto 0a3e3a50fe Merge branch '2.3.0-wip' into 3.0.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less
 2013-02-04 11:12:09 -08:00
Mark Otto 2f7087eae9 Merge branch '3.0.0-wip' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip 2013-02-02 19:08:59 -08:00
Mark Otto 6993fadf7e Simplify input and input group sizing 
* Remove .input-mini because who really needs inputs that small
* Remove unnecessary border-radius resets from large and small input groups
 2013-02-02 17:31:26 -08:00
Mark Otto 04aae2f56c Merge branch '3.0.0-wip' of https://github.com/gilbarbara/bootstrap into gilbarbara-3.0.0-wip 2013-02-02 17:01:29 -08:00
Mark Otto c64aa26d06 Add @btn-color variable and use in buttons and carets; fixes dropup caret as well 2013-02-02 13:03:18 -08:00
Mark Otto dbe8aed76e Merge pull request #6763 from rjregenold/2.3.0-wip 
fixes jankiness with anchor tags in carousel.
 2013-02-02 12:35:39 -08:00
Mark Otto 94e256c016 Refactor navbar dividers 
* Instead of .divider-vertical, use .divider
* Makes use of .nav-divider mixin
* Dividers are horizontal to start, matching the default state of navbar nav links
* Dividers become vertical above 768px via media queries
 2013-02-01 22:56:09 -08:00
Mark Otto dad9889aeb Fixes #6657: Upgrade Normalize to 2.1.0 2013-02-01 21:49:54 -08:00
Mark Otto d53af49afe Refactor colors and progress bars 
* Buttons and progress bars now make use of more semantic global @brand- colors
* Progress bars have been rewritten to reduce the number of possible selectors
* Instead of .progress .bar, it's .progress-bar for individual bars of color, ultimately making for less CSS
 2013-02-01 16:21:38 -08:00
Nikhil Dabas b7b2e4f8a1 Fixing inline lists for IE7 2013-02-02 02:04:30 +05:30
Gil Barbara 24f0505bde Update input-group-addon for input sizes 2013-02-01 01:39:26 -02:00
Mark Otto 52aa67fa1c only round jumbotron corners at 768px+ 2013-01-31 18:11:45 -08:00
Mark Otto b02a0fe768 Button up navbar form which was adding 2px padding to .navbar 2013-01-31 18:09:49 -08:00
RJ Regenold 2f44d8d2da removes anchor tag definition. 2013-01-31 12:49:53 -06:00
RJ Regenold 6014e63054 lets see how much i can mess this pull request up. :| 2013-01-31 11:10:41 -06:00
RJ Regenold e38d08d4c0 fixes jankiness with anchor tags in carousel. 2013-01-31 10:03:53 -06:00
Mark Otto baadc33c88 make on prev commit 2013-01-30 18:22:20 -08:00
Mark Otto d30f47efb2 Tighten up badges docs; less bottom margin on h3 2013-01-19 18:53:41 -08:00
Mark Otto c21c3f101b Merge branch '3.0.0-wip-badges-to-counters' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip-badges-to-counters 2013-01-19 17:06:40 -08:00
Vickash Mahabir c77a459b35 IE8 compatible fix for disabled button hover 2013-01-19 19:32:55 -04:00
Vickash Mahabir 665de0455c Change .badge to .counter, make appearance more OSX-ish, and remove colors 2013-01-18 17:35:23 -04:00
Vickash Mahabir b741c731a2 Fix logic error where a disabled button would change color in an enabled fieldset 2013-01-18 12:12:30 -04:00
Vickash Mahabir 6e96cd1a7c Forgot to add built docs css file 2013-01-18 11:58:12 -04:00
Mark Otto 5075f4973b Semibold dat .navbar .brand 2013-01-17 20:30:40 -08:00
Mark Otto d9b35c2602 Merge branch '2.3.0-wip' into 3.0.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/css.html
	docs/customize.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	less/navbar.less
 2013-01-17 20:23:33 -08:00
Mark Otto f068cdeb63 Combine .thumbnail and .img-thumbnail into simpler selectors 2013-01-17 20:18:03 -08:00
Mark Otto ca74b9882b Change .img-polaroid to .img-thumbnail 
* Same code, but different classes was confusing
* Now .img-thumbnail just extends .thumbnail
 2013-01-17 20:16:04 -08:00
Mark Otto 89b6477bdc Remove .info from table rows 2013-01-17 20:13:11 -08:00
Mark Otto 5663833bfc Restore .btn-info 2013-01-17 19:51:22 -08:00
Mark Otto b30b8c2c12 Restore nav tabs, pills, justified variation, disabled links, and a few more things. Still need to add the dropdowns back though. 2013-01-17 17:02:35 -08:00
Mark Otto 8765df47cd remove global text-shadow from alerts components because it was fucking up buttons in a real way 2013-01-17 15:43:23 -08:00
Mark Otto 237f5e15d3 Nuke shadows around thumbnails 2013-01-17 14:25:40 -08:00
Mark Otto 26f9f4e3a5 Remove navbar search 2013-01-17 12:02:17 -08:00
Mark Otto 32ebe2efd1 mo betta navbar dropdowns 2013-01-17 11:55:37 -08:00
Mark Otto 597a248d4a Rearrange navbar.less and improve vertical divider support 2013-01-17 11:34:46 -08:00
Mark Otto 360f0c5359 Fix floats in navbar 2013-01-17 11:20:19 -08:00
Mark Otto 01b32f472d Simplify and bring back the grid mixin for generating spans and offsets 2013-01-17 10:49:10 -08:00
Mark Otto 7e46b6f636 Update nav and add bounds for tablet container 2013-01-17 00:58:34 -08:00
Mark Otto 2398245e17 Remove all old responsive styles since we're motherfucking mobile first son 2013-01-17 00:43:58 -08:00
Mark Otto 687d4a3eeb Move grid/container styles to grid.less; update docs; add offsetting back 2013-01-17 00:42:31 -08:00
Mark Otto 630005687d Remove ported navbar css that was already commented out 2013-01-17 00:13:12 -08:00
Mark Otto f535201781 improve navbar vars and fix side nav alignment 2013-01-16 23:33:26 -08:00
Mark Otto 6b193dc22d More navbar tweaks, including making fixed navbars work in the docs by adding padding to body 2013-01-16 16:20:29 -08:00
Mark Otto 9ba14cfb7c More navbar derping 2013-01-16 16:14:41 -08:00
Mark Otto 960804cea3 mo betta new navbar styles; hook up some changed vars 2013-01-16 15:35:41 -08:00
Mark Otto ee9403e2d2 flatten the progress bars 2013-01-16 15:19:55 -08:00
Mark Otto baa8c3ec9e restore alerts, and make them suck much less 2013-01-16 15:16:04 -08:00
Mark Otto 1288304e91 Make jumbotron mo responsive 2013-01-16 15:07:57 -08:00
Mark Otto cf693b5632 Add in responsive for 1200px+ layout; increase padding for that viewport size 2013-01-16 14:48:25 -08:00
Mark Otto 13a80f33c8 fix up sidenav and components page 2013-01-16 14:10:33 -08:00
Mark Otto beb2c13f4d Prevent grids from collapsing, fix affixed side nav for docs 2013-01-16 13:11:45 -08:00
Mark Otto a7a06a05a4 Remove commented out files; leave responsive stuff commented out for now 2013-01-16 13:08:27 -08:00
Mark Otto 910ca85a70 restore remaining components 2013-01-16 13:07:41 -08:00
Mark Otto bc7fd582ed restore pagination and pager 2013-01-16 13:07:08 -08:00
Mark Otto 2127690e73 restore breadcrumbs 2013-01-16 13:06:15 -08:00
Mark Otto 2407217686 restore wells and close 2013-01-16 13:05:20 -08:00
Mark Otto ab38493e91 Restore button groups 2013-01-16 13:04:29 -08:00
Mark Otto a4cc704220 Restore dropdowns.less 2013-01-16 12:44:31 -08:00
Mark Otto c76f1cd97e restore glyphicons 2013-01-16 12:30:44 -08:00
Mark Otto 992e0d922a Re-add and update form styles: 
* Restore forms.less file
* Overhaul .radio.inline .checkbox.inline to be .radio-inline or .checkbox-inline
* Update docs to reflect changes
 2013-01-16 12:23:05 -08:00
Mark Otto cb99c4b63a restore table styles 2013-01-16 11:48:20 -08:00
Mark Otto 0df7411362 Derp on type styles a bit more; bring back and fix up more more docs styles 2013-01-16 11:38:34 -08:00
Mark Otto cb0691d92f mo betta type margins for headings 2013-01-16 10:57:00 -08:00
Mark Otto 8fd26040d8 Port over temp responsive styles to bootstrap.less; readd buttons 2013-01-16 10:52:33 -08:00
Mark Otto 5a3cb0d778 remove extra border-radius props 2013-01-16 10:49:19 -08:00
Mark Otto 85db846b65 mobile-first navs, navbar, grids, and type 2013-01-15 17:55:14 -08:00