Mark Otto
8d09e7c24d
remove some unhelpful comments
2012-11-30 00:26:02 -08:00
Mark Otto
4fd164d45b
consolidate font resets into scaffolding
2012-11-30 00:24:17 -08:00
Mark Otto
71d8bebfbc
remove from form styles
2012-11-30 00:21:44 -08:00
Mark Otto
fca35c0dba
Merge branch '2.2.2-wip' into exploratory
...
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/alerts.less
less/button-groups.less
less/buttons.less
less/tests/css-tests.html
2012-11-30 00:13:30 -08:00
Mark Otto
bca3ff4ed6
Fixes #5853 : Maintain 10px margin above help block when following input groups
2012-11-29 23:39:33 -08:00
Mark Otto
f087b3428c
remove element from selector
2012-11-29 23:33:09 -08:00
Mark Otto
fe7b6decb1
Merge pull request #6039 from desheikh/2.2.2-wip
...
help-block margin-top should also apply after a span.uneditable-input
2012-11-29 23:32:38 -08:00
Mark Otto
322a56354f
run make with nav img fix
2012-11-29 23:27:20 -08:00
Mark Otto
721b568303
update comment
2012-11-29 23:27:09 -08:00
Mark Otto
c5173cdb92
Merge branch 'idavemm-patch-1' into 2.2.2-wip
2012-11-29 23:26:22 -08:00
Mark Otto
52e669d619
Merge branch '2.2.2-wip-holder' into 2.2.2-wip
2012-11-29 21:35:57 -08:00
Mark Otto
38c546c785
upgrade to holder 1.6
2012-11-29 21:35:45 -08:00
Mark Otto
12aa060efd
Merge branch 'jblotus-patch-1' into 2.2.2-wip
2012-11-29 21:06:20 -08:00
Mark Otto
e9c32fdf6d
Merge branch 'patch-1' of https://github.com/jblotus/bootstrap into jblotus-patch-1
2012-11-29 21:06:11 -08:00
Mark Otto
acc037de15
add holder and replace placehold.it
2012-11-29 20:59:14 -08:00
Zulfiqar Ali
ddd154481b
added compiled css file
2012-11-29 17:40:23 +08:00
Mark Otto
fa6a6dbb92
Merge pull request #6057 from ph-One/patch-3
...
Update Makefile's UglifyJS commands
2012-11-28 18:41:36 -08:00
Mark Otto
78390d12af
Fix the carousel after we scoped selectors
2012-11-28 15:40:51 -08:00
Mark Otto
cb69aa976f
Merge branch 'trsteel88-master' into 2.2.2-wip
2012-11-28 15:35:16 -08:00
Kyle A. Matheny
fe8df5022b
Update Makefile
...
Fixed both instances of uglifyjs usage.
2012-11-28 23:33:05 +00:00
Mark Otto
f1349a2450
Fixes #5533 : Remove filter gradient from disabled links on dropdowns
2012-11-28 02:22:37 -08:00
Mark Otto
8fb36cb3dd
Fixes #5594 : Vertical button groups show use max-width, not width, and be scoped to immediate children buttons only
2012-11-28 02:21:34 -08:00
Mark Otto
296b838405
Fixes #5616 : scope carousel state classes to immediate children only
2012-11-28 02:17:50 -08:00
Mark Otto
bf3a5df371
Fixes #5930 : redeclare font-size for popoves in btn-groups
2012-11-28 02:10:23 -08:00
Mark Otto
783120dffa
Fixes #5927 : Scope button group 5px button left margin to immediate children
2012-11-28 01:51:04 -08:00
Mark Otto
014d3cedf5
Fixes #5940 : Prevent @headingsColor from changing alert colors
2012-11-28 01:48:34 -08:00
Mark Otto
bfc97fdaf6
Fixes #4852 : IE8 popover carets fixed
...
* IE8 refused a negative z-index to place the previous :after behind the .arrow, so I had to flip the styles.
* .arrow is the gray border/background, .arrow:after is now the white inner arrow
* Added a hex IE8 fallback to ensure the arrow shows for <IE9 as rgba() isn't supported
* Simplified some of the CSS for the popover carets
2012-11-28 01:38:21 -08:00
Zulfiqar Ali
693fd0db2a
help-block margin-top should also apply after a span.uneditable-input
2012-11-28 16:47:59 +08:00
Mark Otto
fda5bb135e
Fixes #5963 : Add large button example to icons, fix vertical alignment in large buttons
2012-11-28 00:46:09 -08:00
Mark Otto
74f51105e9
Fixes #6010 : Navbar dropdown caret should match link hover color
2012-11-28 00:42:17 -08:00
Mark Otto
942f9c5df4
Fixes #6012 : Updated docs sidenav media queries and reset width for exactly 980px
2012-11-28 00:37:55 -08:00
Mark Otto
02097700e8
Fixes #6035 : use font-size vars in button groups
2012-11-28 00:31:52 -08:00
Mark Otto
dc10e6bbf8
Fixes #5935 : Updated vertical gradient mixin
2012-11-28 00:19:35 -08:00
Zulfiqar Ali
701f871e7d
help-block margin-top should also apply after a span.input
2012-11-27 07:30:54 +08:00
Mark Otto
7e56e2265d
Merge branch '2.2.2-wip' into exploratory
...
Conflicts:
less/button-groups.less
2012-11-22 22:04:21 -08:00
Mark Otto
e0d0190803
fix image sizes on homepage
2012-11-22 12:26:54 -08:00
Mark Otto
5d1b4206b1
Fixes #5986 : single toggle button html examples
2012-11-22 12:06:36 -08:00
Mark Otto
8df2811d49
Simpler footer for docs
...
* Remove back to top link (ya'll are lazy :P)
* Center text
* Decrease vertical padding
2012-11-21 23:29:20 -08:00
Mark Otto
8b417c39e7
Merge pull request #5954 from tony/patch-2
...
Fix typo in reset.less
2012-11-19 15:31:14 -08:00
Tony Narlock
ace6dc0c25
Fix typo in reset.less
2012-11-19 16:49:47 -05:00
Mark Otto
a10d68f291
Fixes #5937 : Border radius vars in button groups
2012-11-18 12:30:35 -08:00
Mark Otto
a367fd4938
Fixes #5925 : Adjust top margin of input group in navbar
2012-11-16 01:19:15 -08:00
Mark Otto
88c2497368
Fixes #5912 : User correct selector for form field states.
...
Previously, we were using a generic label selector, but as this was changed in the main forms awhile back, we need to change it here.
2012-11-16 01:16:27 -08:00
Mark Otto
5702e1be6e
widths on github buttons
2012-11-16 01:13:52 -08:00
Trent Steel
4d593618e0
add composer.json
2012-11-16 17:01:21 +10:00
Mark Otto
fa1c130552
Change important badges/labels to danger
2012-11-15 09:17:11 -08:00
Mark Otto
a43bf14ea5
Merge branch '2.2.2-wip' into exploratory
2012-11-15 09:15:37 -08:00
Mark Otto
05655ff4ff
fixes #5922 : clicking only button should download custom build
2012-11-15 09:14:54 -08:00
Mark Otto
1700e48e7f
Fixes #5879 : Manual update of Normalize credit
2012-11-14 15:20:38 -08:00
Mark Otto
0df0b5f1f5
run make after latest merges
2012-11-14 15:19:16 -08:00
