Chris Rebert
24bf439880
Merge pull request #12696 from twbs/rm-browserstack
...
rm BrowserStack testing from build
2014-02-11 10:38:39 -08:00
Chris Rebert
1e1f510294
rm BrowserStack testing from build
2014-02-11 10:11:38 -08:00
Mark Otto
e49c7758aa
Merge pull request #12695 from martikaljuve/offcanvas-transition
...
Fixed transitions on offcanvas example by adding initial left and right properties
2014-02-11 09:57:15 -08:00
Mark Otto
8551f42ae2
Merge branch 'master' into pr/12412
...
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
test-infra/npm-shrinkwrap.canonical.json
2014-02-11 09:50:40 -08:00
Marti Kaljuve
6d232c2b9b
Add initial right and left properties to offcanvas example for transitions.
2014-02-11 18:18:21 +02:00
Mark Otto
2cef0af211
Merge branch 'master' of github.com:twbs/bootstrap
2014-02-11 00:05:34 -08:00
Chris Rebert
020ea27d28
Merge pull request #12689 from ZDroid/fonts-x
...
Remove execute permission on font files
2014-02-10 23:04:21 -08:00
Zlatan Vasović
fe811b8906
Remove execute permission on font files
2014-02-11 07:57:31 +01:00
Mark Otto
6f0059c527
add version to getting started page
2014-02-10 22:12:28 -08:00
Mark Otto
38ebf57af5
grunt
2014-02-10 21:41:14 -08:00
Mark Otto
728067b586
Update Glyphicons
2014-02-10 21:28:05 -08:00
Mark Otto
b4ba964801
Merge pull request #12673 from tlindig/tl_popover_arrow_size
...
use @popover-arrow-width for offset the popover
2014-02-10 20:52:43 -08:00
Mark Otto
3350c73666
http://www.youtube.com/watch?v=YQwYNca4iog
2014-02-10 20:52:20 -08:00
Mark Otto
9427310a09
Fixes #12674
...
* The problem with #12674 is that it reassigns the same variable, but the color values were purposely different.
* This uses Less's color functions to generate the proper darker colors.
* Why darker colors? Because those CSS carets render lighter than their solid border counterparts. Consider it a design hack.
2014-02-10 20:49:17 -08:00
Mark Otto
4973bfd5d7
Fixes #12685 : Display current version under download button on homepage
2014-02-10 20:23:29 -08:00
Mark Otto
67c4deb584
Merge pull request #12665 from twbs/docs_teams
...
Update teams
2014-02-10 19:19:52 -08:00
Chris Rebert
4027594647
Merge pull request #12680 from twbs/googlechrome
...
chrome => googlechrome in Sauce
2014-02-10 12:40:51 -08:00
Chris Rebert
2bc29b4581
chrome => googlechrome in Sauce; fixes #12647
2014-02-10 12:11:10 -08:00
Zlatan Vasović
ba4206b644
Use different coding style for Gruntfile
...
Fixes #12657
2014-02-10 11:15:08 -08:00
Chris Rebert
9afead3fb0
fix indentation in Gruntfile
2014-02-10 11:09:59 -08:00
Chris Rebert
77eaa808db
tweak phrasing for hopefully greater clarity
2014-02-10 10:12:28 -08:00
Chris Rebert
dc79fecacd
add copyright header to shrinkwrap.js; fixes #12643
2014-02-10 10:06:33 -08:00
Tobias Lindig
221ac861e4
use @popover-arrow-width for offset the popover to account for the popover arrow
2014-02-10 10:57:11 +01:00
Julian Thilo
535cd57537
Merge pull request #12671 from Quy/master
...
Update docs prefixing
2014-02-09 22:04:01 +01:00
Quy Ton
477cf1396d
Update docs prefixing
2014-02-09 12:41:47 -08:00
Julian Thilo
d5f0ccba2b
Merge pull request #12668 from Quy/master
...
Reorder links
2014-02-09 19:50:54 +01:00
Quy Ton
8dab75d408
Reorder links
2014-02-09 09:18:11 -08:00
Mark Otto
0d49920e0d
Fixes #12610 : Better and more consistent prefixing of docs CSS with .bs-docs-
2014-02-08 23:24:38 -08:00
Mark Otto
95308509b3
i'm an idiot
2014-02-08 22:46:25 -08:00
Mark Otto
bcf5d88844
Update teams to remove two Sass folks and add new Core member
2014-02-08 22:13:29 -08:00
Mark Otto
769339ed18
grunt dist
2014-02-08 17:30:40 -08:00
Mark Otto
41841c99c4
Merge branch 'master' of github.com:twbs/bootstrap
2014-02-08 17:29:25 -08:00
Mark Otto
44bb7b20c7
Fixes #12625 : Only remove first list group item's top and last list group item's bottom borders when the list group is first or last
2014-02-08 17:29:10 -08:00
Mark Otto
13b4e7a1a8
Mention limitation of form validation feedback icons with input groups
2014-02-08 17:19:45 -08:00
Mark Otto
2365717a3d
Merge pull request #12433 from tagliala/list-inline-first-element-fix
...
Fix first element padding of list-inline
2014-02-08 16:59:59 -08:00
Mark Otto
65b10706b3
brace position
2014-02-08 16:56:59 -08:00
Mark Otto
e9199718d6
Merge branch 'master' into fix-12154
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-02-08 16:52:22 -08:00
Mark Otto
b36d19c3c6
grunt
2014-02-08 16:46:12 -08:00
Mark Otto
7f88009394
grunt
2014-02-08 16:43:58 -08:00
Mark Otto
3fc7a4cffa
grunt with new mixins
2014-02-08 16:31:42 -08:00
Mark Otto
26e2d7cdc9
grunt
2014-02-08 16:13:30 -08:00
Mark Otto
b6444c6472
Merge pull request #12552 from stoudenmire/carousel-icon-classname-fix
...
Fixes two typos in carousel.less
2014-02-08 16:03:25 -08:00
Mark Otto
e3cfd5821d
Merge branch 'master' into pr/12462
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-02-08 16:01:56 -08:00
Mark Otto
842af44fcc
Merge branch 'pr/12579'
2014-02-08 15:53:18 -08:00
Mark Otto
866c52b928
grunt
2014-02-08 15:51:38 -08:00
XhmikosR
5d8491ac9f
Merge pull request #12655 from twbs/holder.js
...
Update holder.js to v2.3.1.
2014-02-09 01:48:13 +02:00
Mark Otto
06e6affa4a
Merge pull request #12645 from ZDroid/docs-js-semicolons
...
Omit semicolons consistently in docs
2014-02-08 15:46:51 -08:00
Mark Otto
b683433f67
grunt
2014-02-08 15:44:13 -08:00
Mark Otto
c8315edd73
Merge branch 'master' into pr/12639
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-02-08 15:37:35 -08:00
Mark Otto
91b76e5247
Merge pull request #12659 from ZDroid/blockquote-font-size
...
Fix #12656 : add @blockquote-font-size
2014-02-08 15:24:43 -08:00
