Chris Rebert
5f41801083
update shrinkwrap
2014-12-12 13:22:09 -08:00
Chris Rebert
f2ecc77562
use npm-shrinkwrap ^200.0.0 ; fixes #15279
2014-12-12 13:21:49 -08:00
Bootstrap's Grunt bot
f9db33d7db
automatic grunt dist
2014-12-12 19:30:34 +00:00
Julian Thilo
b12e24e7a1
Merge pull request #15351 from twbs/revert-15350-patch-1
...
Revert "fix typo in carousel doc"
2014-12-12 14:28:40 +01:00
Julian Thilo
a940e1fdd6
Revert "fix typo in carousel doc"
2014-12-12 14:24:50 +01:00
Bastien
c8855a7ad1
Add glyphicons fonts in woff2
2014-12-12 14:22:41 +01:00
Patrick H. Lauke
7e3ca05692
Merge pull request #15350 from emmanuelgautier/patch-1
...
fix typo in carousel doc
2014-12-12 12:08:56 +00:00
Emmanuel Gautier
f0be5e0409
fix typo
2014-12-12 12:53:50 +01:00
Bastien
bc36e31280
Add new brand-primary color in the doc and the true color in comment
2014-12-12 11:07:16 +01:00
Bastien
5b8ba0cb4d
200 to 260 glyphicons in the doc
2014-12-12 10:58:21 +01:00
Mark Otto
1e136a70a2
Clean up some navbar.scss, drop the -float-breakpoint var entirely
2014-12-11 14:47:10 -08:00
Mark Otto
bd453652b8
docs tweak /cc @glebm
2014-12-11 14:36:19 -08:00
Mark Otto
3b62bc48df
nuke auto truncating message
2014-12-11 14:19:02 -08:00
Mark Otto
3737cb1d46
Use grid classes or mixins on .dl-horizontal, update docs to include it, removes auto truncate and makes .text-overflow mixin into a .text-truncate class and mixin combo for better granularity
2014-12-11 14:12:10 -08:00
Mark Otto
8ba213c9aa
grunt
2014-12-11 13:54:24 -08:00
Mark Otto
fd03025b09
Merge pull request #16 from twbs/android-lollipop
...
Officially support the Android Browser on Android v5.0+
2014-12-11 13:53:58 -08:00
Mark Otto
235e815e6a
Merge pull request #15 from twbs/v4_builds
...
Stub out v4 custom builds
2014-12-11 12:21:26 -08:00
Mark Otto
e0a9a7722f
Merge pull request #14 from twbs/nuke_customizer
...
Nuke the customizer
2014-12-11 12:21:05 -08:00
Mark Otto
826aeec6e8
Merge pull request #13 from twbs/default-vars
...
Apply !default to SCSS variables
2014-12-11 12:20:05 -08:00
Mark Otto
30fe3d9792
Merge pull request #8 from twbs/scss-lint
...
Add SCSS-Lint to Grunt
2014-12-11 12:16:45 -08:00
Mark Otto
2edc779391
Merge branch 'v4' into scss-lint
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
scss/_card.scss
2014-12-11 12:07:09 -08:00
Mark Otto
f7e103a6ac
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
2014-12-11 12:06:16 -08:00
Mark Otto
2a78159a20
grunt
2014-12-11 12:06:08 -08:00
Mark Otto
fef873a840
fix all validation, turn off some settings, add sort order
2014-12-11 12:05:29 -08:00
Chris Rebert
cb4c3a0eae
glyphicons.less: lowercase F in codepoint number for consistency
2014-12-11 11:45:33 -08:00
Chris Rebert
6ae16b0a49
Officially support the Android Browser on Android v5.0+
2014-12-11 10:48:32 -08:00
Gleb Mazovetskiy
76d6b17f4f
Merge pull request #6 from twbs/grid-framework-refactor
...
Refactor grid_framework
2014-12-11 15:16:42 +00:00
XhmikosR
4e27c48248
Run grunt.
2014-12-11 08:24:31 +02:00
XhmikosR
aa1e3e7325
Tweak colors to improve accessibility.
2014-12-11 08:14:07 +02:00
XhmikosR
46b0e94e25
Specify img dimensions in the HTML.
2014-12-11 08:14:07 +02:00
Mark Otto
0e371ddf87
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/css/docs.min.css.map
2014-12-10 20:51:17 -08:00
Patrick H. Lauke
2665605856
Merge pull request #15337 from twbs/patrickhlauke
...
Add @patrickhlauke to Core Team list on the About page
2014-12-10 22:12:50 +00:00
Mark Otto
58fee94f8d
stub out descriptions and titles for potential custom builds
2014-12-10 14:12:20 -08:00
Mark Otto
95da2a9428
nuke the customizer
2014-12-10 13:51:43 -08:00
Mark Otto
63d4423fc0
grunt
2014-12-10 13:49:53 -08:00
Patrick H. Lauke
69332cbb68
Merge pull request #15334 from patrickhlauke/progress-low-percentages
...
Fix/merge advice on low percentage progress bars
2014-12-10 20:59:41 +00:00
Chris Rebert
edba4a386c
Add @patrickhlauke to Core Team list on the About page
...
[skip sauce]
[skip validator]
2014-12-10 12:21:05 -08:00
Chris Rebert
a9d92a5e41
Filed http://openradar.appspot.com/19208483 for #12536
2014-12-10 12:13:21 -08:00
Patrick H. Lauke
d9c3e5f3ad
Fix/merge advice on low percentage progress bars
...
- actually add the ``min-width`` extra style (and use ``em`` rather than
``px``) to the 0% and 2% example
- remove the unnecessarily redundant sentence in the "With labels"
section
- remove the unnecessary heading/section specifically for low percentage
case, make it flow naturally as part of the "With labels" section
2014-12-10 16:50:21 +00:00
Chris Rebert
23aa0340df
Apply !default to SCSS variables
...
Per @thomas-mcdonald
2014-12-09 16:24:05 -08:00
Patrick H. Lauke
7c228b3cfa
Merge pull request #15330 from patrickhlauke/customizer-variables-help-block
...
Tie help block to input with aria-describedby
2014-12-09 10:02:20 +00:00
Patrick H. Lauke
4529a9e7b7
Tie help block to input with aria-describedby
2014-12-09 09:57:35 +00:00
XhmikosR
762acc826f
Merge pull request #15293 from twbs/grunt-contrib-compress
...
Add grunt-contrib-compress.
2014-12-09 10:19:05 +02:00
Mark Otto
63639f9913
Merge pull request #9 from twbs/less-vendor-prefixing
...
_progress.scss: remove unnecessary @-webkit-keyframes
2014-12-08 22:48:03 -08:00
Mark Otto
70855a7d29
Merge pull request #10 from twbs/bye-gradient-vendors
...
remove explicit vendor prefixes from _gradients.scss
2014-12-08 22:47:42 -08:00
Mark Otto
c6ec27a5c8
Merge pull request #11 from twbs/card-columns-vendor
...
remove explicit vendor prefixing from _card.scss
2014-12-08 22:47:17 -08:00
Chris Rebert
86f834e356
remove explicit vendor prefixing from _card.scss
2014-12-08 22:05:50 -08:00
Chris Rebert
b59abb40f7
remove explicit vendor prefixes from _gradients.scss
2014-12-08 22:00:05 -08:00
XhmikosR
afa46515d0
Update glob.
2014-12-09 07:59:57 +02:00
XhmikosR
71f6dd25fc
Add grunt-contrib-compress.
...
Now, the zip file is created when running `grunt prep-release`.
[ci skip]
2014-12-09 07:53:11 +02:00
