0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

138 Commits

Author SHA1 Message Date
Mark Otto
d6b0f45fb7 Merge branch 'master' into derp
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
	docs/_includes/components/dropdowns.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/responsive-embed.html
	docs/_includes/css/buttons.html
	docs/_includes/css/forms.html
	docs/_includes/css/less.html
	docs/_includes/css/overview.html
	docs/_includes/css/responsive-utilities.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/grunt.html
	docs/_includes/getting-started/template.html
	docs/_includes/header.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/scrollspy.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/components.html
	docs/_includes/nav/getting-started.html
	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/docs.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/components.html
	docs/components/navbar.md
	docs/css.html
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/examples/blog/index.html
	docs/examples/carousel/index.html
	docs/examples/cover/index.html
	docs/examples/dashboard/index.html
	docs/examples/grid/index.html
	docs/examples/jumbotron-narrow/index.html
	docs/examples/jumbotron/index.html
	docs/examples/justified-nav/index.html
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/navbar/index.html
	docs/examples/non-responsive/index.html
	docs/examples/offcanvas/index.html
	docs/examples/signin/index.html
	docs/examples/starter-template/index.html
	docs/examples/sticky-footer-navbar/index.html
	docs/examples/sticky-footer/index.html
	docs/examples/theme/index.html
	docs/examples/tooltip-viewport/index.html
	docs/getting-started.html
	docs/javascript.html
	docs/migration.html
	less/_animation.less
	less/_modal.less
	less/_navbar.less
	less/_variables.less
	less/glyphicons.less
	less/navs.less
	less/panels.less
	less/progress-bars.less
2014-10-26 22:31:59 -07:00
Daniel Juhl
b171451d77 Added link to danish translation of docs 2014-10-26 15:04:37 +01:00
Mark Otto
3d6982c149 add jumbotron and page-header to nav.yml 2014-09-17 20:03:19 -07:00
Mark Otto
86828fcd3d Some secondary button border action 2014-09-17 18:10:28 -07:00
Mark Otto
9f2aeafe85 Merge branch 'master' into derp
Conflicts:
	Gruntfile.js
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/fonts/glyphicons-halflings-regular.svg
	docs/_includes/components/badges.html
	docs/_includes/components/input-groups.html
	docs/_includes/components/pagination.html
	docs/_includes/css/forms.html
	docs/_includes/footer.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/grunt.html
	docs/_includes/home-nav.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/popovers.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/getting-started.html
	docs/_includes/nav/javascript.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/browser-bugs.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
	docs/dist/fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.svg
	less/_button-group.less
	less/_jumbotron.less
	less/_variables.less
	less/mixins/vendor-prefixes.less
	less/panels.less
	less/thumbnails.less
	package.json
2014-09-17 15:21:31 -07:00
Chris Rebert
28f4632e6c Add @hnrch02 to Core Team members list 2014-09-08 11:05:32 -07:00
KostyaTretyak
c954ba4545 Ukrainian site migrates to twbs.docs.org.ua 2014-08-21 13:42:30 +03:00
Mark Otto
7d9f55c3d5 missing nav link 2014-08-14 14:16:55 -07:00
Дмитро Будник
8c3f095fa4 fix typo in ukrainian doc description 2014-08-06 15:56:56 +03:00
Mark Otto
dceeb641ed fix nav link 2014-08-05 17:19:43 -07:00
Mark Otto
0181d3c643 move license and translations to about section 2014-08-05 17:19:12 -07:00
Mark Otto
25d6824e6c cards 2014-08-05 17:12:24 -07:00
Mark Otto
99edff6dda fix sidebar again 2014-08-03 16:23:32 -07:00
Mark Otto
68b71d1a50 nav update 2014-07-14 08:35:33 -07:00
Mark Otto
8d55c3c0a3 move containers to layout section 2014-07-14 08:22:33 -07:00
Mark Otto
3e896193ab new navbar ideas 2014-07-13 23:33:54 -07:00
Mark Otto
7b30393935 markdownify about docs 2014-07-13 01:35:29 -07:00
Mark Otto
2cce857220 fix nav 2014-07-13 01:26:44 -07:00
Mark Otto
53f8a3bb69 fix nav 2014-07-13 00:57:32 -07:00
Mark Otto
372e4a41eb fix js nav 2014-07-12 02:34:04 -07:00
Mark Otto
743401dcd9 Twerk nav 2014-07-12 00:57:09 -07:00
Mark Otto
28c946af90 nav 2014-07-11 23:19:49 -07:00
Mark Otto
dad3cab24f move responsive utils 2014-07-11 22:59:57 -07:00
Mark Otto
46f1fbe746 grid cleanup, nav rearranging 2014-07-11 22:58:43 -07:00
Mark Otto
1d273b1222 update nav 2014-07-11 22:34:54 -07:00
Mark Otto
e8bd019a19 move all css files over to components dir 2014-07-10 20:02:47 -07:00
Mark Otto
55d6b3fcda fix page titles, add about page nav list 2014-07-10 18:04:38 -07:00
Mark Otto
4993ab6e00 start markdowning getting started and moving things to separate pages 2014-07-10 17:54:06 -07:00
Mark Otto
dae5ec5416 Drop Glyphicons 2014-07-08 00:33:21 -07:00
Mark Otto
ca54cff4ab new homepage expo features 2014-06-22 18:04:19 -07:00
Julian Thilo
58e6af3988 #12790: Add link to unofficial Italian translation 2014-04-06 02:21:44 +02:00
Julian Thilo
1b15cefa5c Generate Translations list from YAML 2014-03-17 21:55:39 +01:00
Mark Otto
461404f6be update homepage showcase with three new posts 2014-02-13 01:21:35 -08:00
XhmikosR
55e6d4b9b5 Remove trailing space. 2014-02-12 21:27:31 +02: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
745bec59cf Move homepage examples to data file 2014-01-05 23:37:14 -08:00
Mark Otto
a9c829bc0c Rearrange repository contents because muahahahahahaha 2013-12-28 22:47:03 -08:00