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
