Braden Whitten
f816a18f79
Fix spacing after '='
...
Just added a space after a function definition to tidy up the code.
2013-08-06 17:02:57 -04:00
Chris Rebert
521f852744
update phantomjs link
2013-08-06 14:01:10 -07:00
Chris Rebert
8b8bf91825
Merge pull request #9165 from twbs/browserstack
...
Browserstack testing integration (rebased, squashed, tweaked)
2013-08-06 13:17:20 -07:00
Chris Rebert
cdc92e8139
only run browserstack tests in Travis
2013-08-06 12:25:26 -07:00
Rohan Jain
093cda244a
Integrate testing with browserstack
2013-08-06 12:24:14 -07:00
Chris Rebert
b976956432
Fix #9132 , but in the correct branch
...
People, don't PR against `gh-pages` please!
2013-08-06 12:09:44 -07:00
Mark Otto
c731961f9d
fixes #9140 : use correct var in tables
2013-08-06 11:40:02 -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
f266595092
Fixes #9150 : Hide popover titles in IE8
...
Properly hides popover titles in IE8 because apparently it doesn't
accept the `:empty` selector. /cc @fat @cvrebert
2013-08-06 11:18:12 -07:00
Mark Otto
440d8f5318
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-06 09:46:58 -07:00
Chris Rebert
4350c66253
Merge pull request #9157 from alienlebarge/3.0.0-wip
...
Add links to Recess, Uglify-js & PhantomJS in README
2013-08-06 09:28:04 -07:00
Cédric Aellen
4599eb69a4
Link to phantomjs
2013-08-06 15:06:25 +02:00
Cédric Aellen
3fb41d2400
link to Uglify-js repo
2013-08-06 15:04:52 +02:00
Cédric Aellen
3e3e6f13aa
links to Recess repo
2013-08-06 14:57:34 +02:00
Florian Weber
e70d146b20
Update javascript.html
2013-08-06 11:44:55 +02:00
Jesse Hu
a24319eb44
Added url paths to navbar navbar-static-top and navbar-fixed-top
2013-08-06 03:00:40 -04:00
Jesse Hu
da249b55c4
Changed nav-header to dropdown-header in navbar navbar-fixed-top and navbar-static-top as mentioned in Docs
2013-08-06 02:47:58 -04:00
Jesse Hu
6739522d6c
Added jquery.js and bootstrap.js tags to navbar and navbar-fixed top
2013-08-06 02:46:08 -04:00
Jesse Hu
97a5c3613c
Added glyphicons to index.html
2013-08-06 02:34:36 -04:00
Mark Otto
db45a60cc8
Scope tablet classes to tablets range only
...
Fixes #9128
2013-08-05 20:55:30 -07:00
Chris Rebert
5db9a10138
Merge pull request #9134 from neilhem/3.0.0-wip
...
remove repeated 'pagination' class in code example
2013-08-05 20:32:07 -07:00
Rakhat Jabagin
b29b8acd28
remove repeated 'pagination' class in code example
2013-08-06 09:19:07 +06:00
Mark Otto
1d1e21aff6
Merge pull request #9123 from twbs/bs3_alerts_default_class
...
Update labels to include a base class (fixes #8752 )
2013-08-05 20:01:45 -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
ac3cb6974a
Merge pull request #9130 from twbs/straight-up-wrong
...
Fix pixel values in Responsive Utilities docs to match the actual code
2013-08-05 19:36:19 -07:00
Chris Rebert
668bc5f458
Fix pixel values in Responsive Utilities docs to match the actual code
2013-08-05 17:43:29 -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
ab090a29fb
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-05 16:15:43 -07:00
Mark Otto
98df9495cc
remove dupe border-box
2013-08-05 16:15:36 -07:00
Mark Otto
2354cd1ae8
Merge pull request #9124 from geedmo/3.0.0-wip
...
Fix Issue #8175 - .input-group-addon broken in Firefox
2013-08-05 16:14:48 -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
geedmo
c2737771b4
Fix Issue #8175 - remove lh for input-lg|sm
2013-08-05 19:58:38 -03:00
geedmo
7bc817bcba
Fix Issue #8175
2013-08-05 19:43:39 -03:00
Mark Otto
9bbe8a020a
Merge pull request #9121 from Flydiverny/alerts
...
Added padding variable for alerts and changed customize.html
2013-08-05 15:40:22 -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
Markus Maga
9123163b8f
Comma for clarification
2013-08-06 00:29:19 +02:00
Markus Maga
9108ab9fb8
Added padding variable for alerts and changed customize.html Warning state (which doesn't exist anymore)
2013-08-06 00:06:57 +02:00
Mark Otto
844df9e001
Fixes #8732 : unfucks disabled fieldset form example with form groups
2013-08-05 14:45:00 -07:00
Florian Weber
f3fd67772e
fix scrollSpy instructions for JS call
...
Don't really know if this is correct, but at least it only worked for me that way...
2013-08-05 23:37:08 +02:00
Mark Otto
bfe76273a0
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-05 14:20:46 -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
Chris Rebert
c321adf289
carousel.less: copyedit explanatory comment
2013-08-05 13:13:54 -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
d0d8ab8364
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-05 11:30:59 -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
Chris Rebert
7fe1c1d78d
Merge pull request #9110 from chrisseaton/help-block-fix
...
Update css.html
2013-08-05 10:50:23 -07:00