Mark Otto
|
0e5d17d5f6
|
Merge branch 'master' into v4
Conflicts:
Gruntfile.js
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/js/bootstrap.min.js
docs/_data/glyphicons.yml
docs/_includes/components/alerts.html
docs/_includes/components/badges.html
docs/_includes/components/breadcrumbs.html
docs/_includes/components/button-dropdowns.html
docs/_includes/components/button-groups.html
docs/_includes/components/dropdowns.html
docs/_includes/components/glyphicons.html
docs/_includes/components/input-groups.html
docs/_includes/components/jumbotron.html
docs/_includes/components/labels.html
docs/_includes/components/list-group.html
docs/_includes/components/media.html
docs/_includes/components/navbar.html
docs/_includes/components/navs.html
docs/_includes/components/page-header.html
docs/_includes/components/pagination.html
docs/_includes/components/panels.html
docs/_includes/components/progress-bars.html
docs/_includes/components/responsive-embed.html
docs/_includes/components/thumbnails.html
docs/_includes/components/wells.html
docs/_includes/css/buttons.html
docs/_includes/css/code.html
docs/_includes/css/forms.html
docs/_includes/css/grid.html
docs/_includes/css/helpers.html
docs/_includes/css/images.html
docs/_includes/css/less.html
docs/_includes/css/tables.html
docs/_includes/css/type.html
docs/_includes/customizer-variables.html
docs/_includes/getting-started/accessibility.html
docs/_includes/getting-started/disabling-responsiveness.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/whats-included.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/modal.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/tabs.html
docs/_includes/js/tooltips.html
docs/_includes/nav/components.html
docs/_includes/nav/javascript.html
docs/_jade/customizer-variables.jade
docs/_layouts/default.html
docs/about.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/assets/js/src/customizer.js
docs/customize.html
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
less/glyphicons.less
less/mixins/vendor-prefixes.less
less/navbar.less
less/popovers.less
less/tables.less
less/theme.less
less/tooltip.less
less/variables.less
package.json
scss/_carousel.scss
scss/_close.scss
scss/_forms.scss
test-infra/npm-shrinkwrap.json
|
2015-01-03 20:08:58 -08:00 |
|
Bastien
|
c8855a7ad1
|
Add glyphicons fonts in woff2
|
2014-12-12 14:22:41 +01:00 |
|
vsn4ik
|
add44cae03
|
Remove execute permission on fonts.
|
2014-12-05 19:52:23 +03:00 |
|
Mark Otto
|
bcb90ef3a0
|
Bump Glyphicons to v1.9
|
2014-11-30 01:31:49 -08:00 |
|
Chris Rebert
|
1e6849dd58
|
clean whitespace
Thanks to @collinanderson
Closes #14567
|
2014-09-08 13:35:07 -07:00 |
|
Mark Otto
|
bb3157c2d9
|
Add new grunt task for faster builds; nuke fonts
|
2014-07-08 16:25:23 -07:00 |
|
Zlatan Vasović
|
fe811b8906
|
Remove execute permission on font files
|
2014-02-11 07:57:31 +01:00 |
|
Mark Otto
|
728067b586
|
Update Glyphicons
|
2014-02-10 21:28:05 -08:00 |
|
vsn4ik
|
f0c6ac0b70
|
Remove execute permissions on fonts files.
|
2013-10-28 17:52:04 +04:00 |
|
Chris Rebert
|
dca7be6b67
|
Update Glyphicons font to resolve #10106
Workaround an old Android WebKit bug by switching to codepoints within the BMP.
Details: http://stackoverflow.com/questions/9241519/webkit-css-content-unicode-bug
Extra special thanks to @jankovarik for doing this update. <3
Source: https://www.dropbox.com/s/clh9y6lqtmj01l8/halflings_updated_for_android.zip
(As posted in https://github.com/twbs/bootstrap/issues/10106#issuecomment-24539909 )
|
2013-09-23 22:41:43 -07:00 |
|
Mark Otto
|
e13ca6d384
|
Upgrade to latest glyphicons
|
2013-08-18 01:46:26 -07:00 |
|
Mark Otto
|
1e0453f825
|
Restore glyphicons
|
2013-08-18 00:36:51 -07:00 |
|
Mark Otto
|
f64fe29003
|
Move Glyphicons into their own repo
Removes the icon fonts and associated docs and LESS code from the core
repo and into twbs/bootstrap-glyphicons.
|
2013-06-20 15:40:37 -07:00 |
|
Mark Otto
|
72198a59c0
|
removing glyphicons images, swapping in new icon font with new classes
|
2012-11-02 01:20:06 -07:00 |
|