rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Code Issues Actions Packages Releases Activity
4,502 Commits 108 Branches 89 Tags 552 MiB
e56c809492
Commit Graph

1389 Commits

Author SHA1 Message Date
Mark Otto
86bb3b8126 IE8 doesn't need help with responsive images, they work just dandy apparently (see http://jsbin.com/idesit/1) 2013-04-13 23:17:39 -07:00
Mark Otto
5fbe66307f more specific comment, better placement of code 2013-04-13 21:45:21 -07:00
Paul Tyng
811a79e16c override normalize.css override 2013-04-13 16:46:17 -03:00
Mark Otto
ae98f1803f add modal variables and tweak padding for min-height on modal title 2013-04-12 20:56:19 -07:00
Mark Otto
a96dd1bd28 Merge branch '3.0.0-wip' of https://github.com/garvincasimir/bootstrap into garvincasimir-3.0.0-wip 2013-04-12 20:45:10 -07:00
Agustin Colchado
7fb1c1cb89 Reordering variables that were being used before they were declared. Under some compilers (dotless & sublime 2 package), this would cause the compile to break. Variables in question were: 
@dropdown-link-active-bg
@navbar-link-color
@navbar-inverse-link-color
 2013-04-10 02:27:11 -07:00
Mark Otto
24f8d9e137 don't use table for label variatons 2013-04-09 10:43:37 -07:00
Tom Pietschker
bd789ed158 Merge remote-tracking branch 'upstream/3.0.0-wip' into 3.0.0-wip 2013-04-08 08:39:22 -04:00
Mark Otto
c2a35f1ec8 Merge pull request #7148 from retlehs/3.0.0-wip 
Remove -webkit-backface-visibility on skew mixin
 2013-04-07 23:01:28 -07:00
Tom Pietschker
a05ff7e507 rename btn bg variables so that they are consistent with the other variables 2013-04-07 17:52:12 -04:00
Tom Pietschker
c4d8aa2b0f rename the navbar-inverse-brand variables for consistency 2013-04-07 17:47:53 -04:00
Mark Otto
7ff40635d4 fixes #7497: use var for jumbotron border radius 2013-04-07 11:44:17 -07:00
Garvin
05710e10f7 Added min-height to modal-header for modals with no header text 2013-04-06 21:48:53 -04:00
Mark Otto
7a8d071735 use font-size-base var 2013-04-05 11:42:29 -07:00
Mark Otto
eadfa59d92 Add small grid for phones and tablets 2013-04-02 19:40:43 -07:00
Mark Otto
0ac711059b refactor some of the carousel caption stuff to center it and tighten styles up; update carousel template to start to redo mobile first 2013-04-02 16:17:04 -07:00
Mark Otto
2cd34a1a85 Fixes #7462: add radial-gradient spec to mixin 2013-04-02 14:48:45 -07:00
Mark Otto
12f043f1bb Merge branch '3.0.0-wip-carousel' of https://github.com/burnsra/bootstrap into burnsra-3.0.0-wip-carousel 2013-04-01 13:17:31 -07:00
Mark Otto
eac987c0d2 only negative indent nested grid rows; add new grid example 2013-04-01 12:55:48 -07:00
Robert Burns
e183dd46a2 Update carousel-caption btn styles 2013-04-01 09:27:49 -04:00
Mark Otto
2f8deea95a add .panel-primary 2013-03-31 22:22:52 -07:00
Mark Otto
c69310153e Fixes #7438: remove max-height from justified nav tabs with some CSS wankery 2013-03-31 19:26:40 -07:00
Mark Otto
8e59357bc5 Merge branch 'SBoudrias-patch-1' into 3.0.0-wip 
Conflicts:
	less/type.less
 2013-03-31 18:39:49 -07:00
