Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: dtmax/bootstrap
base: b5f9cc2057
...
head fork: dtmax/bootstrap
compare: d8cfcad7c7
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Jan 25, 2014
@juthilo juthilo Clarify nesting in grid example af1ba5c
@mdo mdo Merge pull request #12366 from Quy/master
Change a word.
6d090e2
@andrewdisley andrewdisley Fix #10348: Customizer dependencies a1b0bb7
@juthilo juthilo Add link to German translation and reorder links 0cbfdd1
@mdo mdo Merge pull request #12380 from twbs/translation-german
Add German translation
45b964c
@cvrebert cvrebert Merge pull request #12266 from twbs/linux
enable Linux Chrome & Linux Firefox in Sauce tests
12a4263
@hnrch02 hnrch02 Update load-grunt-tasks to v0.3.0 72568ce
Commits on Jan 26, 2014
@cvrebert cvrebert Merge pull request #12385 from hnrch02/update-load-grunt-tasks
Update load-grunt-tasks to v0.3.0
15921e5
@cvrebert cvrebert Merge pull request #12378 from andrewdisley/patch-1
Fix #10348: Customizer dependencies
86a5846
@cvrebert cvrebert disable IE11 in BrowserStack config due to frequent timeouts 87e5b16
@cvrebert cvrebert README: use Bootstrap v3-specific StackOverflow tag 9ec1e86
@cvrebert cvrebert update to iOS v7 in Sauce test config d56def7
@cvrebert cvrebert Merge pull request #12386 from twbs/update-iphone
update to iOS v7 in Sauce test config
77362a3
@cvrebert cvrebert re-enable OS X Chrome in Sauce tests 6717f64
@cvrebert cvrebert Merge pull request #12387 from twbs/osx-chrome
re-enable OS X Chrome in Sauce tests
3157a37
@alanhamlett alanhamlett fixes #10495 by forcing .navbar-brand height to prevent it's inner co…
…ntent from increasing navbar height
e38fd13
@cvrebert cvrebert fix #12261 5a3f1a9
Commits on Jan 27, 2014
@cvrebert cvrebert mark .box-shadow() mixin as deprecated; fixes #12396 602e5f8
@cvrebert cvrebert docs & comments: v3.1 => v3.1.0 1a36e4f
@mdo mdo Merge pull request #12398 from twbs/deprecate-box-shadow-mixin
mark .box-shadow() mixin as deprecated
16fd8cd
@cvrebert cvrebert Merge pull request #12315 from twbs/use-shrinkwrap
Do npm caching based on npm-shrinkwrap.canonical.json
50ad304
@Quy Quy Change positioning reference from left to right in affix's example. 5c1852f
@juthilo juthilo Merge pull request #12403 from Quy/master
Change positioning reference from left to right in affix's example.
72a31db
@mdo mdo document id requirement in carousels per #12393 e08e871
@mdo mdo Merge branch 'master' of github.com:twbs/bootstrap 45ea456
@mdo mdo Upgrade to Normalize v3-rc1 in prep for v3 final 6a0a139
@mdo mdo Remove optgroup resets from #7611 since Normalize fixes those upstream 400720d
@mdo mdo Remove #8350's reset for number inputs since Normalize fixes those up…
…stream
b7ac009
@juthilo juthilo Fix typo 0a5cb2f
@juthilo juthilo Update javascript.html 3a62811
Commits on Jan 28, 2014
@donaldpipowitch donaldpipowitch refactored and renamed grid mixins 7037c6f
@mdo mdo v3 instead of rc1 493d143
@mdo mdo grunt a9a4d81
@mdo mdo Merge pull request #12406 from twbs/normalize_v3
Upgrade to Normalize v3
01dabd3
@XhmikosR XhmikosR Gruntfile.js: remove unused code. 615f1ad
@ZDroid ZDroid Remove redundant jshint comment f8bb681
@cvrebert cvrebert Merge pull request #12417 from ZDroid/cmt
Remove redundant jshint comment
3792683
Commits on Jan 29, 2014
@cvrebert cvrebert Merge pull request #12415 from XhmikosR/master
Gruntfile.js: remove unused code.
9ec5905
@ZDroid ZDroid Rename pack.min.css to docs.min.css to match with docs.min.js 00f062f
Commits on Jan 30, 2014
@mdo mdo Fixes #12424: Account for Normalize change on figure element so that …
…we don't potentially screw folks over
545c957
@mdo mdo Fix #12422: Reset height on multiple select in input size mixin d631e0b
@mdo mdo Merge pull request #12423 from ZDroid/name
Rename pack.min.css to docs.min.css to match with docs.min.js
80ef14a
@mdo mdo fix css url 7ba2eed
@mdo mdo Follow up to #11655: don't reset opacity on disabled buttons 9195d8e
@mdo mdo Merge branch 'master' into pr/12388
Conflicts:
	dist/css/bootstrap.min.css
