diff --git a/doc-src/Gemfile.lock b/doc-src/Gemfile.lock index 738b38e5..37c68cec 100644 --- a/doc-src/Gemfile.lock +++ b/doc-src/Gemfile.lock @@ -8,7 +8,7 @@ GIT PATH remote: .. specs: - compass (0.11.beta.2.0d29379) + compass (0.11.beta.3.5a2ea40) chunky_png (~> 0.12.0) sass (>= 3.1.0.alpha.249) diff --git a/doc-src/assets/javascripts/download.js b/doc-src/assets/javascripts/install.js similarity index 84% rename from doc-src/assets/javascripts/download.js rename to doc-src/assets/javascripts/install.js index 8ad3b756..6b52b844 100644 --- a/doc-src/assets/javascripts/download.js +++ b/doc-src/assets/javascripts/install.js @@ -45,7 +45,14 @@ function showInstallCommand() { create_command = create_command + " --syntax sass"; } if ($("#options").val() == "customized") { - create_command = create_command + " --sass-dir <sassdir> --css-dir <cssdir> --javascripts-dir <jsdir> --images-dir <imgsdir>"; + $("#directories").show(); + create_command = create_command + + " --sass-dir \"" + $("#sassdir").val() + "\"" + + " --css-dir \"" + $("#cssdir").val() + "\"" + + " --javascripts-dir \"" + $("#jsdir").val() + "\"" + + " --images-dir \"" + $("#imagesdir").val() + "\""; + } else { + $("#directories").hide(); } commands.push(create_command); var instructions = "
" + commands.join("\n") + "
";
@@ -69,6 +76,7 @@ function attachMadlibBehaviors() {
}
});
$("#existence, #app-type, #framework, #syntax, #options").change(showInstallCommand);
+ $(".madlib input").keyup(function(){setTimeout(showInstallCommand, 0.1)});
}
function setupMadlib() {
diff --git a/doc-src/content/download.haml b/doc-src/content/install.haml
similarity index 78%
rename from doc-src/content/download.haml
rename to doc-src/content/install.haml
index f1c178f5..8b3769cf 100644
--- a/doc-src/content/download.haml
+++ b/doc-src/content/install.haml
@@ -1,10 +1,10 @@
---
-title: Download | Compass Documentation
-crumb: Download
-body_id: download
+title: Install the Compass Stylesheet Authoring Framework
+crumb: Install
+body_id: install
---
- content_for :javascripts do
- %script(src="/javascripts/download.js")
+ %script(src="/javascripts/install.js")
%p
Compass runs on any computer that has
ruby installed.
@@ -36,7 +36,18 @@ body_id: download
%select#options
%option{:value => "default"} use compass's recommended
%option{:value => "customized"} customize my project's
- directory structure.
+ directory structure .
+
%h4 Thanks. Now run the following steps in your terminal:
%p.note
diff --git a/doc-src/content/stylesheets/partials/_download.scss b/doc-src/content/stylesheets/partials/_install.scss
similarity index 62%
rename from doc-src/content/stylesheets/partials/_download.scss
rename to doc-src/content/stylesheets/partials/_install.scss
index ddc823ac..353a2df8 100644
--- a/doc-src/content/stylesheets/partials/_download.scss
+++ b/doc-src/content/stylesheets/partials/_install.scss
@@ -1,8 +1,10 @@
-body#download {
+body#install {
#steps, p.madlib, p.note, h4 { margin-top: 1em; }
p.note { font-size: smaller; font-style: italic; }
p.warning { color: #c00; }
.customization { display: none; }
.customizable .customization { display: inline; }
- blockquote { border-left: 2px solid #ccc; text-indent: 0; padding-left: 0.5em; }
+ blockquote { border-left: 2px solid #ccc;
+ text-indent: 0; padding-left: 0.5em; }
+ .customization input { width: 8em; }
}
\ No newline at end of file
diff --git a/doc-src/content/stylesheets/screen.scss b/doc-src/content/stylesheets/screen.scss
index cbbbe5ed..48b4c998 100644
--- a/doc-src/content/stylesheets/screen.scss
+++ b/doc-src/content/stylesheets/screen.scss
@@ -16,7 +16,7 @@
@import "partials/main";
@import "partials/code";
@import "partials/example";
-@import "partials/download";
+@import "partials/install";
@import "syntax/syntax-theme";
diff --git a/doc-src/layouts/partials/main-navigation.haml b/doc-src/layouts/partials/main-navigation.haml
index 038d17be..c8cef4d3 100644
--- a/doc-src/layouts/partials/main-navigation.haml
+++ b/doc-src/layouts/partials/main-navigation.haml
@@ -13,4 +13,4 @@
%li
%a{:href => "/get-involved/", :rel=> "get-involved"} Get Involved
%li
- %a{:href => "/download/", :rel=> "download"} Download
+ %a{:href => "/install/", :rel=> "install"} Install