Mark Otto
db284a97d6 more consistent navbar vars 2013-03-31 17:56:31 -07:00
Mark Otto
4cbefa1179 remove unused responsive navbar vars 2013-03-31 17:37:28 -07:00
Mark Otto
0441bbba42 more consisten dropdown vars 2013-03-31 17:36:23 -07:00
Mark Otto
896ee79473 more consistent forms vars; drop search border radius since no more search form 2013-03-31 17:33:55 -07:00
Mark Otto
8b9d488377 more consistent btn vars 2013-03-31 17:32:45 -07:00
Mark Otto
b7fa0d3434 -background to -bg for body and table vars 2013-03-31 17:29:05 -07:00
Mark Otto
d6f37f3c56 @link-color-hover to @link-hover-color 2013-03-31 17:27:22 -07:00
Mark Otto
376bd20b3a -background to -bg on wells vars 2013-03-31 17:25:52 -07:00
Mark Otto
52e4148302 better grid var comments 2013-03-31 17:25:27 -07:00
Mark Otto
626189dbfc @state-*-background to @state-*-bg vars 2013-03-31 17:24:06 -07:00
Mark Otto
d5fa1d80bb use @pagination- vars on pager component; change @pagination-bg-active to @pagination-active-bg 2013-03-31 17:22:12 -07:00
Mark Otto
996ec4ca69 -background to -bg on pagination vars 2013-03-31 17:20:16 -07:00
Mark Otto
f2e5c32936 -background to -bg on jumbotron vars 2013-03-31 17:19:47 -07:00
Mark Otto
6b23a66c29 -background to -bg on tooltip and popover vars 2013-03-31 17:19:12 -07:00
Mark Otto
cf843c5cad -background to -bg on labels vars 2013-03-31 17:18:07 -07:00
Mark Otto
b56371b145 active item on list group should use @component-active-bg 2013-03-31 17:17:25 -07:00
Mark Otto
c5042e050e fix nav divider 2013-03-31 17:17:10 -07:00
Mark Otto
388a4c878d remove lingering rem 2013-03-31 13:20:54 -07:00
Mark Otto
5c601e7ac2 new @component-active-bg variable 2013-03-31 12:16:16 -07:00
Mark Otto
674768b177 restore px unit on @font-size-base 2013-03-31 12:00:04 -07:00
Mark Otto
e62f2901d0 Merge pull request #7431 from burnsra/3.0.0-wip-fixes 
Cleanup items for 3.0.0
 2013-03-31 11:55:48 -07:00
Mark Otto
fc16e37aaa Remove the handful of rem font-sizes 2013-03-31 11:26:13 -07:00
Robert Burns
a1587e2629 Remove breadcrumb divider after last element 2013-03-31 09:12:02 -04:00
Mark Otto
6edd5f291a not quite #fff on .list-group-item-text 2013-03-30 17:00:11 -07:00
Mark Otto
1683669eaa Remove .nav-list given new .list-group 2013-03-30 16:56:49 -07:00
Mark Otto
2a9604fdd2 add list group component 2013-03-30 16:07:50 -07:00
Mark Otto
9fff2d3fb6 Change error to danger for all classes; add panels component 2013-03-30 14:15:18 -07:00
Mark Otto
aee25786a7 fuck everything about .clear_float() -- restore .clearfix() as mixin 2013-03-30 13:23:18 -07:00
Mark Otto
8d8f4e0cdd Merge pull request #7375 from thomas-mcdonald/fix-filter-gradient 
Fix horizontal-three-colors to a horizontal filter gradient
 2013-03-30 13:17:45 -07:00
Mark Otto
7c3c5ed7cc Merge branch 'pickypg-patch-1' into 3.0.0-wip 
Conflicts:
	less/dropdowns.less
 2013-03-30 12:54:16 -07:00
Mark Otto
601013ca04 drop .muted for .text-muted 2013-03-30 00:11:38 -07:00
Mark Otto
4ce9203f2c Merge branch '3.0.0-wip' into bs3_new_nav 2013-03-29 14:21:03 -07:00
Andreas Cederström
090545ffdf Make sure form actions are properly aligned with form-horizontal 2013-03-28 11:33:18 +01:00
Mark Otto
ba46d859e3 none of that 2013-03-28 01:12:07 -07:00
Mark Otto
fe414d8566 turn docs navbar into left navbar 2013-03-27 23:33:45 -07:00
Mark Otto
f0f33eb9a3 Refactor .list-inline and .list-unstyled 
* Instead of shared and separate CSS, isolate by class for easier mixin-ability
* .list-unstyled is now used as a mixin in .list-inline
 2013-03-27 15:42:11 -07:00
