Commit Graph

1334 Commits

Author SHA1 Message Date
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
Mark Otto
0bfbf1446d Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-01 21:44:35 -08:00
Mark Otto
8f0bc9e79b Merge branch 'dospuntocero-master' into 2.3.0-wip 2013-02-01 21:41:13 -08:00
Mark Otto
d2ea2cdedd add horizontal-three-color gradient test 2013-02-01 21:41:02 -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
Gil Barbara
e69912c163 Update line-height and padding for input sizes 2013-01-31 19:00:22 -02:00
RJ Regenold
2f44d8d2da removes anchor tag definition. 2013-01-31 12:49:53 -06:00
RJ Regenold
ed2cf5b3e3 its not dyslexic being easy. 2013-01-31 11:04:12 -06:00
RJ Regenold
e38d08d4c0 fixes jankiness with anchor tags in carousel. 2013-01-31 10:03:53 -06:00
Mark Otto
135e834bf4 Merge branch 'baslr-master' into 2.3.0-wip 2013-01-30 18:22:11 -08:00
Mark Otto
d44acb7f88 Merge pull request #6750 from nextgenthemes/3.0.0-wip
Update less/carousel.less
2013-01-30 12:44:10 -08:00
nextgenthemes
72da31e028 Update less/carousel.less
lessified .carousel-caption
2013-01-30 18:14:22 +01:00
Guillaume Gautreau
6803ff70f9 Tooltip positionning on special cases 2013-01-26 13:50:26 +01:00
baslr
6afb1055e3 .icon-folder-close same width as icon-folder-open
.icon-folder-close same width as icon-folder-open. this prevents
buttons from wobbling if the icon changes from closed folder
to open folder
2013-01-26 01:01:10 +01:00
Francisco arenas
2428904b4b Update less/mixins.less
horizontal three color gradient added
2013-01-24 03:37:52 -02: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
27ff51dae6 Fix that thing with disabled buttons changing color on hover 2013-01-18 11:55:17 -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
01b465928e overhaul alerts section of tests 2013-01-17 12:24:16 -08:00
Mark Otto
bbb3c0a0e6 Merge branch 'ravage84-patch-2' into 2.3.0-wip 2013-01-17 12:21:34 -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
ravage84
650c77ddb9 Update less/tests/css-tests.html
Extended css-tests with alerts (alerts and alert-blocks)
2013-01-17 11:34:00 +01: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