From 6b46d4d8c1f19bac7405518cb09bc11dbe7e40b7 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 3 Jul 2014 13:05:48 -0700 Subject: [PATCH 1/5] use non-minified Bootstrap CSS on non-gh-pages --- docs/_includes/header.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/_includes/header.html b/docs/_includes/header.html index e60853ef49..414221f1c7 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -14,7 +14,11 @@ +{% if site.github %} +{% else %} + +{% endif %} {% if page.slug == "css" or page.slug == "components" or page.slug == "js" %} From d9f356f05f2993896e9648c8c2f3d319448a011c Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 3 Jul 2014 13:06:54 -0700 Subject: [PATCH 2/5] use non-minified BS Theme CSS on non-gh-pages --- docs/_includes/header.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/_includes/header.html b/docs/_includes/header.html index 414221f1c7..a98495416b 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -21,7 +21,11 @@ {% endif %} {% if page.slug == "css" or page.slug == "components" or page.slug == "js" %} +{% if site.github %} +{% else %} + +{% endif %} {% endif %} From b793fbb13a8f0cb0fab04de8f7fe732b445e6daf Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 3 Jul 2014 13:12:58 -0700 Subject: [PATCH 3/5] use non-minified docs CSS on non-gh-pages --- Gruntfile.js | 10 +++++----- docs/_includes/header.html | 5 +++++ docs/assets/css/{_src => src}/docs.css | 0 docs/assets/css/{_src => src}/pygments-manni.css | 0 4 files changed, 10 insertions(+), 5 deletions(-) rename docs/assets/css/{_src => src}/docs.css (100%) rename docs/assets/css/{_src => src}/pygments-manni.css (100%) diff --git a/Gruntfile.js b/Gruntfile.js index aa35d44403..c49facc9a2 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -199,7 +199,7 @@ module.exports = function (grunt) { src: 'dist/css/<%= pkg.name %>-theme.css' }, docs: { - src: 'docs/assets/css/_src/docs.css' + src: 'docs/assets/css/src/docs.css' }, examples: { expand: true, @@ -225,7 +225,7 @@ module.exports = function (grunt) { ids: false, 'overqualified-elements': false }, - src: 'docs/assets/css/_src/docs.css' + src: 'docs/assets/css/src/docs.css' } }, @@ -243,8 +243,8 @@ module.exports = function (grunt) { }, docs: { src: [ - 'docs/assets/css/_src/docs.css', - 'docs/assets/css/_src/pygments-manni.css' + 'docs/assets/css/src/docs.css', + 'docs/assets/css/src/pygments-manni.css' ], dest: 'docs/assets/css/docs.min.css' } @@ -278,7 +278,7 @@ module.exports = function (grunt) { }, docs: { files: { - 'docs/assets/css/_src/docs.css': 'docs/assets/css/_src/docs.css' + 'docs/assets/css/src/docs.css': 'docs/assets/css/src/docs.css' } } }, diff --git a/docs/_includes/header.html b/docs/_includes/header.html index a98495416b..6a40f73825 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -29,7 +29,12 @@ {% endif %} +{% if site.github %} +{% else %} + + +{% endif %} diff --git a/docs/assets/css/_src/docs.css b/docs/assets/css/src/docs.css similarity index 100% rename from docs/assets/css/_src/docs.css rename to docs/assets/css/src/docs.css diff --git a/docs/assets/css/_src/pygments-manni.css b/docs/assets/css/src/pygments-manni.css similarity index 100% rename from docs/assets/css/_src/pygments-manni.css rename to docs/assets/css/src/pygments-manni.css From 92fd25a2a29dbef6b47ba932e9ba836150b93eeb Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 3 Jul 2014 13:18:44 -0700 Subject: [PATCH 4/5] use non-minified docs JS on non-gh-pages --- Gruntfile.js | 6 +++--- docs/_includes/footer.html | 4 ++++ docs/assets/js/{_src => src}/application.js | 0 docs/assets/js/{_src => src}/customizer.js | 0 4 files changed, 7 insertions(+), 3 deletions(-) rename docs/assets/js/{_src => src}/application.js (100%) rename docs/assets/js/{_src => src}/customizer.js (100%) diff --git a/Gruntfile.js b/Gruntfile.js index c49facc9a2..3deaea4248 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -60,7 +60,7 @@ module.exports = function (grunt) { src: 'js/tests/unit/*.js' }, assets: { - src: ['docs/assets/js/_src/*.js', 'docs/assets/js/*.js', '!docs/assets/js/*.min.js'] + src: ['docs/assets/js/src/*.js', 'docs/assets/js/*.js', '!docs/assets/js/*.min.js'] } }, @@ -125,7 +125,7 @@ module.exports = function (grunt) { 'docs/assets/js/_vendor/blob.js', 'docs/assets/js/_vendor/filesaver.js', 'docs/assets/js/raw-files.min.js', - 'docs/assets/js/_src/customizer.js' + 'docs/assets/js/src/customizer.js' ], dest: 'docs/assets/js/customize.min.js' }, @@ -133,7 +133,7 @@ module.exports = function (grunt) { src: [ 'docs/assets/js/_vendor/holder.js', 'docs/assets/js/_vendor/ZeroClipboard.min.js', - 'docs/assets/js/_src/application.js' + 'docs/assets/js/src/application.js' ], dest: 'docs/assets/js/docs.min.js' } diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 0bb3eafd33..cebd0ee7be 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -34,7 +34,11 @@ +{% if site.github %} +{% else %} + +{% endif %} {% if page.slug == "customize" %} {% endif %} diff --git a/docs/assets/js/_src/application.js b/docs/assets/js/src/application.js similarity index 100% rename from docs/assets/js/_src/application.js rename to docs/assets/js/src/application.js diff --git a/docs/assets/js/_src/customizer.js b/docs/assets/js/src/customizer.js similarity index 100% rename from docs/assets/js/_src/customizer.js rename to docs/assets/js/src/customizer.js From 1dc54dc160d4352d894550c7c5d3f68c475ba2cf Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 3 Jul 2014 13:28:30 -0700 Subject: [PATCH 5/5] use non-minified Bootstrap JS when on non-gh-pages --- Gruntfile.js | 15 ++++++++------- docs/_includes/footer.html | 6 ++++++ .../js/{_vendor => vendor}/ZeroClipboard.min.js | 0 docs/assets/js/{_vendor => vendor}/blob.js | 0 docs/assets/js/{_vendor => vendor}/filesaver.js | 0 docs/assets/js/{_vendor => vendor}/holder.js | 0 docs/assets/js/{_vendor => vendor}/jszip.min.js | 0 docs/assets/js/{_vendor => vendor}/less.min.js | 0 docs/assets/js/{_vendor => vendor}/uglify.min.js | 0 9 files changed, 14 insertions(+), 7 deletions(-) rename docs/assets/js/{_vendor => vendor}/ZeroClipboard.min.js (100%) rename docs/assets/js/{_vendor => vendor}/blob.js (100%) rename docs/assets/js/{_vendor => vendor}/filesaver.js (100%) rename docs/assets/js/{_vendor => vendor}/holder.js (100%) rename docs/assets/js/{_vendor => vendor}/jszip.min.js (100%) rename docs/assets/js/{_vendor => vendor}/less.min.js (100%) rename docs/assets/js/{_vendor => vendor}/uglify.min.js (100%) diff --git a/Gruntfile.js b/Gruntfile.js index 3deaea4248..9a259f0fa4 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -119,20 +119,21 @@ module.exports = function (grunt) { }, customize: { src: [ - 'docs/assets/js/_vendor/less.min.js', - 'docs/assets/js/_vendor/jszip.min.js', - 'docs/assets/js/_vendor/uglify.min.js', - 'docs/assets/js/_vendor/blob.js', - 'docs/assets/js/_vendor/filesaver.js', + 'docs/assets/js/vendor/less.min.js', + 'docs/assets/js/vendor/jszip.min.js', + 'docs/assets/js/vendor/uglify.min.js', + 'docs/assets/js/vendor/blob.js', + 'docs/assets/js/vendor/filesaver.js', 'docs/assets/js/raw-files.min.js', 'docs/assets/js/src/customizer.js' ], dest: 'docs/assets/js/customize.min.js' }, docsJs: { + // NOTE: This src list is duplicated in footer.html; if making changes here, be sure to update the other copy too. src: [ - 'docs/assets/js/_vendor/holder.js', - 'docs/assets/js/_vendor/ZeroClipboard.min.js', + 'docs/assets/js/vendor/holder.js', + 'docs/assets/js/vendor/ZeroClipboard.min.js', 'docs/assets/js/src/application.js' ], dest: 'docs/assets/js/docs.min.js' diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index cebd0ee7be..f962d19cc3 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -33,10 +33,16 @@ ================================================== --> +{% if site.github %} +{% else %} + +{% endif %} {% if site.github %} {% else %} + + {% endif %} {% if page.slug == "customize" %} diff --git a/docs/assets/js/_vendor/ZeroClipboard.min.js b/docs/assets/js/vendor/ZeroClipboard.min.js similarity index 100% rename from docs/assets/js/_vendor/ZeroClipboard.min.js rename to docs/assets/js/vendor/ZeroClipboard.min.js diff --git a/docs/assets/js/_vendor/blob.js b/docs/assets/js/vendor/blob.js similarity index 100% rename from docs/assets/js/_vendor/blob.js rename to docs/assets/js/vendor/blob.js diff --git a/docs/assets/js/_vendor/filesaver.js b/docs/assets/js/vendor/filesaver.js similarity index 100% rename from docs/assets/js/_vendor/filesaver.js rename to docs/assets/js/vendor/filesaver.js diff --git a/docs/assets/js/_vendor/holder.js b/docs/assets/js/vendor/holder.js similarity index 100% rename from docs/assets/js/_vendor/holder.js rename to docs/assets/js/vendor/holder.js diff --git a/docs/assets/js/_vendor/jszip.min.js b/docs/assets/js/vendor/jszip.min.js similarity index 100% rename from docs/assets/js/_vendor/jszip.min.js rename to docs/assets/js/vendor/jszip.min.js diff --git a/docs/assets/js/_vendor/less.min.js b/docs/assets/js/vendor/less.min.js similarity index 100% rename from docs/assets/js/_vendor/less.min.js rename to docs/assets/js/vendor/less.min.js diff --git a/docs/assets/js/_vendor/uglify.min.js b/docs/assets/js/vendor/uglify.min.js similarity index 100% rename from docs/assets/js/_vendor/uglify.min.js rename to docs/assets/js/vendor/uglify.min.js