Mark Otto
ca31f060a8 New grid classes 2013-03-26 17:12:17 -07:00
Thomas McDonald
f8b9e428f0 Give horizontal-three-colors a horizontal filter gradient 
Previously the filter had GradientType=0, which would render a vertical
gradient rather than the horizontal one implied by name
 2013-03-23 19:21:37 +00:00
Mark Otto
3c82ccaa2b color border in table contextual classes 2013-03-17 17:26:02 -07:00
Simon Boudrias
cae90f3010 Remove text-rendering 2013-03-17 17:22:26 -03:00
Mark Otto
3aee2adb4b Fixes #7297: add support for .success, .error, and .warning on td and th elements in tables 2013-03-17 12:10:58 -07:00
Mark Otto
4aba489cfd Remove all #font mixins; replace single instance of its use in Bootstrap with the @font-family-monospace variable 2013-03-17 11:34:27 -07:00
Mark Otto
6012d8221b Exploring rems as font-size unit 
* Added a new mixin to calculate rems and pixels for IE fallback
* Updated the body, p, and .lead elements to use the new .font-size() mixin
* New mixin has default value of 14px or 1.4rem
* Still needs exploration, and change this means lots of work rejiggering margins and line-heights
* Related, started to reorganize the mixins a bit to call out mixins that are used by the framework and not utilities or snippets
 2013-03-17 11:33:07 -07:00
Mark Otto
47f69c0d9e mixin, not copypasta 2013-03-17 11:15:04 -07:00
Mark Otto
ef4898990f convert to preboot's retina mixin 2013-03-16 17:19:05 -07:00
Mark Otto
71d4b5b6e7 Merge branch '3.0.0-wip' of https://github.com/dannykeane/bootstrap into dannykeane-3.0.0-wip 2013-03-16 17:06:20 -07:00
Mark Otto
68dfd322f4 fixes #7140: hide navbar toggle in print 2013-03-16 16:17:32 -07:00
Mark Otto
fe2658ed61 Fixes #7150: colorize links in alerts 2013-03-16 15:31:03 -07:00
Mark Otto
7e933db2dd comment 2013-03-16 15:03:22 -07:00
Mark Otto
1d94d777c3 Merge pull request #7258 from acconrad/patch-1 
Update buttons.less to disable btn pointer events
 2013-03-16 14:59:33 -07:00
Mark Otto
8c9e9e28cf Fix vertical button groups 2013-03-16 13:03:31 -07:00
Mark Otto
efbf8373a5 Use form elements in checkbox and radio button groups 
* Uses .btn on label elements with nested checkbox and radio controls within
* Updated examples to reflect change in HTML and CSS
* Had to add .active all buttons for proper state highlighting (mimicing the :active pseudo state)
* Still needs JavaScript plugin updated by @fat
 2013-03-16 12:34:07 -07:00
