Mark Otto
3d74c670d3
Rearrange forms content
2013-02-02 18:30:52 -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
Joseph Price
1fe4ed8823
reordered access of options in tooltip and popover to allow overriding data attrs from js
2013-02-02 18:58:56 -05: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
Mark Otto
f328ebbc73
Merge pull request #6776 from ndabas/fix-inline-lists-ie7
...
Fix inline lists for IE7
2013-02-01 13:04:17 -08:00
Nikhil Dabas
b7b2e4f8a1
Fixing inline lists for IE7
2013-02-02 02:04:30 +05:30
Mark Otto
2553d74b54
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/examples/hero.html
docs/examples/sticky-footer-navbar.html
2013-02-01 10:34:25 -08:00
Mark Otto
7d655c3549
Use button element instead of a for responsive navbar buttons
2013-02-01 10:33:36 -08:00
Mark Otto
725cf7f6ec
start to refactor justified nav example
2013-02-01 10:32:08 -08:00
Mark Otto
7528b6e10a
button element instead of href-less a tag for navbar button
2013-02-01 10:30:48 -08:00
Gil Barbara
24f0505bde
Update input-group-addon for input sizes
2013-02-01 01:39:26 -02:00
Mark Otto
755f1776da
Refactor jumbotron-narrow.html example
...
* Make it mobile-first
* Add a handful of comments to explain CSS
* Instead of an <hr> between custom header and jumbotron, use border for a tighter mobile layout
2013-01-31 18:34:12 -08:00
Mark Otto
19b5ebcf24
Rename marketing-narrow to jumbotron-narrow for mo betta naming schemes
2013-01-31 18:25:44 -08:00
Mark Otto
dfdf343825
Refactor jumbotron example:
...
* Add hella CSS comments
* Reduce padding on body to height of navbar, then set top margin on jumbotron at +768px
* Wrap marketing copy and footer in an extra div so we can set some padding for ideal responsive views
2013-01-31 18:22:47 -08: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
Mark Otto
fe5150d5dc
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-01-31 18:07:07 -08:00
Mark Otto
061d2849a6
Update starter template to include left/right padding on inner container; also include body padding
2013-01-31 18:06:56 -08:00
Mark Otto
5e5670a1b4
Remove gallery link from navbar; add to homepage examples section instead
2013-01-31 18:00:11 -08:00
Mark Otto
83e5c01856
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
docs/assets/js/application.js
docs/components.html
docs/templates/pages/components.mustache
less/sprites.less
2013-01-31 17:57:31 -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
6014e63054
lets see how much i can mess this pull request up. :|
2013-01-31 11:10:41 -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
baadc33c88
make on prev commit
2013-01-30 18:22:20 -08:00
Mark Otto
135e834bf4
Merge branch 'baslr-master' into 2.3.0-wip
2013-01-30 18:22:11 -08:00
Mark Otto
3cc65cb86c
clear up show-grid stuff
2013-01-30 18:16:14 -08:00
Mark Otto
dd4ce35ddc
add meta tag to second example
2013-01-30 17:46:18 -08:00
Mark Otto
a5fc3e0667
make on prev commit
2013-01-30 17:45:02 -08:00
Mark Otto
3b6b8e9f41
Merge branch 'greg-raven-patch-2' into 2.3.0-wip
2013-01-30 17:44:45 -08:00
Mark Otto
f20c3368e4
Update pagination example HTML to match examples
2013-01-30 17:42:03 -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
pseidemann
c4eea3abde
don't remove title attribute for tooltips
...
fixes #6445
2013-01-29 22:54:00 +01:00
Guillaume Smet
b7764d8a33
Fix tooltip positioning for IE8
...
IE8 defines a placeholder object getBoundingClientRect which breaks the new getPosition() method
2013-01-29 19:50:13 +01:00
Mark Otto
ab0c055bc6
Merge pull request #6728 from fredsa/2.3.0-wip
...
Fix `form-actions` documentation
2013-01-28 10:35:16 -08:00
Fred Sauer
d6e3b6b5a4
Fix form-actions documentation
2013-01-28 10:01:59 -08:00
Guillaume Gautreau
ee71fb492f
No semicolumns
2013-01-27 10:56:01 +01:00
Guillaume Gautreau
5b0f956a60
Arrow replacement
2013-01-26 21:45:21 +01:00
Guillaume Gautreau
d9a0abaa06
works with fixed test
2013-01-26 21:39:49 +01:00
