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
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