Mark Otto
bb38fa5286 Overhaul the grid system and its docs 
* Add new grid mixins adapted from Preboot (http://github.com/mdo/preboot)
* Drop the @grid-row-width and @grid-column-width variables
* Add the @grid-float-breakpoint variable, as used in Preboot
* Add support for .push* and .pull* classes for column ordering manipulation
* Document all the things
 2013-03-15 23:21:10 -07:00
Mark Otto
ecfdecea00 Use translucent box shadow on hr elements; colorize hr elements within alert components 2013-03-14 23:01:23 -07:00
pickypg
812b99263f Fix dropdown (and therefore typeahead) wrap 
I have recently been experimenting with a lot of Typeahead controls, and I ran into a situation where my Typeahead was too wide for my screen, particularly on mobile devices, and it was not wrapping as I had expected it to do.

http://jsfiddle.net/Mtxkn/3/

Changing the CSS for `.dropdown-menu > li > a` to `white-space: normal` causes it to wrap in every scenario that I have seen, whereas leaving it as `nowrap` never does what I want when the text is too long for a given row.

It's possible that this has ramifications for other dropdown menus, but honestly I expect that even those would prefer to wrap than to extend the screen horizontally.  If that is not the case, then it would work to change the typeahead version of this only:

```css
.typeahead > li > a {
    white-space: normal;
}
```
 2013-03-15 02:54:24 -03:00
Andrew Stilliard
706dd8c045 Additional heading font-size classes 
This relates to changes in issue #7284
 2013-03-15 02:11:37 +00:00
Mark Otto
224296f695 Fixes #7281: make tables super specific for hovers and striping to avoid nesting issues 2013-03-14 13:29:43 -07:00
Mark Otto
00169b48bd Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 
Conflicts:
	less/grid.less
 2013-03-14 13:25:59 -07:00
Adam Conrad
e488e709a0 Update buttons.less to disable btn pointer events 
Buttons that are disabled are still clickable and can still fire click events (such as hopping up to the top of the page if your anchor href points to "#"). Adding the pointer-events:none property will truly disable the button so situations like this don't happen.
 2013-03-12 17:58:41 -03:00
Mark Otto
d219b8b964 Set border-box globally instead 2013-03-10 13:24:07 -05:00
Luke Page
5054c17ab8 make less files compile with strict maths in 1.4.0 2013-03-06 16:38:20 +00:00
Ben Word
ee5c7d7ece Remove -webkit-backface-visibility on skew mixin 
Ref #5319 - This rule is causing pixelated edges on iOS. Removing
it makes everything smooth across all OS's, browsers, and devices.
 2013-03-04 13:03:05 -06:00
Mark Otto
bfdc6f8607 Remove support for .uneditable-input 2013-03-03 23:31:09 -08:00
Mark Otto
b83fc82aed fix row change at breakpoint 2013-03-03 18:19:31 -08:00
Mark Otto
e0647e8273 nuke commented out unused var 2013-03-01 12:37:36 -08:00
Mark Otto
77e8e2aee9 Fix alignment of .navbar-brand 2013-03-01 00:50:08 -08:00
Mark Otto
492c249537 improve navbar toggle and hide code snippets on mobile devices for now 2013-03-01 00:18:10 -08:00
Mark Otto
38ba057dee Fixes #6998: disabled background color properly on pagination 2013-02-28 23:23:05 -08:00
Mark Otto
5a30e52aac Fixes #6995: Add disabled navbar nav link support 2013-02-28 23:20:58 -08:00
Mark Otto
4418c82888 Fixes #6954: properly reset grid classes within tables 2013-02-28 22:47:32 -08:00
Mark Otto
bfc4aaf6e8 Holy fucking shit fix that input group with buttons rounded corner noise 2013-02-28 21:19:02 -08:00
fat
3469339068 2.3.1 2013-02-28 20:55:14 -08:00
Mark Otto
b19eb88b5a Fixes #6935: Use standard decimal points for .opacity() mixin 2013-02-28 19:46:49 -08:00
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
ea01e8bbc4 nuke remaining less/tests/ files and move grid over to examples dir 2013-02-26 00:49:21 -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
91660a0489 Move navbar examples to /examples directory 2013-02-26 00:37:59 -08:00
Tom Pietschker
ec9b01e691 remove the search-query class and increase the width 2013-02-19 14:40:05 -05: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
d3cc8f79f4 remove old todo comment 2013-02-17 20:26:44 -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
6789a30a3d fix #6950: use var for font-family 2013-02-15 16:51:16 -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
Danny Keane
e8dc036d25 Added retina image support mixin 2013-02-11 18:23:21 -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
52581839c7 remove modal test file 2013-02-07 19:34:23 -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
3b56227553 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2013-02-05 22:30:54 -08:00
fat
4814281540 clean up styles 2013-02-05 22:29:59 -08:00
Mark Otto
0fe9148b91 Fixes #6190: Add print utility classes 2013-02-05 22:17:28 -08:00
fat
5e4db94c24 Merge branch '2.3.0-wip' of git://github.com/ghusse/bootstrap into ghusse-2.3.0-wip 2013-02-05 22:10:41 -08:00
fat-kun
042bb9b515 Merge pull request #6780 from agatronic/2.3.0-wip 
less: Move to new selector interpolation, supported from 1.3.1
 2013-02-05 21: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
9443eb6e21 restore comma between selectors 2013-02-05 19:40:32 -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
9480eb89cb Revamp button mixins and pseudo states 
* Remove .darken-button-states and .buttonBackground mixins (latter wasn't being used anyway)
* Create new .btn-pseudo-states mixin for setting button background and border colors for default and pseudo states
 2013-02-02 19:16:15 -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
Luke Page
6b9bb547bf Move to new selector interpolation, supported from 1.3.1 2013-02-02 07:58:27 +00: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