You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by db...@apache.org on 2015/07/25 00:29:22 UTC

[5/5] docs commit: Adding sass.

Adding sass.


Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/2a421b99
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/2a421b99
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/2a421b99

Branch: refs/heads/cordova-website
Commit: 2a421b994f1d1c3309b5a162d504fb54f5b956fe
Parents: dfe3aac
Author: Dmitry Blotsky <dm...@gmail.com>
Authored: Fri Jul 24 15:29:14 2015 -0700
Committer: Dmitry Blotsky <dm...@gmail.com>
Committed: Fri Jul 24 15:29:14 2015 -0700

----------------------------------------------------------------------
 gulpfile.js                              |  25 +-
 package.json                             |   1 +
 www/static/css-src/docs.css              |  13 +
 www/static/css-src/lib/bootstrap.min.css |   5 +
 www/static/css-src/main.css              | 175 ++++++
 www/static/css-src/master.less           | 867 ++++++++++++++++++++++++++
 www/static/css-src/test.scss             |   7 +
 www/static/less/docs.css                 |  13 -
 www/static/less/lib/bootstrap.min.css    |   5 -
 www/static/less/main.css                 | 175 ------
 www/static/less/master.less              | 867 --------------------------
 11 files changed, 1084 insertions(+), 1069 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/2a421b99/gulpfile.js
----------------------------------------------------------------------
diff --git a/gulpfile.js b/gulpfile.js
index 4c91f55..26833f9 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -7,6 +7,7 @@ var child_process = require("child_process");
 
 var gulp    = require("gulp");
 var less    = require("gulp-less");
+var sass    = require("gulp-sass");
 var vstream = require("vinyl-source-stream");
 var buffer  = require("vinyl-buffer");
 
@@ -14,13 +15,13 @@ var buffer  = require("vinyl-buffer");
 var CONFIG_FILES = ["_config.yml", "_defaults.yml"];
 var JEKYLL_FLAGS = ["--trace", "--config", CONFIG_FILES.join(",")];
 
-var SOURCE_DIR = "www";
-var BIN_DIR    = path.join("tools", "bin");
-var DATA_DIR   = path.join(SOURCE_DIR, "_data");
-var DOCS_DIR   = path.join(SOURCE_DIR, "docs");
-var LESS_DIR   = path.join(SOURCE_DIR, "static", "less");
-var CSS_DIR    = path.join(SOURCE_DIR, "static", "css");
-var BUILD_DIR  = "public";
+var SOURCE_DIR  = "www";
+var BIN_DIR     = path.join("tools", "bin");
+var DATA_DIR    = path.join(SOURCE_DIR, "_data");
+var DOCS_DIR    = path.join(SOURCE_DIR, "docs");
+var CSS_SRC_DIR = path.join(SOURCE_DIR, "static", "css-src");
+var CSS_DIR     = path.join(SOURCE_DIR, "static", "css");
+var BUILD_DIR   = "public";
 
 // helpers
 function execPiped(command, args, fileName) {
@@ -79,10 +80,16 @@ gulp.task("toc", function (done) {
 });
 
 gulp.task("styles", function() {
-    gulp.src(path.join(LESS_DIR, "**/*.less"))
+
+    gulp.src(path.join(CSS_SRC_DIR, "**", "*.less"))
         .pipe(less())
         .pipe(gulp.dest(CSS_DIR));
-    gulp.src(path.join(LESS_DIR, "**/*.css"))
+
+    gulp.src(path.join(CSS_SRC_DIR, "**", "*.css"))
+        .pipe(gulp.dest(CSS_DIR));
+
+    gulp.src(path.join(CSS_SRC_DIR, "**", "*.scss"))
+        .pipe(sass().on("error", sass.logError))
         .pipe(gulp.dest(CSS_DIR));
 });
 

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/2a421b99/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 84a5d99..8ea5ee8 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "gulp-concat": "^2.6.0",
     "gulp-less": "^3.0.3",
     "gulp-run": "^1.6.8",
+    "gulp-sass": "^2.0.4",
     "jodoc": "git://github.com/kant2002/jodoc-js",
     "js-yaml": "^3.2.2",
     "less": "^2.5.1",

http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/2a421b99/www/static/css-src/docs.css
----------------------------------------------------------------------
diff --git a/www/static/css-src/docs.css b/www/static/css-src/docs.css
new file mode 100644
index 0000000..67d300a
--- /dev/null
+++ b/www/static/css-src/docs.css
@@ -0,0 +1,13 @@
+.toc-active a {
+    color: red;
+}
+
+.page-toc-anchor {
+    display: block;
+    position: relative;
+    bottom: 50px;
+}
+
+.missing-version {
+    color: red !important;
+}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org