From 4fdea4ac59d294d2d5f85a63aa222e664892110c Mon Sep 17 00:00:00 2001 From: davegandy Date: Sat, 5 Oct 2013 15:40:57 -0400 Subject: [PATCH] getting bootstrap 3.0 ported in --- _config.yml | 2 +- src/Makefile | 4 +- src/_includes/footer.html | 13 +- src/_includes/icons/brand.html | 4 +- src/_includes/icons/currency.html | 4 +- src/_includes/icons/directional.html | 4 +- src/_includes/icons/medical.html | 4 +- src/_includes/icons/new.html | 4 +- src/_includes/icons/text-editor.html | 4 +- src/_includes/icons/video-player.html | 4 +- src/_includes/icons/web-application.html | 4 +- ...on-slider.html => jumbotron-carousel.html} | 44 +- src/_includes/jumbotron.html | 2 +- src/_includes/navbar.html | 126 +-- src/_includes/stripe-ad.html | 4 +- src/_includes/stripe-social.html | 2 +- src/_includes/thanks-to.html | 6 +- src/_includes/whats-new.html | 2 +- src/_includes/why.html | 20 +- src/_layouts/base.html | 2 +- src/_layouts/icon.html | 6 +- src/assets/js/bootstrap-3.0.0.min.js | 6 + src/assets/js/site.js | 2 +- src/assets/less/bootstrap-3.0.0/alerts.less | 67 ++ src/assets/less/bootstrap-3.0.0/badges.less | 51 ++ .../less/bootstrap-3.0.0/bootstrap.less | 59 ++ .../less/bootstrap-3.0.0/breadcrumbs.less | 23 + .../less/bootstrap-3.0.0/button-groups.less | 248 ++++++ src/assets/less/bootstrap-3.0.0/buttons.less | 160 ++++ src/assets/less/bootstrap-3.0.0/carousel.less | 209 +++++ src/assets/less/bootstrap-3.0.0/close.less | 33 + src/assets/less/bootstrap-3.0.0/code.less | 56 ++ .../bootstrap-3.0.0/component-animations.less | 29 + .../less/bootstrap-3.0.0/dropdowns.less | 193 +++++ src/assets/less/bootstrap-3.0.0/forms.less | 353 +++++++++ .../less/bootstrap-3.0.0/glyphicons.less | 232 ++++++ src/assets/less/bootstrap-3.0.0/grid.less | 346 +++++++++ .../less/bootstrap-3.0.0/input-groups.less | 127 +++ .../less/bootstrap-3.0.0/jumbotron.less | 40 + src/assets/less/bootstrap-3.0.0/labels.less | 58 ++ .../less/bootstrap-3.0.0/list-group.less | 88 +++ src/assets/less/bootstrap-3.0.0/media.less | 56 ++ src/assets/less/bootstrap-3.0.0/mixins.less | 723 ++++++++++++++++++ src/assets/less/bootstrap-3.0.0/modals.less | 141 ++++ src/assets/less/bootstrap-3.0.0/navbar.less | 621 +++++++++++++++ src/assets/less/bootstrap-3.0.0/navs.less | 229 ++++++ .../less/bootstrap-3.0.0/normalize.less | 396 ++++++++++ src/assets/less/bootstrap-3.0.0/pager.less | 55 ++ .../less/bootstrap-3.0.0/pagination.less | 83 ++ src/assets/less/bootstrap-3.0.0/panels.less | 148 ++++ src/assets/less/bootstrap-3.0.0/popovers.less | 133 ++++ src/assets/less/bootstrap-3.0.0/print.less | 100 +++ .../less/bootstrap-3.0.0/progress-bars.less | 95 +++ .../bootstrap-3.0.0/responsive-utilities.less | 220 ++++++ .../less/bootstrap-3.0.0/scaffolding.less | 130 ++++ src/assets/less/bootstrap-3.0.0/tables.less | 236 ++++++ src/assets/less/bootstrap-3.0.0/theme.less | 232 ++++++ .../less/bootstrap-3.0.0/thumbnails.less | 31 + src/assets/less/bootstrap-3.0.0/tooltip.less | 95 +++ src/assets/less/bootstrap-3.0.0/type.less | 238 ++++++ .../less/bootstrap-3.0.0/utilities.less | 42 + .../less/bootstrap-3.0.0/variables.less | 620 +++++++++++++++ src/assets/less/bootstrap-3.0.0/wells.less | 29 + .../less/{site.less => site-2.3.2.less} | 12 +- src/assets/less/{ => site-2.3.2}/lazy.less | 0 src/assets/less/{ => site-2.3.2}/mixins.less | 0 .../responsive-1200px-min.less | 0 .../responsive-767px-max.less | 0 .../responsive-768px-979px.less | 2 +- .../{ => site-2.3.2}/responsive-navbar.less | 0 .../less/{ => site-2.3.2}/responsive.less | 10 +- .../less/{ => site-2.3.2}/sticky-footer.less | 0 .../less/{ => site-2.3.2}/variables.less | 0 src/assets/less/site-3.0.0.less | 16 + src/assets/less/site/code.less | 1 + src/assets/less/site/example-rating.less | 25 + src/assets/less/site/feature-list.less | 19 + .../less/site/fontawesome-icon-list.less | 37 + src/assets/less/site/footer.less | 42 + src/assets/less/site/jumbotron-carousel.less | 37 + src/assets/less/site/jumbotron.less | 113 +++ src/assets/less/site/layout.less | 1 + src/assets/less/site/navbar.less | 22 + src/assets/less/site/social-buttons.less | 9 + src/assets/less/site/stripe-ad.less | 7 + src/assets/less/site/variables.less | 83 ++ src/index.html | 2 +- 87 files changed, 7591 insertions(+), 145 deletions(-) rename src/_includes/{jumbotron-slider.html => jumbotron-carousel.html} (53%) create mode 100755 src/assets/js/bootstrap-3.0.0.min.js create mode 100755 src/assets/less/bootstrap-3.0.0/alerts.less create mode 100755 src/assets/less/bootstrap-3.0.0/badges.less create mode 100755 src/assets/less/bootstrap-3.0.0/bootstrap.less create mode 100755 src/assets/less/bootstrap-3.0.0/breadcrumbs.less create mode 100755 src/assets/less/bootstrap-3.0.0/button-groups.less create mode 100755 src/assets/less/bootstrap-3.0.0/buttons.less create mode 100755 src/assets/less/bootstrap-3.0.0/carousel.less create mode 100755 src/assets/less/bootstrap-3.0.0/close.less create mode 100755 src/assets/less/bootstrap-3.0.0/code.less create mode 100755 src/assets/less/bootstrap-3.0.0/component-animations.less create mode 100755 src/assets/less/bootstrap-3.0.0/dropdowns.less create mode 100755 src/assets/less/bootstrap-3.0.0/forms.less create mode 100755 src/assets/less/bootstrap-3.0.0/glyphicons.less create mode 100755 src/assets/less/bootstrap-3.0.0/grid.less create mode 100755 src/assets/less/bootstrap-3.0.0/input-groups.less create mode 100755 src/assets/less/bootstrap-3.0.0/jumbotron.less create mode 100755 src/assets/less/bootstrap-3.0.0/labels.less create mode 100755 src/assets/less/bootstrap-3.0.0/list-group.less create mode 100755 src/assets/less/bootstrap-3.0.0/media.less create mode 100755 src/assets/less/bootstrap-3.0.0/mixins.less create mode 100755 src/assets/less/bootstrap-3.0.0/modals.less create mode 100755 src/assets/less/bootstrap-3.0.0/navbar.less create mode 100755 src/assets/less/bootstrap-3.0.0/navs.less create mode 100755 src/assets/less/bootstrap-3.0.0/normalize.less create mode 100755 src/assets/less/bootstrap-3.0.0/pager.less create mode 100755 src/assets/less/bootstrap-3.0.0/pagination.less create mode 100755 src/assets/less/bootstrap-3.0.0/panels.less create mode 100755 src/assets/less/bootstrap-3.0.0/popovers.less create mode 100755 src/assets/less/bootstrap-3.0.0/print.less create mode 100755 src/assets/less/bootstrap-3.0.0/progress-bars.less create mode 100755 src/assets/less/bootstrap-3.0.0/responsive-utilities.less create mode 100755 src/assets/less/bootstrap-3.0.0/scaffolding.less create mode 100755 src/assets/less/bootstrap-3.0.0/tables.less create mode 100755 src/assets/less/bootstrap-3.0.0/theme.less create mode 100755 src/assets/less/bootstrap-3.0.0/thumbnails.less create mode 100755 src/assets/less/bootstrap-3.0.0/tooltip.less create mode 100755 src/assets/less/bootstrap-3.0.0/type.less create mode 100755 src/assets/less/bootstrap-3.0.0/utilities.less create mode 100755 src/assets/less/bootstrap-3.0.0/variables.less create mode 100755 src/assets/less/bootstrap-3.0.0/wells.less rename src/assets/less/{site.less => site-2.3.2.less} (97%) rename src/assets/less/{ => site-2.3.2}/lazy.less (100%) rename src/assets/less/{ => site-2.3.2}/mixins.less (100%) rename src/assets/less/{ => site-2.3.2}/responsive-1200px-min.less (100%) rename src/assets/less/{ => site-2.3.2}/responsive-767px-max.less (100%) rename src/assets/less/{ => site-2.3.2}/responsive-768px-979px.less (97%) rename src/assets/less/{ => site-2.3.2}/responsive-navbar.less (100%) rename src/assets/less/{ => site-2.3.2}/responsive.less (85%) rename src/assets/less/{ => site-2.3.2}/sticky-footer.less (100%) rename src/assets/less/{ => site-2.3.2}/variables.less (100%) create mode 100644 src/assets/less/site-3.0.0.less create mode 100644 src/assets/less/site/code.less create mode 100644 src/assets/less/site/example-rating.less create mode 100644 src/assets/less/site/feature-list.less create mode 100644 src/assets/less/site/fontawesome-icon-list.less create mode 100755 src/assets/less/site/footer.less create mode 100644 src/assets/less/site/jumbotron-carousel.less create mode 100644 src/assets/less/site/jumbotron.less create mode 100644 src/assets/less/site/layout.less create mode 100644 src/assets/less/site/navbar.less create mode 100644 src/assets/less/site/social-buttons.less create mode 100644 src/assets/less/site/stripe-ad.less create mode 100644 src/assets/less/site/variables.less diff --git a/_config.yml b/_config.yml index 6e7a7d698..a8c3ae25b 100644 --- a/_config.yml +++ b/_config.yml @@ -51,5 +51,5 @@ fontawesome: url: http://creativecommons.org/licenses/by/3.0/ bootstrap: - version: 2.3.2 + version: 3.0.0 url: http://getbootstrap.com diff --git a/src/Makefile b/src/Makefile index 825f8458f..77c129335 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,3 +1,5 @@ +--- +--- PATH := ../node_modules/.bin:$(PATH) FA_ROOT_DIRECTORY = assets/font-awesome @@ -12,7 +14,7 @@ FA_CSS_MODERN_MIN = ${FA_CSS_DIRECTORY}/font-awesome.min.css SITE_LESS_DIRECTORY = assets/less SITE_CSS_DIRECTORY = assets/css -SITE_LESS = ${SITE_LESS_DIRECTORY}/site.less +SITE_LESS = ${SITE_LESS_DIRECTORY}/site-3.0.0.less SITE_CSS_MIN = ${SITE_CSS_DIRECTORY}/site.css build: diff --git a/src/_includes/footer.html b/src/_includes/footer.html index e8d44bd77..ad6aab97f 100644 --- a/src/_includes/footer.html +++ b/src/_includes/footer.html @@ -1,22 +1,23 @@ -