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

2150 Commits

Author SHA1 Message Date
Mark Otto
f15f259876 derp 2013-08-13 09:59:38 -07:00
Guillermo González de Agüero
e74ac0723b Fixed errors 2013-08-13 14:25:05 +02:00
ggam
ea04fa538e Added pagination-size mixin 2013-08-13 13:27:45 +02:00
Mark Otto
b0ab806dcc fix negative indenting in button group for nested button groups 2013-08-12 23:44:50 -07:00
Mark Otto
237640c706 Drop the accordion for the panel
* Deletes the accordion.less file
* Extends the panel to be collapsible with our JS plugin
* Supports panel color variations
2013-08-12 23:36:25 -07:00
Mark Otto
48e7468e3a invert dropdown styles in navbar for inverse variation 2013-08-12 21:43:59 -07:00
Mark Otto
80eb09cc1b Merge branch '3.0.0-wip' into bs3_navbar_overhaul
Conflicts:
	components.html
	dist/css/bootstrap.min.css
2013-08-12 21:34:55 -07:00
Mark Otto
49576704ea finish fixing #9295: add button group buttons to new input group sizing 2013-08-12 21:27:15 -07:00
Mark Otto
40723c8716 fixes #9400: add box-sizing to pseudo elements as well 2013-08-12 21:26:43 -07:00
Mark Otto
8bb7def26c Navbar refactor
* Now responsive by default (fits better with mobile-first approach)
* Requires `.nav-header` to group `.navbar-brand` and `.navbar-toggle`
for proper mobile display.
* Changed `.nav-collapse` to `.navbar-collapse`
* Simplified examples in docs
2013-08-12 21:23:28 -07:00
Mark Otto
eac61de138 fix navbar form alignment of inputs by restoring inline-block 2013-08-12 16:09:21 -07:00
Mark Otto
c558c035d7 fixes #9258: no more float bug with full-width grid columns by removing float on all .col-*-12 classes 2013-08-12 16:02:27 -07:00
Mark Otto
fb8ae7e514 drop the class on the button group toggles CSS (alt fix to #9297) 2013-08-12 15:46:11 -07:00
Mark Otto
394f698056 undo the grid max-width boundary because it makes offsets kinda borked (you'd have to set twice, for medium and large, in most cases--and that sucks) 2013-08-12 15:02:09 -07:00
Mark Otto
eb1565681f fixes #9392: no need for width auto on inline/navbar form controls given inline-block on parent form group 2013-08-12 14:52:49 -07:00
Mark Otto
a78c8d9c04 Newfangled input and button group sizing (fixes #9295)
Instead of applying `.btn-` or `.input-` to individual elements in
button and input groups, we now have new sizing classes to keep your
markup a little leaner.

* Add `.input-group-sm` or `.input-group-lg` to your `.input-group` to
replicate `.input-sm` and `.input-lg`, respectively.
* Add `.btn-group-xs`, `.btn-group-sm`, or `.btn-group-lg` to your
`.btn-group` to replicate `.btn-xs`, `.btn-sm`, and `. btn-lg`,
respectively.

Both sets of new sizing classes simply use the existing individual
sizing classes as mixins, so customization of them is automatically
inherited when compiling.
2013-08-12 14:03:57 -07:00
Mark Otto
abedd38c5b update grid xs mixin and update docs to match new mixins 2013-08-12 11:52:51 -07:00
Mark Otto
9564c356d3 inherit font-size in code when inside pre 2013-08-12 11:34:28 -07:00
Mark Otto
a74d6cfe73 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-12 11:09:07 -07:00
Mark Otto
f662dff6e9 fixes #9382: inline forms now require use of .form-group for proper alignment of all form controls 2013-08-12 11:07:23 -07:00
Mark Otto
ddd13dc100 Merge pull request #9373 from ggam/button-sizes
Added button-size mixin
2013-08-12 10:40:56 -07:00
Mark Otto
3d11e6dedf Merge pull request #9371 from ggam/buttons-consistency
Renamed btn-pseudo-states mixin to btn-variant for consistency
2013-08-12 10:06:34 -07:00
Mark Otto
a9a27d3794 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-12 10:01:22 -07:00
Mark Otto
55cfa8d38f Drop background-clip and background-size mixins since they have no prefixes anyway 2013-08-12 10:01:13 -07:00
ggam
d80d9251ef Removed remaining Glyphicons mentions in carousel.less 2013-08-12 14:20:17 +02:00
ggam
6993db1840 Added button-size mixin 2013-08-12 14:07:19 +02:00
ggam
83293516b6 Renamed btn-pseudo-states mixin to btn-variant for consistency 2013-08-12 13:55:09 +02:00
Mark Otto
175a112548 fix #9239 by restoring old ie8 responsive img foo 2013-08-12 01:56:38 -07:00
Mark Otto
5e73cc90d9 fixes #9266 manually on account of list group file reorganization 2013-08-12 01:39:43 -07:00
Mark Otto
acdbe73851 fixes #8835: make it so active list group items aren't dependent on an <a> tag 2013-08-12 01:38:06 -07:00
Mark Otto
6dbf588237 fixes #9310: alerts aren't dismissable by default, now requires .alert-dismissable if you need a close button 2013-08-12 01:20:22 -07:00
Mark Otto
efe62a7ef4 rename and refactor a smidge to add medium grid mixins 2013-08-12 00:36:22 -07:00
Mark Otto
f50aea30c4 Merge branch 'patch-12' of https://github.com/ggam/bootstrap into ggam-patch-12 2013-08-12 00:31:28 -07:00
Mark Otto
a2b9988eb9 Media query (grid and responsive utilities) overhaul
Grid classes have been changed to account for a fourth set of classes,
meaning we now have XS, S, M, and L options. Specifically, we made the
following changes:

* Renames `.col-` to `.col-xs-`
* Adds `.col-md-` for devices 992px wide and up
* Remaps `.col-lg-` for devices 1200px wide and up

Alongside that, we've updated our media queries to better handle
advanced grid layouts:

* All column classes now kick in when they hit a `min-width`, undoing
the #9128 fix in
https://github.com/twbs/bootstrap/commit/db45a60cc86190a060f0baf0b3961cb
c690f3a65
* All column offsets, pushes, and pulls are scoped to an appropriate
range, meaning a `min-width` and `max-width` (thanks for the idea,
@eratzlaff)

We've also modified the widths of our grid containers for the small
device grid (now a max 720px instead of 728px) and large device grid
(now a max 1140px instead of 1170px) to avoid horizontal scrollbar
problems in Firefox (likely due to box-sizing, which is why we didn't
see it in 2.x).

Similarly, we've updated the responsive ultility classes to match the
new four media query approach of the grid system. That means we've:

* Added new `.visible-xs` and `.hidden-xs` classes
* Reassigns visible and hidden classes for small, medium, and large to
matching grid system media queries
* Updates docs examples to match grid system and account for fourth
utility range

-----

Fixes the following:

* #9135: fourth grid tier
* #9302: undoes previous range change for small grid system, so no need
to update any docs here
* #8755: consistent grid and responsive utilities schemas)
* #9195, #9216, and #9227: no more horizontal scrollbars
2013-08-12 00:28:50 -07:00
Mark Otto
95affa32e6 simplify padding in list groups and margins on badges within 2013-08-11 21:17:49 -07:00
Mark Otto
c52a3508c6 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-08-11 20:45:42 -07:00
Mark Otto
0819cfc450 addressing #9189 manually, part 7: thumbnails vars 2013-08-11 19:32:16 -07:00
Mark Otto
bf4900072d Drop the font-weight on panel labels since heading elements already get it 2013-08-11 19:20:23 -07:00
Mark Otto
85ec6e741d Follow up commit: fix collapse clearing and navbar brand/nav spacing 2013-08-11 19:19:44 -07:00
Mark Otto
ba8026e00f Refactor navbars to simplify things
* `.navbar-brand` is no longer centered, thus removing need for
max-width and a few lines of code
* Clear floats of `.navbar-brand` in the `.nav-collapse` like we did in
2.x, thus simplifying some clearing and other things.
* Restyle the `.navbar-toggle` button to align it's bars up with the
text and flow of the document.
* Restyle the `.navbar-brand` to not use padding on left/right as to
avoid negative margin and other fuckery. This limits the ability to put
a bg color on the brand, but I think that's fine for now.
2013-08-11 19:06:26 -07:00
Mark Otto
c2cfd3153b addressing #9189 manually, part 6: add a navbar margin var, but avoid the navbar-nav var because that should really be customizable 2013-08-11 18:32:52 -07:00
Mark Otto
e9650f51bf addressing #9189 manually, part 5: don't bother with a .label font-weight var and let's just use bold because windows hates 500 2013-08-11 18:10:42 -07:00
Mark Otto
a66cdb0c30 addressing #9189 manually, part 4: input group background var 2013-08-11 18:09:56 -07:00
Mark Otto
83f1a75e7a addressing #9189 manually, part 3: forms 2013-08-11 18:06:26 -07:00
Mark Otto
286636755a spacing 2013-08-11 17:47:53 -07:00
Mark Otto
58b90dae15 addressing #9189 manually, part 2: dropdown header and disabled link colors (and refactor commenting styles) 2013-08-11 17:47:30 -07:00
Mark Otto
8b76e0d0f0 addressing #9189 manually, part 1: code and pre vars 2013-08-11 17:23:19 -07:00
Mark Otto
32f6cbf9d0 Merge pull request #9211 from zacwasielewski/responsive-visibility-utilities-as-less-mixins
Make visibility utility classes responsive when used as LESS mixins
2013-08-11 17:03:24 -07:00
Mark Otto
83c236f570 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-11 16:07:57 -07:00
Mark Otto
1ff1dfb2bd fixes #9348 by ditching a comment 2013-08-11 16:07:45 -07:00
Mark Otto
9b07b999d2 Merge pull request #9286 from neilhem/3.0.0-wip
set img-circle class in percents
2013-08-11 15:15:53 -07:00
Mark Otto
39899e46cd Merge pull request #9229 from ggam/patch-13
Removed Glyphicons mention from carousel.less
2013-08-11 15:02:07 -07:00
Mark Otto
0561cfec6b fixes #8900: nuke empty space between panel heading and list group 2013-08-11 15:01:16 -07:00
Mark Otto
6b6241feaa fixes #9241: enable collapsing for labels, in addition to badges, when empty 2013-08-11 12:43:43 -07:00
Rakhat Jabagin
c07717ce47 set img-circle class in percents 2013-08-09 17:57:49 +06:00
liuyl
d557fa2839 navbar.less 2013-08-09 15:44:10 +08:00
liuyl
ee62c37f17 panels 2013-08-09 15:24:38 +08:00
Chris Rebert
d3a26a5afe Fix Find/Replace-o; good catch, @FagnerMartinsBrack!
Problem introduced in 6b23a66c29
2013-08-08 12:07:27 -07:00
Guillermo González de Agüero
f69833f9a9 Removed Glyphicons mention from carousel.less 2013-08-08 12:21:27 +02:00
Mark Otto
f3104a3e3b Merge pull request #9200 from geedmo/3.0.0-wip
Update to use @list-group-border-radius
2013-08-07 18:11:15 -07:00
Zac Wasielewski
407c966736 Make visibility utility classes responsive when used as LESS mixins 2013-08-07 16:47:49 -04:00
Guillermo González de Agüero
001e5d3da9 Added missing grid make-column mixins and fixed some inconsistencies
make-column() was still been use to generate "medium size" columns (col-sm), while make-small-column was creating the default columns (col).
I also changed @grid-float-breakpoint to @screen-small, as it was used in make-row() and I think it makes more sense here than the other.
2013-08-07 21:15:01 +02:00
Guillermo González de Agüero
f90ac58410 Updated panels.less to use variant-panel mixin 2013-08-07 20:19:12 +02:00
Guillermo González de Agüero
a24bc28de8 Added panel-variant mixin 2013-08-07 20:15:12 +02:00
geedmo
2f786aa0c1 Update to use @list-group-border-radius 2013-08-07 14:47:47 -03:00
Mark Otto
03258683ed property order 2013-08-07 00:28:44 -07:00
adamjacobbecker
a8d95d4721 Improve accessibility (Section 508, WCAG)
This PR significantly improves Bootstrap's accessibility for users of assistive technology, such as screen readers. Some of the these changes add additional markup to the source examples, but we believe that the sacrifice in readability is worth achieving more widespread usage of accessibility best-practices.

What was done
- Added lots of [WAI-ARIA attributes](http://www.w3.org/WAI/intro/aria)
- Added `.sr-only` helper class, that is only readable by screen readers (and invisible for all other users). This lets us - make progress bars and paginations accessible to screen reading users.
- Advised users to always use label elements. For inline forms, they can hide them with `.sr-only`
- Added 'Skip navigation' link
- Added "Accessibility" section to getting-started.html.

What *wasn't* done
- Contrast issues (twbs#3572)
- Tooltips (twbs#8469)
- Documentation re: usage of icons, since they now live in a separate repo

Major props to all that contributed: @bensheldon, @jasonlally, @criscristina, and @louh. Feel free to chime in, guys, if I've left anything out.
2013-08-06 21:58:09 -07:00
Mark Otto
d1e712d848 fixes #8959: only negative indent rows within .container (prevents horizontal scroll on full-width pages) 2013-08-06 21:11:16 -07:00
Mark Otto
18a4082553 fixes #8935: add gutter width param to grid mixins 2013-08-06 21:00:12 -07:00
Mark Otto
2af9cf10ce more twerks to the theme 2013-08-06 18:42:10 -07:00
Mark Otto
402dbfb617 Merge branch '3.0.0-wip' into bs3_theme
Conflicts:
	dist/css/bootstrap.min.css
2013-08-06 18:29:54 -07:00
Mark Otto
3f3dfc54e7 update use of mixins and add bg-colors where necessary 2013-08-06 18:05:37 -07:00
Mark Otto
076ec90d0b Merge branch '3.0.0-wip' of https://github.com/archanl/bootstrap into archanl-3.0.0-wip
Conflicts:
	less/mixins.less
2013-08-06 18:05:24 -07:00
Mark Otto
c3ac95333d Fixes #8749: prevent navbar nav from overlapping navbar toggle 2013-08-06 17:28:02 -07:00
Mark Otto
223e032150 Fix #9174: pad bottom of navbar collapsed content and clear floated contents 2013-08-06 16:39:18 -07:00
Mark Otto
7ae7aa6676 Merge pull request #8731 from nrw/patch-1
Format multiple badges in list-group-item
2013-08-06 15:41:50 -07:00
Mark Otto
c731961f9d fixes #9140: use correct var in tables 2013-08-06 11:40:02 -07:00
Mark Otto
2f1fcca6c5 Fixes #9145: Fix tooltip opacity
Update tooltips to not use RGBa colors so IE8 can have tooltips, too
(means we're now using `opacity`).
2013-08-06 11:18:53 -07:00
Mark Otto
db45a60cc8 Scope tablet classes to tablets range only
Fixes #9128
2013-08-05 20:55:30 -07:00
Mark Otto
219f0fe7c5 Merge branch '3.0.0-wip' into bs3_alerts_default_class
Conflicts:
	dist/css/bootstrap.min.css
2013-08-05 20:00:23 -07:00
Mark Otto
f3bd6dbf03 fixes #8647: remove focus outline on :focus of buttons in button groups 2013-08-05 16:16:58 -07:00
Mark Otto
ab090a29fb Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-05 16:15:43 -07:00
Mark Otto
98df9495cc remove dupe border-box 2013-08-05 16:15:36 -07:00
Mark Otto
2354cd1ae8 Merge pull request #9124 from geedmo/3.0.0-wip
Fix Issue #8175 - .input-group-addon broken in Firefox
2013-08-05 16:14:48 -07:00
Mark Otto
04dc221037 Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip
Conflicts:
	customize.html
	less/alerts.less
	less/badges.less
	less/button-groups.less
	less/buttons.less
	less/carousel.less
2013-08-05 16:03:10 -07:00
geedmo
c2737771b4 Fix Issue #8175 - remove lh for input-lg|sm 2013-08-05 19:58:38 -03:00
geedmo
7bc817bcba Fix Issue #8175 2013-08-05 19:43:39 -03:00
Mark Otto
9bbe8a020a Merge pull request #9121 from Flydiverny/alerts
Added padding variable for alerts and changed customize.html
2013-08-05 15:40:22 -07:00
Mark Otto
0faf42b4bc Remove dupe hover background color 2013-08-05 15:35:16 -07:00
Mark Otto
c4281f3919 Update labels to include a base class
* Builds on the new button styles by requiring a `.btn-default` for the
regular, gray labels
* Updates components examples to show new stuff
2013-08-05 15:30:28 -07:00
Markus Maga
9108ab9fb8 Added padding variable for alerts and changed customize.html Warning state (which doesn't exist anymore) 2013-08-06 00:06:57 +02:00
Mark Otto
844df9e001 Fixes #8732: unfucks disabled fieldset form example with form groups 2013-08-05 14:45:00 -07:00
Mark Otto
bfe76273a0 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-05 14:20:46 -07:00
Mark Otto
c15f5a89a0 Enable scrollable responsive nav bar
Fixes #9007 in a hopefully decent way
2013-08-05 14:19:32 -07:00
Chris Rebert
c321adf289 carousel.less: copyedit explanatory comment 2013-08-05 13:13:54 -07:00
Mark Otto
96136dbb56 Merge branch 'pullright' of https://github.com/liuyl/bootstrap into liuyl-pullright
Conflicts:
	dist/css/bootstrap.min.css
2013-08-05 12:20:52 -07:00
Mark Otto
e23906faca Fixes #8150: add .static-form-control for vertical alignment of static form text
- Also fixes the vertical alignment of labels in horizontal layouts on
account of the recent button and input padding changes
- Also changes the vertical alignment of the checkboxes and radios in
horizontal forms
2013-08-05 12:17:09 -07:00
Mark Otto
bac9e80a46 Fixes #8872: widen the carousel indicators to prevent wrapping 2013-08-05 11:59:32 -07:00
Mark Otto
a82ca0f9e1 Fixes #8795, a reoccurence of #1969 2013-08-05 11:47:12 -07:00
Mark Otto
01c46bfc0f More button updates
- Fixes #9113 (caret colors in dropdown buttons)
- Darken borders around buttons for contrast in button groups
2013-08-05 11:30:50 -07:00
Mark Otto
6af693d160 Fixes #8770: mobile-first (stacked by default) horizontal dls 2013-08-05 09:10:52 -07:00
Mark Otto
41eef69e6f Fixes #8786 (part 2): new default button styles
Also relevant: http://www.youtube.com/watch?v=Ldyx3KHOFXw
2013-08-05 09:02:59 -07:00
Mark Otto
2ee9bea890 Fixes #8786 (part 1): darken hover states on buttons 2013-08-05 08:52:22 -07:00
Mark Otto
e85b8f315f Fixes #9049: switch order of gradient mixin params to avoid problems for upgraders 2013-08-05 08:45:51 -07:00
Mark Otto
d6ed590e83 Clean up mixins, fix #9100 (no ms-keyframes)
- Spacing tweaks in the general mixins
- Add comments to transform mixins about IE support
- Remove `-ms-keyframes` because only IE10+ supports it, and without
prefix
2013-08-05 08:11:13 -07:00
Mark Otto
d2389ec7c4 fixes #8832 and #8823: remove max-width from .navbar-brand when not mobile 2013-08-05 00:50:40 -07:00
Mark Otto
11e46845b2 fixes #9063: add var for navbar border radius 2013-08-05 00:47:23 -07:00
Mark Otto
2a2acb6bf2 Merge branch 'patch-1' of https://github.com/jholl/bootstrap into jholl-patch-1 2013-08-05 00:07:19 -07:00
Mark Otto
a2823d0f5e Fixes #9061: Panel titles should inherit color when linked 2013-08-04 23:44:02 -07:00
Mark Otto
d95ff9da81 fixes #8805: ensure .active buttons in button groups behave like :active buttons 2013-08-04 23:27:15 -07:00
Mark Otto
f62ea2afe2 fixes #8793: remove padding-right from inputs with state changes 2013-08-04 23:20:55 -07:00
Mark Otto
73c048578d Enable input focus state customization
- Add new mixin to generate and customize focus state as needed
- Adds variable to set default color
- Include clear disclaimer about customizing this—it's about users', so
don't go making everything bright red and expect them not to be
confused or alarmed.

Relevant issues: #2742, #4185, #7942, #8171, #8610, #9044
2013-08-04 23:05:54 -07:00
Mark Otto
2641fed73f Fixes #8723: allow modals to not need the .fade class /cc @fat 2013-08-04 22:30:09 -07:00
liuyl
584759eac0 btngroups 2013-08-05 08:29:01 +08:00
Chris Rebert
23ef8c0c20 Greater standardization of sizing terminology
In class names:
* large => lg
* small => sm
* mini => xs ("Extra small")

In screen size categories:
* Tiny => Extra small
2013-08-03 21:39:57 -07:00
liuyl
4bbbf774a4 add line-height 2013-08-04 09:27:23 +08:00
Mark Otto
4582eb704f Merge pull request #9036 from eratzlaff/3.0.0-wip
Change value with variables for btn-large, btn-small and pagination
2013-08-03 16:50:08 -07:00
Maurice Fonk
bf0f3c7c1c using @line-height-computed in .navbar-nav link
When a user changed the @line-height-base/@line-height-computed var, the
nav-bar items would not scale appropriately.
2013-08-03 15:09:56 -04:00
James Holland
744b79a666 Update .navbar-toggle to match other navbar el
In place of commit #9040, fix #8844
And sizing .navbar-toggle more like .btn elem
+ change `position:absolute` to `position:relative`
+ remove `right: 10px` in favor of `float:right`
+ change to `height: 34px`
+ remove `top:` in favor of `.navbar-vertical-align` basis new height
+ change `padding:` to match `.btn` el
2013-08-03 10:28:17 -04:00
Elvis Ratzlaff
777ae911b6 Change value for padding on pagination to variables 2013-08-03 03:59:37 -04:00
Elvis Ratzlaff
2fd8689b08 Change line-height value with variable for btn-large and btn-small 2013-08-03 03:56:06 -04:00
Mark Otto
4bac2c567a Merge branch 'btngroup' of https://github.com/liuyl/bootstrap into liuyl-btngroup
Conflicts:
	dist/css/bootstrap.min.css
2013-08-02 20:19:20 -07:00
Mark Otto
a3be713f8f Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext
Conflicts:
	dist/css/bootstrap.min.css
2013-08-02 19:30:03 -07:00
Mark Otto
9435991ff0 move form layouts from input groups back to forms (messed this up in b281ad6409) 2013-08-02 18:48:44 -07:00
Mark Otto
6b850132d0 Remove requirement of .list-group-flush when list groups are in panels
Fixes #8900
2013-08-02 17:57:19 -07:00
Chris Rebert
0fefbbe659 fix typo in comment 2013-08-02 16:36:54 -07:00
Mark Otto
173dac4e54 Tighten up buttons and form controls
* Smaller padding on buttons and large buttons
* Same with inputs and large inputs
* Remove about 10px from height of large inputs/buttons and 4px from
regular ones

Fixes #8707 and #8700.

(Also relevant: #8711)
2013-08-02 15:09:48 -07:00
Mark Otto
d46e645a0f fixes #9015: bold links not semibold in alerts 2013-08-02 14:07:26 -07:00
Mark Otto
83eea13e63 Merge branch '3.0.0-wip-fixed-grid-push-pull-offset' of https://github.com/jtickle/fp-bootstrap into jtickle-3.0.0-wip-fixed-grid-push-pull-offset
Conflicts:
	dist/css/bootstrap.min.css
2013-08-02 13:58:06 -07:00
Jon Schlinkert
c017e19ed2 Resolves https://github.com/twbs/bootstrap/issues/9014. updates mixins to consistently use semicolons as argument separator. Rebuild to confirm, no diff in compiled CSS. 2013-08-02 15:33:03 -04:00
Mark Otto
dfd6c23527 Merge pull request #8967 from bassjobsen/patch-2
Update input-groups.less
2013-08-02 10:11:06 -07:00
Mark Otto
e4b113934d Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-02 10:02:46 -07:00
Mark Otto
048e19b892 Fixes #8996: shift placement of justified CSS for nav component 2013-08-02 09:42:50 -07:00
Mark Otto
d0b94ead9a Fix #9008: consolidate .alert-block styles into .alert 2013-08-02 09:32:58 -07:00
Guillermo González de Agüero
824d5d5de4 Fix #8944 2013-08-01 20:07:34 +02:00
Jeff Tickle
1583dd55e9 Added classes for lg-pull, lg-push, lg-offset, sm-pull, sm-push, sm-offset 2013-08-01 12:16:20 -04:00
Bass Jobsen
a5641b0cca Update input-groups.less
align inline radio and checkbox groups with their label for horizontal forms, see http://stackoverflow.com/q/17990310/1596547 (Question 2)
2013-08-01 16:05:07 +02:00
leonardovcid
15b98a0bb1 Correct comment which is showing a wrong mixin call example (mixins.less)
I was copy-pasting the example and it wasn't working. Then I found that the example in the comment was a typo.
Thanks
2013-08-01 14:39:28 +01:00
liuyl
56aedcb713 add table-layout 2013-08-01 11:26:12 +08:00
Mark Otto
e9413315b5 fixes #8937: align the dropdown menus in input groups 2013-07-31 18:06:20 -07:00
Mark Otto
7e19b6b02c add the theme file derp 2013-07-31 18:02:41 -07:00
Mark Otto
60e1f5e0e8 start with buttons 2013-07-31 17:48:22 -07:00
Cesidio Di Landa
3696530aaf Removed trailing whitespaces
Changed hard tabs to soft tabs
2013-07-31 18:11:11 +02:00
Archan Luhar
b9f59428f9 Removed background color from #gradient mixins to support transparent gradients 2013-07-30 19:30:24 -07:00
Mark Otto
e6ac348bfc Merge pull request #8726 from andreypopp/3.0.0-wip
Fix out of order variable declaration order
2013-07-30 14:14:51 -07:00
Mark Otto
96eef43dee Merge pull request #8852 from briannelsondesign/label_baselines
Adjusts vertical alignment of labels and badges
2013-07-30 14:07:00 -07:00
Chris Rebert
da98c5c2c3 trivial spacing fix 2013-07-30 12:35:39 -07:00
Brian Nelson
220fee80bf Improves label and badge alignment so text aligns with baseline 2013-07-30 11:23:25 -04:00
liuyl
7cfcfdfe64 make navbar-text float left 2013-07-30 09:30:21 +08:00
Mark Otto
8b5e41d900 Refactor .input-* sizing a bit by not chaining to .form-control (fixes #8672) 2013-07-29 17:30:36 -07:00
Mark Otto
09edfcf8c2 fixes #8670: move list group bg color to individual items for mo betta rendering 2013-07-29 17:23:08 -07:00
Mark Otto
5716355cda Restore mini button (fixes #8644) 2013-07-29 17:08:04 -07:00
Andrey Popp
e0395b425d reorder nav-justified classes 2013-07-30 03:27:32 +04:00
Mark Otto
d9c9afa6d1 add focus to button group active button behavior 2013-07-29 14:53:55 -07:00
liuyl
e77d134481 buttons 2013-07-29 14:09:41 +08:00
Nicholas Westlake
8858ef4dae Format multiple badges in list-group-item 2013-07-28 21:25:16 -05:00
Andrey Popp
0d7940d950 get rid of out of order variable declaration 2013-07-29 03:04:12 +04:00
Mark Otto
111dc1492f fixes #8714: correct stacked pills nav 2013-07-28 09:37:10 -07:00
syed
1aedb7862c move things around
Moved alerts, badges, button groups, buttons, carousel, close to
variables.less and customize.html
2013-07-28 17:32:08 +05:00
liuyl
efac0bf8d6 make pull-right !important 2013-07-28 14:05:47 +08:00
Mark Otto
ce57378705 fixes #8665: have modals use auto margin on sides and widen it instead of positioning and negative margin 2013-07-27 19:38:05 -07:00
Mark Otto
b281ad6409 Input groups overhaul
* Moves input groups CSS into separate file
* Moves input groups docs into the Components page
* Add support for radios and checkboxes in input groups to fix #8679
2013-07-27 18:56:31 -07:00
Mark Otto
e953c23019 fixes #8659: remove lingering .nav-header 2013-07-27 16:51:04 -07:00
Mark Otto
14f688c7fc fixes #8675: align horizontal form label and input 2013-07-27 16:37:45 -07:00
fat
d0cafdd3a8 rebuild + use serif arrows 2013-07-26 22:59:21 -07:00
Mark Otto
88dd20e6ac Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-07-26 22:18:16 -07:00
Mark Otto
bf5434dbec Fix up dropdowns being incorrectly positioned on nav pills 2013-07-26 22:11:58 -07:00
fat
2cf1851d9f use transforms to make the dialog smooooth 2013-07-26 22:09:31 -07:00
Mark Otto
88887f8c00 Undo changes from #8582 because it made links uneven on desktop
/cc @salman-javed-confiz
2013-07-26 21:49:35 -07:00
Mark Otto
8349236f8c Twerk lead font-size for mobile devices 2013-07-26 21:12:48 -07:00
fat
38044e55ae rebuild + fix #2539 2013-07-26 20:44:35 -07:00
fat
e2d4cf5f68 change how collapse works - collapse, collapsing, and in 2013-07-26 20:34:39 -07:00
Mark Otto
01c6617f79 Update inline and horizontal forms
* No more need for `.row.form-group`--only need `.form-group`
* Change tag selectors for inline form to use `.form-control`
* Docs improved to explain what's happening
2013-07-26 15:51:25 -07:00
Mark Otto
68827689e8 Use .form-control in input sizing CSS 2013-07-26 15:41:16 -07:00
Mark Otto
1cf0a07f17 Merge branch 'patch-3' of https://github.com/jholl/bootstrap into jholl-patch-3
Conflicts:
	css.html
2013-07-26 15:08:45 -07:00
Mark Otto
444973e54d Fixes #8605: use .form-control in .input-group instead of HTML tags 2013-07-26 14:31:24 -07:00
Mark Otto
9e98b733f1 Vars update
* Drop progress bar text-shadow
* Reorganize popover and tooltip vars and fix complier error due to
missing `;`
* Run `grunt`
2013-07-26 11:08:27 -07:00
Mark Otto
e62e992b88 Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip 2013-07-26 10:44:46 -07:00
Yulong Liu
e4300fa1bf fix background of btn-link 2013-07-26 22:27:55 +08:00
Yulong Liu
a2f120a7aa remove background:none 2013-07-26 21:59:50 +08:00
James Holland
2e7593a40d Update forms.less to remove .form-horizontal .row + .row
use .form-group to apply consistent vertical spacing on form rows
2013-07-26 09:04:39 -04:00
syed
1b8ba0d159 move things around :)
Moved pager, pagination, popovers, tooltip, progress bars & type
properties to variables.less
2013-07-26 17:04:15 +05:00
Fred Delrieu
06980ae5a1 Small typo 2013-07-26 10:10:35 +02:00
Mark Otto
210ee63693 Fixes #8586: add addional color text classes to apply all of branch colors easily 2013-07-26 00:18:18 -07:00
Mark Otto
56404bc89b Add .panel-title to panel component to mirror modals
/cc @leeaston
2013-07-25 21:16:43 -07:00
Mark Otto
2a4a6fe0f0 Merge pull request #8611 from twitter/bs3_form_classes
Updated BS3 form classes
2013-07-25 20:31:11 -07:00
Mark Otto
35aad07456 Add comment about opacity mixin not being used 2013-07-25 19:56:04 -07:00
Mark Otto
27cedf71d5 Update form validation states
* Once again no longer applies to single inputs (this is a bit simpler,
but I'm open to new ideas) but the entire set of inputs, labels, and
help text within a particular element. However, the styles are not too
dependent on markup or layout, so they're super flexible.
* Simplified the markup in the validation docs examples to match latest
changes.
* Renamed `.form-state-validation` mixin to `.form-control-validation`
to match naming of prev commit.
2013-07-25 19:45:14 -07:00
Mark Otto
71d3d2c3f6 Spacing 2013-07-25 18:55:00 -07:00
Mark Otto
13bc74b636 Refactor forms styles
* Reorganize forms.less
* Change from attribute selectors to `.form-control`. Few lines, less
specific (meaning easier overrides as `element[type=""]` is more
specific than a class), less intrusive, and more performant.
* Add `.form-group` for basic spacing in vertical forms.
* Remove (unnecessary?) `margin: 0;` from `form` element (as far as I
can tell no browser sets that anyway).
2013-07-25 18:29:51 -07:00
Chris Rebert
90fb40b707 twbs ALL the links 2013-07-25 12:24:13 -07:00
Mark Otto
c7995cf964 move some thing around 2013-07-25 10:50:59 -07:00
Mark Otto
f94d9ce096 Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into 3.0.0-wip 2013-07-25 10:11:30 -07:00
Mark Otto
768e7edabf fixes #8571 completely: add better th support for table classes 2013-07-25 10:01:42 -07:00
Geremia Taglialatela
0017f7fca4 Navbar toggle is not vertically aligned (3.0.0-wip) with custom navbar height
When using navbar heights higher that default, the navbar-toggle button is not centered.

Fiddle demonstrating this issue (compiled with `@navbar-height: 60px;`): http://jsfiddle.net/tagliala/mRVMe/2/


Another fiddle with the proposed fix: http://jsfiddle.net/tagliala/mRVMe/3/
2013-07-25 17:09:12 +02:00
syed
a06afd8320 Moved navs inline properties to variables.less and customize.html & nav-customize.html 2013-07-25 12:43:14 +05:00
syed
f8d5a974bc Moving navbar inline properties to variables.less and customize.html 2013-07-25 11:58:25 +05:00
Mark Otto
1f40da9676 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-07-24 16:53:34 -07:00
Mark Otto
51de38e5b9 make again 2013-07-24 16:52:47 -07:00
Mark Otto
61ac20ebb5 Merge branch '3.0.0-wip' of https://github.com/salman-javed-confiz/bootstrap into salman-javed-confiz-3.0.0-wip 2013-07-24 16:42:13 -07:00
Mark Otto
a36f444c25 Merge pull request #8583 from liuyl/disabled
set cursor to not-allowed for disabled elements
2013-07-24 16:32:25 -07:00
Mark Otto
3080104642 make footer border color use header border color in modals 2013-07-24 16:31:17 -07:00
syed
2e6fcefc5c Moved modals inline properties to variables.less
In this commit I moved modals.less inline properties to variables.less
and also added those variables to customize.html.
2013-07-24 18:43:21 +05:00
liuyl
7e9532dabe set cursor to not-allowed for disabled elements 2013-07-24 17:10:27 +08:00
Salman Javed
0caab585f5 issues fixed for nav-justified on pills on android default browser. 2013-07-24 13:39:16 +05:00
Mark Otto
18157e9f39 Run make on prev commits 2013-07-23 23:48:17 -07:00
Mark Otto
9029b4c06c Update forms vars
* Reorganize layout
* Add input group var
* Add legend border var
2013-07-23 23:25:46 -07:00
Mark Otto
398038c798 Update dropdown vars
* Update `.nav-divider` mixin to simplify to a 1px line (one value
instead of two in parametric mixin)
* Rename and consolidate dropdown caret vars
* Add vars to Customizer
2013-07-23 23:18:53 -07:00
Mark Otto
cdf6019e11 Update code vars
* Drop the `rgba()` border and fallback because fuck that noise
* Add vars to customizer
* Remove rogue `:`
2013-07-23 23:13:15 -07:00
Mark Otto
ba954db159 Update close vars
* Remove dupe hover color var (again, it's not necessary to have it's
own var here since we're controlling it via `opacity`)
* Add to customizer
2013-07-23 23:09:06 -07:00
Mark Otto
a5cc1300f6 Update carousel vars
* Remove `@carousel-control-hover-color` since that's just the same as
the default control color and all we change is `opacity` (it's required
for specificity).
* Add vars to customizer
* Update customizer nav to include new section
* Remove the `li` from the var names
* Consolidate and simplify `text-shadow` vars
2013-07-23 23:03:57 -07:00
Mark Otto
b0dd2f902d Update and add @btn-hover-color to Customize page 2013-07-23 22:53:30 -07:00
Mark Otto
1803b2f09e Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip 2013-07-23 22:49:13 -07:00
Mark Otto
1d1bd62598 Fixes #8571: allow table classes in thead and tfoot 2013-07-23 22:27:49 -07:00
Mark Otto
4cec956e0c Drop rounded corners on .table-bordered
* Cuts  close to 100 lines of CSS from the table CSS
* File size aside, this drastically simplifies CSS for folks looking to
build on top of the `.table-bordered` option as a starting point
2013-07-23 10:48:30 -07:00
Mark Otto
b5f2482a58 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-07-23 10:19:04 -07:00
Mark Otto
8aa3c375f0 No more left margin on dd elements, fixes #8567 2013-07-23 10:18:34 -07:00
Francis Brunelle
4b9cacae91 @badge-bg should be @gray-light not #f5f5f5 2013-07-23 00:05:45 -04:00
Mark Otto
12468c6103 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	dist/css/bootstrap.min.css
2013-07-21 08:52:25 -07:00
Mark Otto
e78ba0ff82 Merge pull request #8545 from liuyl/refactor-btngroups
refactor button-groups.less
2013-07-21 08:49:52 -07:00
liuyl
f5fc6254c7 refactor button-groups.less 2013-07-21 20:03:59 +08:00
liuyl
be2693369d remove useless display:inline-block 2013-07-21 19:44:30 +08:00
Mark Otto
a63db4d2f9 Update file input to remove height and line-height
This particular form control is wildly inaccurate across browsers, so
we're removing the `height` and `line-height`, but adding `display:
block` so it renders similarly to our other inputs.
2013-07-20 21:09:03 -07:00
Mark Otto
51dfa21009 Remove more commented out CSS from forms 2013-07-20 19:32:21 -07:00
Mark Otto
732e4196fb Remove commented out CSS 2013-07-20 19:31:56 -07:00
syed
330f40c864 moving forms, labels and list-group to variables.less 2013-07-20 13:38:27 +05:00
syed
1683e6767a moving code and dropdowns to variables.less 2013-07-20 13:17:56 +05:00
syed
c2e37414d8 Move inline properties to variables.less
moved buttons.less, carousel.less & close.less in this commit
2013-07-20 12:56:20 +05:00
Mark Otto
4b7f63a3a2 Update vars for badges, breadcrumbs; update customize page 2013-07-20 00:03:08 -07:00
Mark Otto
b6238c5f20 Fixes #8385: update carousel captions
* No longer hidden by default--up to users to figure that part out with
longer content
* Cleaned up styles and spacing
2013-07-19 17:36:03 -07:00
Mark Otto
95b9f44190 Fixes #8278: fix on print 2013-07-19 16:49:38 -07:00
Mark Otto
4b0fa356f3 Variables reorganization and breadcrumbs update
* Place component vars alongside the rest of the component vars
* Redo some of the breadcrumbs code to add a var and remove
`text-shadow`
2013-07-19 11:44:35 -07:00
syed
65ee36a7bf Improved and followed pattern suggestions 2013-07-19 23:14:13 +05:00
syed
5e898fa2a1 move breadcrumb.less inline properties and also added @color-2 missed in last commit 2013-07-19 18:39:51 +05:00
syed
b37127e2fc move badges inline properties to variables.less 2013-07-19 18:29:19 +05:00
syed
95be924926 Move accordion inline properties to variables.les 2013-07-19 18:18:01 +05:00
Mark Otto
e440ff4b3f <input> and <select> sizing update
Restores `font-size` and more to the `<select>` element while also
changing from `min-height` to `height` for input sizing.

Fixes #8520 as opened by @ShaunR (would've merged that PR but I moved
everything around right before).
2013-07-18 19:53:32 -07:00
Mark Otto
820558916f Fixes #8516: correct input-small and input-large on select elements 2013-07-18 15:36:41 -07:00
Mark Otto
7d9fb1dda7 Jankily fix input group wrapping with button groups in Firefox (fixes #8321, #8429, and #8067) 2013-07-18 15:28:38 -07:00
Chris Rebert
86efc140e2 add comments to gloss Unicode codepoint hex 2013-07-18 11:49:39 -07:00
Mark Otto
b372661a17 fixes #8206: Use navbar height var to compute vertical padding on navbar-brand 2013-07-18 02:23:38 -07:00
Mark Otto
64efa86036 for some reason iOS is shitting the bed on the .navbar-toggle unless it gets fixed dimensions 2013-07-18 02:19:13 -07:00
Mark Otto
898ee8f13b twerk comment 2013-07-18 01:46:31 -07:00
Mark Otto
6e04925328 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-18 01:25:28 -07:00
Mark Otto
e72b524d41 Fixes #8374: ensure navbar is always at least 50px 2013-07-18 01:25:08 -07:00
fat
6ec8a1e44f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	docs/assets/js/bootstrap.min.js
2013-07-18 01:08:19 -07:00
Mark Otto
181b276774 Fixes #8397: better navbar padding with grid gutter stuff 2013-07-18 01:04:54 -07:00
fat
37e899d766 get button js working with actual form elements p cooll 2013-07-18 00:59:31 -07:00
Mark Otto
d87431a29e spacing and local var rename 2013-07-18 00:56:36 -07:00
Mark Otto
0c45458fcc Merge branch 'patch-1' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-1 2013-07-18 00:55:36 -07:00
Mark Otto
02bddac091 Merge pull request #8380 from joeybaker/patch-1
Remove unneeded prefixes from some mixins
2013-07-18 00:50:15 -07:00
Mark Otto
8dc7807dcd change characters 2013-07-18 00:48:02 -07:00
Mark Otto
1363ffa473 Merge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into mauricew-3.0.0-wip 2013-07-18 00:43:48 -07:00
Mark Otto
e7bc9e1c3d Vurrriables and shit 2013-07-18 00:23:35 -07:00
Mark Otto
79a10feb7a Fixes #8452: adds .active to table classes 2013-07-18 00:10:22 -07:00
Mark Otto
e5bfd8c00b Fixes #8441: remove @font-size-mini 2013-07-17 23:56:20 -07:00
Mark Otto
bc79f8a399 Bump tooltips to use @font-size-small (11px to 12px) 2013-07-17 23:55:58 -07:00
Mark Otto
e57758cbb4 Drop .nav-header for .dropdown-header
* Since we no longer have `.nav-list`, I've nuked the `.nav-header`
* However, dropdowns can still have section headings, so I've kept that
around with the addition of `.dropdown-header`
* Restyled it a smidge as well
2013-07-17 23:54:09 -07:00
Mark Otto
3604b86806 fixes #8477: use var for rounded image border-radius 2013-07-17 23:41:05 -07:00
Mark Otto
d3a139622e fixes #8491: add vars for table padding 2013-07-17 23:34:04 -07:00
Mark Otto
cb9cc972ed Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-16 13:36:02 -07:00
Mark Otto
5967ef64a3 remove margin from left side of navs since it's no longer being set 2013-07-16 11:49:04 -07:00
Mark Otto
522004e67a remove webkit-overflow-scrolling from modal for now /cc #8495 2013-07-16 11:26:48 -07:00
Chris Rebert
76063ea739 Add missing backtick in comment 2013-07-16 10:49:59 -07:00
Mark Otto
89555cb61c Merge pull request #8453 from cvrebert/retina-rename
rename .retina-image => .img-retina
2013-07-11 14:17:11 -07:00
Bass Jobsen
3a17578a94 Update forms.less
All variables should be set in variables.less?
2013-07-11 21:24:06 +02:00
Chris Rebert
a41fd16da2 rename .retina-image => .img-retina 2013-07-11 12:07:35 -07:00
liuyl
0d5c3c2ecf simplify type.less 2013-07-09 09:22:36 +08:00
Mark Otto
1045226544 Merge pull request #8415 from cvrebert/code.less-cleanup
code.less: cleanup styles that get immediately overriden later in the file
2013-07-08 06:57:37 -07:00
Mark Otto
f69afc1b23 Merge pull request #8414 from cvrebert/dropdowns-LESS-nesting
use LESS nesting more in dropdowns.less
2013-07-08 06:56:57 -07:00
Mark Otto
b2b09f679a Merge pull request #8413 from cvrebert/misc-less-refactoring
refactor {badges,jumbotron,media,popover,print}.less (mostly nesting)
2013-07-08 06:56:35 -07:00
Mark Otto
e0d1b83e25 Merge pull request #8412 from cvrebert/pagination-nesting
use nesting more in pagination.less
2013-07-08 06:55:50 -07:00
Mark Otto
46378c7ba3 Merge pull request #8411 from cvrebert/navbar-LESS-nesting
more nesting in navbar.less
2013-07-08 06:55:16 -07:00
Chris Rebert
e40aee9c9e code.less: cleanup styles that get immediately overriden later in the file 2013-07-07 20:03:52 -07:00
Chris Rebert
7e154740f3 use LESS nesting more in dropdowns.less 2013-07-07 19:54:07 -07:00
Chris Rebert
dcf1b60f2b refactor {badges,jumbotron,media,popover,print}.less (mostly nesting) 2013-07-07 19:46:20 -07:00
Chris Rebert
6bda16f6be use nesting more in pagination.less 2013-07-07 19:30:51 -07:00
Chris Rebert
d9cd5e4e0c more nesting in navbar.less 2013-07-07 19:22:18 -07:00
Chris Rebert
6e03639af2 more nesting in buttons.less 2013-07-07 19:16:38 -07:00
Mark Otto
084291aac7 Merge pull request #8408 from cvrebert/progress-bar-variant-mixin
extract .progress-bar-variant mix-in
2013-07-07 18:27:43 -07:00
Mark Otto
906d04a4aa Merge pull request #8407 from cvrebert/label-variant-mixin
extract .label-variant mix-in
2013-07-07 18:26:54 -07:00
Mark Otto
65141338df Merge pull request #8406 from cvrebert/navs-nesting
more nesting in navs.less
2013-07-07 18:26:26 -07:00
Mark Otto
03becfb9e3 Merge pull request #8405 from cvrebert/button-groups-nesting
more nesting in button-groups.less
2013-07-07 18:25:48 -07:00
Chris Rebert
d2fb35d546 extract .progress-bar-variant mix-in 2013-07-07 15:44:18 -07:00
Chris Rebert
a7dd1088d2 extract .label-variant mix-in 2013-07-07 15:38:43 -07:00
Chris Rebert
15bd6eadf3 more nesting in navs.less 2013-07-07 15:31:18 -07:00
Chris Rebert
f12d6401f2 more nesting in button-groups.less 2013-07-07 15:27:06 -07:00
Chris Rebert
e757ddd60f extract .alert-variant mix-in 2013-07-07 15:21:40 -07:00
Maurice Wahba
8a84da6341 Carousel no longer dependent on glyphicons
Used laquo/raquo for control buttons
Updated docs
2013-07-06 22:26:40 +04:00
Mark Otto
fffb37ecea Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-05 14:24:40 -05:00
Mark Otto
3279181f42 Merge pull request #8378 from liuyl/aftertosibling
optimize breadcrumb
2013-07-05 12:23:14 -07:00
Mark Otto
30c138c4bf Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-05 14:22:46 -05:00
Mark Otto
dd691b5c36 Merge pull request #8390 from liuyl/typeahead
delete typeahead style
2013-07-05 12:21:49 -07:00
Mark Otto
4f922d6e3f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-05 14:21:33 -05:00
Mark Otto
61823dbff1 Move hr to scaffolding.less (out of type.less) and simplify styles 2013-07-05 14:21:05 -05:00
Mark Otto
88a266b800 Add tfoot back (addresses more than #8387) 2013-07-05 14:15:00 -05:00
liuyl
969529c80e refactor pagination 2013-07-05 20:18:57 +08:00
liuyl
3bd42511f4 refactor pagination 2013-07-05 20:17:20 +08:00
liuyl
e6529e9588 delete typeahead style 2013-07-05 15:09:16 +08:00
Joey Baker
2d56997c61 Remove unneeded prefixes
Per caniuse, prefixes for transitions and transforms can be reduced to just `-webkit` and `-ms`. http://caniuse.com/#search=transform
http://caniuse.com/#search=transition
2013-07-03 08:11:28 -07:00
liuyl
5b69d34053 use sibling selector instead of pseudo selector 2013-07-03 20:37:36 +08:00
Chris Rebert
da072fff21 refactor tables.less to use nesting more 2013-07-02 11:42:37 -07:00
Mark Otto
749dc35328 comma for the guardian angel /cc @cvrebert 2013-07-01 20:18:44 -07:00
Mark Otto
a049dcb7f6 Merge branch '3.0.0-responsive-tables' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-responsive-tables
Conflicts:
	less/mixins.less
2013-07-01 20:06:16 -07:00
Mark Otto
9ed9fba460 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-01 19:49:49 -07:00
Mark Otto
5b2d933524 Fixes #8350: unfuck Chrome number input element cursor /cc @cvrebert @eintnohick 2013-07-01 19:49:29 -07:00
Mark Otto
526d1399c5 Merge pull request #8348 from Rowno/compiled-font-shorthand
Prevent the font shorthand from getting compiled as division
2013-07-01 19:43:15 -07:00
Mark Otto
08b3515fd7 fixes #8345: use inline-block on .img-responsive 2013-07-01 19:42:43 -07:00
Mark Otto
f8eb9136eb Merge pull request #8352 from liuyl/simplifytable
simplify tables.less
2013-07-01 18:23:17 -07:00
Mark Otto
9da90adb4c fixes #8068: add .help-block to form field state mixin 2013-07-01 18:21:19 -07:00
Mark Otto
c9df1db502 fixes #7367: slightly larger carousel indicators 2013-07-01 18:16:59 -07:00
Mark Otto
7ad9fbef8b Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-01 17:32:14 -07:00
Mark Otto
a27ecfccf3 Make more components mixin-friendly 2013-07-01 17:32:07 -07:00
Julian Thilo
fea69df80c Fix responsive utilities for table elements
This change prevents situations where specificity causes some rules to
be overridden by the ones intended for mobile.
* Added mixin `responsive-invisibility()`
* Swapped out `display: none !important;` for new mixin
2013-07-01 21:13:57 +02:00
liuyl
e5e9d5916a simplify tables.less 2013-07-01 20:29:41 +08:00
Roland Warmerdam
2e8752b26f Prevent the font shorthand from getting compiled as division 2013-07-01 10:51:08 +12:00
Francis Brunelle
6a20810ca4 reset left padding for .media-list, .pagination and .pager 2013-06-29 16:06:14 -04:00
Mark Otto
0a92efce0c Nuke hella things
* Any mentions of .btn-mini
* Old docs page that somehow found it's way back
2013-06-28 09:24:46 -07:00
Mark Otto
09cdee2f03 Overall responsive img styles
`img`s are no longer responsive by default. Instead, use
`.img-responsive` as a class or mixin. Existing `.thumbnail > img` and
`.img-thumbnail` classes now make use of this as a mixin as well.
2013-06-28 00:09:10 -07:00
Mark Otto
88ece4fc59 fixes #7961 a bit: adds css for extra tooltip placement options. /cc @fat you just need dat js prolly 2013-06-27 20:50:21 -07:00
Mark Otto
bf3c5e070e remove submenus. for more context: http://www.youtube.com/watch?v=ggWyUEuGcWY&feature=youtu.be&t=48s 2013-06-27 20:49:29 -07:00
Mark Otto
0682068929 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-27 20:17:59 -07:00
Mark Otto
69b7c5a2af Merge pull request #7995 from hrach/patch-3
Fixed mixin btn-pseudo-state background for [disabled] buttons
2013-06-27 20:17:48 -07:00
Mark Otto
d9a662ed1d fixes #7977: prevent some table bullshit on input groups 2013-06-27 20:15:44 -07:00
Mark Otto
5156234c23 update grid col mixin to use latest css from grid cols 2013-06-27 19:54:30 -07:00
Mark Otto
ca8ca2177f fixes #4852: popover carets fully functional in ie8 holy carp wtfbqq huge shoutout to @PumaOmaR 2013-06-27 19:36:56 -07:00
Mark Otto
62f76ad33f Merge branch '3.0.0-wip' into bs3_remove_icons
Conflicts:
	docs/components.html
2013-06-27 18:49:05 -07:00
Mark Otto
cb483b6758 Add parens so sublime picks up on syntax highlighting 2013-06-27 18:45:08 -07:00
Mark Otto
c9ccbd2cf0 Fixes #8329: add !important to .hidden 2013-06-27 18:43:29 -07:00
Mark Otto
cc43ba35d7 Merge pull request #8301 from cvrebert/patch-3
Fix spelling in comment
2013-06-25 17:11:31 -07:00
Mark Otto
0f371d409f Merge pull request #8300 from cvrebert/patch-2
Fix typo in comment
2013-06-25 17:11:20 -07:00
Mark Otto
2da485d6bb Merge pull request #8299 from cvrebert/patch-1
Spelling in comment
2013-06-25 17:10:59 -07:00
Chris Rebert
d82941265c Fix 2 typos 2013-06-25 17:07:51 -06:00
Bass Jobsen
321190535f Update mixins.less
Add a the function .make-small-column. See also http://stackoverflow.com/a/17308128/1596547
2013-06-26 01:05:45 +02:00
Chris Rebert
8ee0e39ef9 Fix spelling in comment 2013-06-25 17:05:26 -06:00
Chris Rebert
d2b5f4e45c Fix typo in comment 2013-06-25 17:03:57 -06:00
Chris Rebert
64a01f01cb Spelling in comment 2013-06-25 17:01:46 -06:00
Mark Otto
ac90fbf4d8 Merge pull request #8297 from cvrebert/patch-1
rm pre{white-space:pre-wrap;} since redundant to Normalize
2013-06-25 14:57:41 -07:00
Chris Rebert
1bb159aa6f rm fallback white-space for <code>
If my analysis is right, this should be unnecessary.
2013-06-25 15:53:48 -06:00
Chris Rebert
9b97d63188 rm pre{white-space:pre-wrap;} since redundant to Normalize.css 2013-06-25 14:48:57 -07:00
Mark Otto
327a951ca3 Move mixin to mixins.less 2013-06-25 13:32:21 -07:00
Chris Rebert
83c4073ec7 refactor responsive-utilities slightly 2013-06-25 12:23:56 -07:00
Luis Hdez
9ed5b5e653 Fix line breaks on add-ons with spaces 2013-06-25 14:34:57 +02:00
Mark Otto
573a197417 Move grid offsets to desktop only (fixes #8229) 2013-06-23 15:15:42 -07:00
Mark Otto
b76d98eee3 Fixes #8211: restore proper table grid class behavior
Needs work though—we shouldn't be setting this stuff with the attribute
selectors, but it's the easiest solution for now.
2013-06-23 15:05:50 -07:00
Mark Otto
2a47037ab0 Fixes #8266: remove unnecessary strong and em styles 2013-06-23 10:24:50 -07:00
Francis Brunelle
7fd121fecb Reset left padding for .carousel-indicators 2013-06-22 21:38:02 -03:00
Aristeides Stathopoulos
72183d9a45 Update variables.less 2013-06-22 18:45:25 +03:00
Aristeides Stathopoulos
aad76f21f6 Update navbar.less 2013-06-22 18:44:04 +03:00
Aristeides Stathopoulos
b51e1e0d8c Update navbar.less 2013-06-22 14:41:31 +03:00
Aristeides Stathopoulos
2ba3b47dc6 Update navbar.less
navbar padding-left and padding-right should be calculated from the grid-gutter-width variable.
2013-06-22 14:34:17 +03:00
Mark Otto
b0e943399d Improve alignment of navbar brand and fix up left padding on list groups 2013-06-21 17:21:44 -07:00
Mark Otto
ef8e5853cb Fixes #8154: enforce full width .navbar-nav.pull-right in mobile
Prevents an odd alignment issue in mobile views by forcing the nav
links to be full width without undoing the float.
2013-06-20 17:15:09 -07:00
Mark Otto
82f9de9459 Fixes #8159: Be more specific about disabled inputs to avoid iOS bug
Attached disabled styles to the exact input types rather than all
inputs and reseting the checkbox/radios. If setting `background-color:
transparent;`, iOS renders no background on the disabled control.
2013-06-20 17:02:10 -07:00
Mark Otto
90d4343f66 Fixes #8093: Removes invalid focus styles on inputs 2013-06-20 16:42:05 -07:00
Mark Otto
2aec6dae59 Fixes #7730: Better hiding of empty titles in popovers
If the popover's title contains no text, hide it via JS. Previously was
done via CSS's `:empty` property, but that doesn't work in IE8, so JS
it is.

/cc @fat becaue I probably did this wrong <3
2013-06-20 16:02:05 -07:00
Mark Otto
eee719f608 Merge pull request #8193 from mediafreakch/3.0.0-wip
Fixes broken layout for .input-group-addons within .input-large. Follows...
2013-06-20 15:44:08 -07:00
Mark Otto
f64fe29003 Move Glyphicons into their own repo
Removes the icon fonts and associated docs and LESS code from the core
repo and into twbs/bootstrap-glyphicons.
2013-06-20 15:40:37 -07:00
Mark Otto
1b89a63a48 Use @font-family-base for headings font-family variable 2013-06-20 15:38:18 -07:00
Mark Otto
3c60645ec0 Merge pull request #8237 from luishdez/feature/var-heading-family
Add heading font family variable
2013-06-20 15:36:49 -07:00
nextgenthemes
110fc88601 rename '.navbar .nav' to '.navbar-nav' 2013-06-20 19:40:30 +03:00
Luis Hdez
cd09f3213b Add heading font family variable 2013-06-20 12:50:30 +02:00
Mark Otto
546d40a143 Add support for tr, th, and td to responsive utilities 2013-06-18 19:16:50 -07:00
Edgar Schnueriger
6a79f53899 Use correct font-size to calculate input-heights 2013-06-18 21:43:34 +02:00
Mark Otto
4b4079b224 Addresses #8199: darker default button 2013-06-18 11:16:43 -07:00
Mark Otto
bcc3af4b2a Fixes #7599: Improved print styles for a few key components
* Updates `.table` to always enforce a solid white background
* Update button groups and dropdowns to always use black carets
* Add a 1px solid black border to labels (in the future we should add a
border to these perhaps for better printing)
2013-06-17 20:56:02 -07:00
Mark Otto
37f4a25be4 Better clearing on .dl-horizontal for empty dd elements
Instead of clearing the entire `.dl-horizontal`, we've moved the
clearfix mixin to the `dd` level to solve two problems in one: empty
`dd`s mid-list, and empty `dd` as the last child.

Addresses a few old issues, including #2824, #3819, #3821, #4062,
#6707, and #7180.

Sorry that took so long :D.
2013-06-17 14:21:16 -07:00
Mark Otto
4436e727ed Properly unstyle the .list-unstyled class by switching from margin to padding
Also add better comments
2013-06-17 14:21:16 -07:00
Mark Otto
84c0dc13ba Remove explicit, unncessary line-height on li elements 2013-06-17 14:21:16 -07:00
Mark Otto
731cbb302e Better base ul and ol styles
Turns out we were nixing the default browser spacing for bullets and
numbers, so this reverts that and instead just twerks the top/bottom
`margin`.
2013-06-17 14:21:16 -07:00
Edgar Schnueriger
b0d202455d Fixes broken layout for .input-group-addons within .input-large. Follows 6ce154c7ed 2013-06-17 18:56:17 +02:00
FLOKER
125e472d6f redundant lines removed 2013-06-16 22:18:46 +02:00
Mark Otto
ac3521fef4 Remove WebKit overflow scrolling for now 2013-06-16 10:56:30 -07:00
Mark Otto
6ce154c7ed Fixes #8175: Update input min-height vars to fix FF21 input rendering 2013-06-15 11:46:13 -07:00
Mark Otto
d74a9634b0 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-09 23:45:23 -07:00
Mark Otto
441bbe1998 Another grid update
* Update docs to include table of grid levels and behaviors
* Change from .col-md to .col-sm to match existing size variables we use elsewhere
* Keep .col-lg as-is though for simplicity as we won't likely add a fourth level of the grid
* Combine responsive .container breakpoints with grid breakpoints in grid.less
* Other misc docs updates
2013-06-08 18:34:16 -02:30
William Ghelfi
df5ddeb7cc Set validation states also for addons 2013-06-06 21:00:32 -04:00
Mark Otto
45c5b4e45c restore .col-*-12 classes for now 2013-06-03 21:51:35 -07:00
Mark Otto
286955167a prep for less 1.4 with double parens in functions 2013-06-03 21:48:52 -07:00
Mark Otto
a05f6d4cea fixes #8066: add missing % functions to grid less code 2013-06-03 11:58:38 -07:00
Mark Otto
2f70477621 fixes #8059: update navbar responsive break variable 2013-06-02 15:51:28 -07:00
Mark Otto
21441f1292 Move the grid offset, push, and pull classes to be tablets-up instead of desktop-up 2013-06-02 15:33:42 -07:00
Mark Otto
19d0726609 Grid updates
- Removed mixins for generating grid classes
- Thus, we manually declare every grid class, from 1-11 (12th unit is
excluded as that's the same as no grid columns)
- No more need for `.col` base class (yay!)
- Negative indent the rows at tablets and above once again (ugh, still
working through this part)
- Add support for `.col-md` for tablet-specific grid columns
- Still need to figure out offsets, pushes, and pulls on other
devices—right now only available on desktop
2013-06-02 13:38:45 -07:00
Mark Otto
b62fa23d9a Merge pull request #8006 from aristath/3.0.0-wip
using screen-size variables for grids
2013-06-02 11:58:30 -07:00
Mark Otto
75db70a6c2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-02 11:57:28 -07:00
Javier Martinez Fernandez
c89a6edf09 Remove form-actions-bg
If form-actions has been removed, this variable is no needed anymore.
2013-05-29 22:09:33 +03:00
Mark Otto
8899c30f16 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-27 19:23:17 -07:00
Aristeides Stathopoulos
6fda25b4c1 Adding variables for container sizes 2013-05-27 23:00:39 +03:00
Aristeides Stathopoulos
2b088ef44e using screen-size variables for grids 2013-05-27 19:33:14 +03:00
Jan Škrášek
33b5c32c8c Fixed mixin btn-pseudo-state background for [disabled] buttons 2013-05-26 18:14:25 +02:00
Mark Otto
60575dfb46 Gradients refactor
* Add start and end support to the horizontal gradient as well
* Change all variables from camelCase to use-dashes
* Better comments in the gradients mixins area
* Update current uses of gradients in dropdowns and carousel to specify only two values by direct assignment of variables
2013-05-25 13:16:15 -07:00
Mark Otto
5ea070bdf6 Merge branch '3.0.0-wip' of https://github.com/hppycoder/bootstrap into hppycoder-3.0.0-wip 2013-05-24 21:18:07 -07:00
Robert Burns
79666385f7 Use base padding for input-group-addon class 2013-05-24 08:14:11 -04:00
Mark Otto
371d14e217 Remove commented out code and properly nest CSS again for .collapse 2013-05-23 21:06:02 -07:00
Chad Smith
c47d9932cb Found editor spacing issues with tabs instead of spaces, formatting to fit the entrance criteria 2013-05-21 16:29:35 -04:00
Chad Smith
230d6de88a Vertical gradients now can have percentages passed in as arguments to allow finer control over the backgrounds it produces 2013-05-21 16:25:59 -04:00
Mark Otto
0c167a1d9d Fixes #7474: Use @input-height-base in .navbar-vertical-align() for .navbar-form 2013-05-19 22:12:48 -07:00
Mark Otto
35573db810 Fixes #7611: fix optgroup formatting for Firefox 2013-05-19 22:06:10 -07:00
Mark Otto
5fbb9e9f5d More row change ups:
* No more negative side margins
* However, keep the negative margin for nested rows
2013-05-16 21:03:56 -07:00
Mark Otto
9762f95bde Change up link alerts
* No more children selectors to set all links in alerts as a special color because buttons and more wrongly inherited color
* Adds .alert-link for easy styling in any alert
2013-05-16 20:53:59 -07:00