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
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
6da346527b
grunt dist on previous commit
2013-08-06 16:02:07 -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
98df9495cc
remove dupe border-box
2013-08-05 16:15:36 -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
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
Mark Otto
844df9e001
Fixes #8732 : unfucks disabled fieldset form example with form groups
2013-08-05 14:45:00 -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
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
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
52266cfdcd
run grunt dist
2013-08-05 00:39:03 -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
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
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
Mark Otto
08ce3ef9e1
run grunt dist for #8967
2013-08-02 10:11:39 -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
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
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
3c39bc0d96
start on navbar
2013-07-31 18:02:12 -07:00
Mark Otto
60e1f5e0e8
start with buttons
2013-07-31 17:48:22 -07:00
Mark Otto
4c27f3ce80
Run make on prev work
2013-07-31 17:07:55 -07:00
Brian Nelson
dcbf1e51c4
Compiles changes to CSS
2013-07-30 11:35:13 -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
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
Mark Otto
111dc1492f
fixes #8714 : correct stacked pills nav
2013-07-28 09:37:10 -07: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
b513cd9add
grunt on previous commits
2013-07-26 15:13:03 -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
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
John-Philip Johansson
0d33455ef4
Replace Makefile with GruntJS
...
A rebase (against soon-to-be 3.0.0-rc.1) & squash of
https://github.com/twbs/bootstrap/pull/7786 AKA
https://github.com/twitter/bootstrap/pull/7786
originally by
@seriema
@mokkabonna
@jojohess
Rebased by @cvrebert
2013-07-26 00:39:14 -07: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
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
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
Mark Otto
0d2d65c8f1
run make on prev commits
2013-07-25 10:12:51 -07:00
Mark Otto
768e7edabf
fixes #8571 completely: add better th support for table classes
2013-07-25 10:01:42 -07:00
Mark Otto
d4cd7efce6
make on prev commits
2013-07-25 09:58:28 -07: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
c63489def3
run make on prev commits
2013-07-24 16:28:34 -07: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
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
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
732e4196fb
Remove commented out CSS
2013-07-20 19:31:56 -07: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
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
0a3722112c
Add minified CSS to dist folder
2013-07-18 18:33:20 -07:00
Mark Otto
f771bf140d
Merge branch 'bs3_rc1' into 3.0.0-wip
2013-07-18 18:16:50 -07:00
Mark Otto
7bb8817947
finish flattening repo structure; add dist folder of compiled css/js
2013-07-18 18:14:49 -07:00