d2f1887
@mdo mdo grunt d4b1bfd
@ChrisRiddell ChrisRiddell its an email input d002f04
@juthilo juthilo Merge pull request #12432 from ChrisRiddell/signin-email-fix
Wrong input css for signin example
c2784dd
@tagliala tagliala fixed first element padding of list-inline 0da527f
@mdo mdo grunt 9a6b7ab
@mdo mdo Bump versions, run grunt 1409cde
@cvrebert cvrebert note specific versions of IE where progress bar animation supported; …
…fixes #12437
9f26194
@cvrebert cvrebert rm outdated note about lack of .col-{xs,sm}-offset-0; fixes #12439 7c6e4a2
@XhmikosR XhmikosR Update jQuery to v1.11.0.
Also, use Google's CDN per #11369.
8939268
@cvrebert cvrebert Merge pull request #12436 from XhmikosR/jquery
Update jQuery to v1.11.0.
c1a5e14
@juthilo juthilo Apply eaa2b83 to master as well a9567a9
@cvrebert cvrebert rm duplicate warning callouts in Input Groups docs c86c8de
@cvrebert cvrebert update to grunt-saucelabs v5.0.0 dd6bb5a
@cvrebert cvrebert update to browserstack-runner v0.1.0 bf0cedc
@cvrebert cvrebert Merge pull request #12444 from twbs/grunt-saucelabs-update
update to grunt-saucelabs v5.0.0
2f81246
@cvrebert cvrebert Merge pull request #12445 from twbs/browserstack-runner-update
update to browserstack-runner v0.1.0
00685be
@PHLAK PHLAK Fix issue causing .navbar-brand element height to be shorter than .na…
…vbar height
22e576c
@cvrebert cvrebert use correct+newer name for retina mixin in docs; fixes #12450 e430675
Commits on Jan 31, 2014
@cvrebert cvrebert fix "pading-right" [sic] typo in dashboard.css; fixes #12455 2c6b099
@XhmikosR XhmikosR Downgrade holder.js to v2.2.0.
Fixes #12440.
7b9c0a3
@cvrebert cvrebert Merge pull request #12463 from XhmikosR/12440
Downgrade holder.js to v2.2.0.
40d3cf6
@cvrebert cvrebert most of Bootstrap's components are pure CSS and thus don't require jQ… 623d650
@cvrebert cvrebert fix #12484 4b19447
@mdo mdo Use scss option instead of css for better highlighting 1802ced
@mdo mdo Merge pull request #12448 from PHLAK/master
Fix issue causing .navbar-brand element height to be shorter than .navbar height
9f36bc2
@mdo mdo grunt after last commits 58bf3f9
@cvrebert cvrebert Merge pull request #12480 from twbs/clarify-jquery-err-msg
Clarify JS error message about missing jQuery
362708a
Commits on Feb 01, 2014
@cvrebert cvrebert rm callout about creating .container-fluid-alikes now that .container…
…-fluid has been added
813467d
@cvrebert cvrebert mv .img-responsive docs from Overview to Images section d6f25e1
@ZDroid ZDroid Remove redundant :-moz-placeholder styles
No need for old Firefox versions support.
1e09a9d
@ZDroid ZDroid Don't re-set indent style for [*.py]
Just inherit it from [*].
59a38b7
@cvrebert cvrebert Merge pull request #12503 from ZDroid/ed
Don't re-set indent style for [*.py]
9c054fd
@ZDroid ZDroid Improve alignment of the dashboard placeholder images
Fixes #12435
09f62f6
Commits on Feb 02, 2014
@cvrebert cvrebert add Bower badge to README f2d45fd
@cvrebert cvrebert add note to CONTRIBUTING.md about `outline: none` f234496
@mdo mdo Merge pull request #12519 from twbs/bower-badge
add Bower badge to README
02ae5a2
Cina S Tightening up popover arrow css scope to apply only to direct descend…
…ant arrows.
847adb7
Commits on Feb 03, 2014
@Techwraith Techwraith Allow the bootstrap package in npm to expose css and less fd9b29b
@cvrebert cvrebert fix #12531 d99d79d
@cvrebert cvrebert add StackOverflow to Community section of Getting Started docs 880a38e
@cvrebert cvrebert Merge pull request #12517 from twbs/getting-started-SO
add StackOverflow to Community section of Getting Started docs
1a137ff
@cvrebert cvrebert update docs about destination of remote modal content; fixes #12494 e9212e8
@cvrebert cvrebert fix #12527 27e080d
@cvrebert cvrebert fix #12540 a2ff16c
@cvrebert cvrebert Merge pull request #12543 from twbs/fix-12540
Fixes #12540
1abc308
@cvrebert cvrebert add .btn-inverse removal to migration guide; fixes #12538 69af98e
@cvrebert cvrebert Merge pull request #12544 from twbs/sayonara-inverse-btn
add .btn-inverse removal to migration guide
b0dc512
@cvrebert cvrebert add removal of .help-inline to the migration guide; fixes #12539 d555862
@cvrebert cvrebert Merge pull request #12545 from twbs/arrivederci-help-inline
add removal of .help-inline to the migration guide
d8bb6c2
@cvrebert cvrebert fix #12541 e958008
@cvrebert cvrebert Merge pull request #12546 from twbs/modal-hiding-now-implicit
Mention .modal.fade.hide => .modal.fade in migration docs
e5665c2
@cvrebert cvrebert Safari's justified nav bug is still present as of Safari v7.0.1; fixes d675284
stoudenmire fixed two typos in carousel.less
carousel.less has two typos in glyphicon classnames. fixed them.
a484b3b
@ZDroid ZDroid Remove comma first rule
Removes outdated coding style rule.
0ef0c7b
@cvrebert cvrebert die tabs, die! 149c4be
@cvrebert cvrebert fix #12566 8ee208e
Commits on Feb 04, 2014
@XhmikosR XhmikosR Add examples/**/*css in the csslint task.
Fixes #12457.
3a89fbc
@XhmikosR XhmikosR Examples: fix csslint errors. 4811857
@cvrebert cvrebert fix #12494 in the migration docs 819b19e
@mdo mdo Merge pull request #12533 from 1000hz/tighten-popover-arrows-scope
Scope popover arrow css to direct descendant
266a2e1
@mdo mdo Merge pull request #12553 from ZDroid/nocf
Remove comma first rule
229bc6f
@mdo mdo Don't offset customizer alert, grunt dist ec6c9d2
@mdo mdo Merge pull request #12466 from XhmikosR/12457
Add examples/css in the csslint task.
9ba4942
@XhmikosR XhmikosR Add examples/**/*.css in csscomb task. 9f668a5
@XhmikosR XhmikosR Remove double semicolon. 3ab2324
@mdo mdo Merge pull request #12568 from XhmikosR/examples-csscomb
Add examples in csscomb
9a01aa2
@cvrebert cvrebert Merge pull request #12499 from twbs/move-responsive-imgs-sect
move .img-responsive docs from Overview to Images section
9cf9f6c
@XhmikosR XhmikosR Update Filesaver.js to the latest git (2014-01-24). 389e574
@XhmikosR XhmikosR Update jszip to the latest git (Stuk/jszip@2020038). 2576fec
@XhmikosR XhmikosR Update less.js to v1.6.2. ec050fa
@XhmikosR XhmikosR Gruntfile.js: Move common uglify properties together. aeed64d
@mdo mdo Merge pull request #12572 from XhmikosR/master
Gruntfile.js: Move common uglify properties together.
d158e82
@mdo mdo Merge pull request #12570 from XhmikosR/libs
Update docs libs
952afba
@XhmikosR XhmikosR Docs: losslessly compress images.
Before: 25,1 KB (25.773 bytes)
After:  23,7 KB (24.352 bytes)
7dd51be
@XhmikosR XhmikosR Compress examples screenshots with kraken.io.
Before: 1,12 MB (1.174.728 bytes)
After:  1,11 MB (1.173.614 bytes)
2deb5f9
@mdo mdo Merge pull request #12521 from twbs/outline-none-note
add note to CONTRIBUTING.md about `outline: none`
95494f8
@cvrebert cvrebert disable OS X Chrome in Selenium tests to fix the build b16efeb
@cvrebert cvrebert Merge pull request #12574 from twbs/os-x-chrome-busted
disable OS X Chrome in Selenium tests to fix the build
91f9419
@mdo mdo Fixes #12470: Scope large modal styles to minimum viewport width 07098d1
@mdo mdo Merge branch 'master' of github.com:twbs/bootstrap 1387784
@mdo mdo Reorder grunt dist tasks to ensure JS gets copied over ef3c560
@lipis lipis Sticky footers without any wrappers 40e1a3b
@ZDroid ZDroid Add `grunt test` note 0ed6075
@cvrebert cvrebert reorganize all grunt tasks into one directory
also fixes #12581
46f9d27
@cvrebert cvrebert Merge pull request #12554 from ZDroid/grunt-test-note
Add `grunt test` note
cd8a896
@cvrebert cvrebert Merge pull request #12583 from twbs/grunt-directory
reorganize all grunt tasks into one directory
cc9242a
Commits on Feb 05, 2014
@mdo mdo Merge pull request #12512 from ZDroid/placeholder-img-fix
Improve alignment of the dashboard placeholder images
28f5f6e
@mdo mdo Merge pull request #12025 from ZDroid/clean-visibility-mess
Fix #12015 and minify styles
45e65ee
@mdo mdo grunt dist--includes changes from #12025 and decimal changes, likely …
…from a change in dependencies
00cb50a
@cvrebert cvrebert possibly avoid some extra S3 charges 7861f6e
@mdo mdo add basic back to top link to docs sidenavs, fixes #12589 f16a237
@mdo mdo Merge pull request #12534 from Techwraith/patch-1
Allow the bootstrap package in npm to expose css and less
81d9a46
@mdo mdo Merge pull request #12465 from XhmikosR/docs-img
Docs: losslessly compress images.
7eb5322
@supergibbs supergibbs Added border radiuses to table when in a panel. Fixes #12461 08ff305
Commits on Feb 06, 2014
@ZDroid ZDroid Use license object instead of licenses array 96fd2dc
@ZDroid ZDroid Update grunt paths 9bb5c31
@cvrebert cvrebert Merge pull request #12612 from ZDroid/grunt-path
Update grunt paths
87219cf
@cvrebert cvrebert use Less' extend feature in btn-group-lg etc. 37c21a3
@XhmikosR XhmikosR Merge pull request #12605 from ZDroid/license-object
Use license object instead of licenses array
119ed54
@XhmikosR XhmikosR Update jzip to v2.1.0. aae64a9
@XhmikosR XhmikosR bs-raw-files-generator.js: use the global directive to define the `bt…
…oa` variable.
5769b77
@XhmikosR XhmikosR Merge pull request #12616 from twbs/jszip
Update jzip to v2.1.0.
ef25676
@cvrebert cvrebert Merge pull request #12613 from twbs/sized-btn-group-extend
use Less' extend feature in btn-group-lg etc.
651b289
@cvrebert cvrebert use :extend in thumbnail Less fda8d91
@cvrebert cvrebert use :extend(.img-responsive) in Carousel's Less 7c15115
Commits on Feb 07, 2014
@mdo mdo Merge pull request #12621 from twbs/carousel-img-responsive-extend
use :extend(.img-responsive) in Carousel's Less
596495c
@mdo mdo Merge branch 'master' into thumbnail-extend
Conflicts:
	dist/css/bootstrap.css
ace0abf
@mdo mdo Merge pull request #12502 from ZDroid/moz
Remove redundant :-moz-placeholder styles
42d7479
@mdo mdo Merge pull request #12620 from twbs/thumbnail-extend
use :extend in thumbnail Less
b124c4a
@mdo mdo property order because @zdroid <3 91595d3
@mdo mdo Merge pull request #12497 from twbs/container-fluid-is-now-a-thing
rm DIY full-width callout now that there's .container-fluid
77d1601
@mdo mdo Fixes #12611: Mention limitation of one plugin's data attributes per …
…element
ebd132c
@mdo mdo Fixes #12614: Add progress bar example with visible label 3b4b9a7
@mdo mdo Fixes #12555: Rearrange variables to place grids and containers closer 228d4e5
@mdo mdo Fixes #12526: Add scrollbars when necessary to the Dashboard example'…
…s sidebar
f83b201
@mdo mdo consistency 4f9cdef
@mdo mdo clarify comment 16bbcd7
@mdo mdo Merge pull request #12319 from twbs/address-12007
Clarify target of dropdown events
b4aaf04
@mdo mdo Fixes #12590: Add Korean translation link 2865fde
@mdo mdo Merge branch 'master' of github.com:twbs/bootstrap a9b964b
@mdo mdo Fixes #12477: Clarify IE support in docs c399bfb
@mdo mdo Override iOS search input's extra round corners da43f97
@mdo mdo Merge pull request #12629 from twbs/search_inputs_ios
Override iOS search input's extra round corners
6814393
@mdo mdo grunt for days 3ccc16c
@mdo mdo Fixes #12447: Properly reset borders on table cells in panels d91d9b0
@mdo mdo Follow up to 1bdd59b18c2d1b2409d0422a60e8c007053202df, to better posi…
…tion the sidebar so the potential scrollbar doesn't get hidden by the navbar
cae7617
@mdo mdo Fixes #12486: Restore full width inputs for input groups in inline fo…
…rms and navbars
4d7b2dd
@ZDroid ZDroid Avoid setting `jshint node: true` in every Grunt JS file aead10f
@ZDroid ZDroid Fix .text-truncate() typo 6db1a3f
@BBosman BBosman Drop -o-user-select a0052b5
@cvrebert cvrebert Merge pull request #12637 from ZDroid/text-truncate-typo
Fix .text-truncate() typo
442043e
@cvrebert cvrebert Merge pull request #12636 from ZDroid/grunt-jshintrc
Avoid setting `jshint node: true` in every Grunt JS file
532f1d9
@ZDroid ZDroid Omit semicolons consistently in docs bdf9ce4
@ZDroid ZDroid Replace wildcard with file name 54aece3
@cvrebert cvrebert Merge pull request #12648 from ZDroid/index.html-only
Replace wildcard with file name
f074235
@juthilo juthilo Fix wrong id b61d12f
@mdo mdo Nuke shit I added in 4d7b2dd that shouldn't come until v4 a2f0815
Commits on Feb 08, 2014
@mdo mdo Merge branch 'master' into panels_and_tables
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
06f1293
@mdo mdo Merge pull request #12633 from twbs/panels_and_tables
Properly reset borders on table cells in panels
c3f8456
@cvrebert cvrebert disable BrowserStack tests due to flakiness
Running "browserstack_runner" task
Using config: /home/travis/build/twbs/bootstrap/browserstack.json
Launching server on port: 8888
Downloading tunnel jar to `/home/travis/build/twbs/bootstrap/node_modules/browserstack-runner/lib/BrowserStackTunnel.jar`
Launching tunnel
Error: Invalid or corrupt jarfile /home/travis/build/twbs/bootstrap/node_modules/browserstack-runner/lib/BrowserStackTunnel.jar
[Runner alert] Tunnel launch timeout
Exiting
Non existent tunnel
8f7170a
@XhmikosR XhmikosR Update holder.js to v2.3.1.
Fix #12653.
c3cb63b
@ZDroid ZDroid Fix #12656: add @blockquote-font-size 4c16360
@ZDroid ZDroid Move jade files to docs/jade/ 938779c
@cvrebert cvrebert Merge pull request #12632 from ZDroid/exclude-jade
Exclude jade files from docs
7ef1beb
@mdo mdo Merge pull request #12659 from ZDroid/blockquote-font-size
Fix #12656: add @blockquote-font-size
91b76e5
@mdo mdo 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
c8315ed
@mdo mdo grunt b683433
@mdo mdo Merge pull request #12645 from ZDroid/docs-js-semicolons
Omit semicolons consistently in docs
06e6aff
@XhmikosR XhmikosR Merge pull request #12655 from twbs/holder.js
Update holder.js to v2.3.1.
5d8491a
@mdo mdo grunt 866c52b
@mdo mdo Merge branch 'pr/12579' 842af44
Commits on Feb 09, 2014
@mdo mdo 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
e3cfd58
@mdo mdo Merge pull request #12552 from stoudenmire/carousel-icon-classname-fix
Fixes two typos in carousel.less
b6444c6
@mdo mdo grunt 26e2d7c
@mdo mdo grunt with new mixins 3fc7a4c
@mdo mdo grunt 7f88009
@mdo mdo grunt b36d19c
@mdo mdo 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
e919971
@mdo mdo brace position 65b1070
@mdo mdo Merge pull request #12433 from tagliala/list-inline-first-element-fix
Fix first element padding of list-inline
2365717
@mdo mdo Mention limitation of form validation feedback icons with input groups 13b4e7a
@mdo mdo Fixes #12625: Only remove first list group item's top and last list g…
…roup item's bottom borders when the list group is first or last
44bb7b2
@mdo mdo Merge branch 'master' of github.com:twbs/bootstrap 41841c9
@mdo mdo grunt dist 769339e
@mdo mdo Update teams to remove two Sass folks and add new Core member bcf5d88
@mdo mdo i'm an idiot 9530850
@mdo mdo Fixes #12610: Better and more consistent prefixing of docs CSS with .…
…bs-docs-
0d49920
@Quy Quy Reorder links 8dab75d
@juthilo juthilo Merge pull request #12668 from Quy/master
Reorder links
d5f0ccb
@Quy Quy Update docs prefixing 477cf13
@juthilo juthilo Merge pull request #12671 from Quy/master
Update docs prefixing
535cd57
Commits on Feb 10, 2014
@tlindig tlindig use @popover-arrow-width for offset the popover to account for the po…
…pover arrow
221ac86
@cvrebert cvrebert add copyright header to shrinkwrap.js; fixes #12643 dc79fec
@cvrebert cvrebert tweak phrasing for hopefully greater clarity 77eaa80
@cvrebert cvrebert fix indentation in Gruntfile 9afead3
@ZDroid ZDroid Use different coding style for Gruntfile
Fixes #12657
ba4206b
@cvrebert cvrebert chrome => googlechrome in Sauce; fixes #12647 2bc29b4
@cvrebert cvrebert Merge pull request #12680 from twbs/googlechrome
chrome => googlechrome in Sauce
4027594
Commits on Feb 11, 2014
@mdo mdo Merge pull request #12665 from twbs/docs_teams
Update teams
67c4deb
@mdo mdo Fixes #12685: Display current version under download button on homepage 4973bfd
@mdo mdo 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.
9427310
@mdo mdo http://www.youtube.com/watch?v=YQwYNca4iog 3350c73
@mdo mdo Merge pull request #12673 from tlindig/tl_popover_arrow_size
use @popover-arrow-width for offset the popover
b4ba964
@mdo mdo Update Glyphicons 728067b
@mdo mdo grunt 38ebf57
@mdo mdo add version to getting started page 6f0059c
@ZDroid ZDroid Remove execute permission on font files fe811b8
@cvrebert cvrebert Merge pull request #12689 from ZDroid/fonts-x
Remove execute permission on font files
020ea27
@mdo mdo Merge branch 'master' of github.com:twbs/bootstrap 2cef0af
@martikaljuve martikaljuve Add initial right and left properties to offcanvas example for transi…
…tions.
6d232c2
@mdo mdo 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
8551f42
@mdo mdo Merge pull request #12695 from martikaljuve/offcanvas-transition
Fixed transitions on offcanvas example by adding initial left and right properties
e49c775
@cvrebert cvrebert rm BrowserStack testing from build 1e1f510
@cvrebert cvrebert Merge pull request #12696 from twbs/rm-browserstack
rm BrowserStack testing from build
24bf439
@mdo mdo Fixes #11659, #12698, and #12349: Always apply position and z-index f…
…orm controls in input groups for proper borders
eb20d6f
Commits on Feb 12, 2014
@XhmikosR XhmikosR Switch to the minified JSZip. 5796b56
@cvrebert cvrebert fix #12708 by updating class names in the docs JS 40142bd
@cvrebert cvrebert avoid using .bs-* in example, & improve style dff122f
@cvrebert cvrebert Use .bs-example-* instead of .bs-* in examples in docs
Refs #12610
f6d029f
@XhmikosR XhmikosR Remove trailing space. 55e6d4b
@cvrebert cvrebert Merge pull request #12709 from twbs/bs-to-example-prefix
Use .bs-example-* instead of .bs-* in examples in docs
32a8716
@ZDroid ZDroid Fix multistr errors in customizer.js fe2222e
@ZDroid ZDroid Fix scrollspy typo in docs.css f3735d5
@cvrebert cvrebert Merge pull request #12711 from ZDroid/scrollspy-typo
Fix scrollspy typo in docs.css
e879127
Commits on Feb 13, 2014
@XhmikosR XhmikosR Merge pull request #12710 from ZDroid/customize-multistr
Fix multistr errors in customizer.js
d8cfcad