You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by an...@apache.org on 2015/09/07 19:05:13 UTC

[1/5] incubator-apex-site git commit: add watch gulp task

Repository: incubator-apex-site
Updated Branches:
  refs/heads/master b45e77a1b -> 5bfd6ae84


add watch gulp task


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/commit/0a2dded4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/tree/0a2dded4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/diff/0a2dded4

Branch: refs/heads/master
Commit: 0a2dded4c22acf7e87b330b216fa72409e3043ff
Parents: b45e77a
Author: Andy Perlitch <an...@gmail.com>
Authored: Sat Sep 5 21:21:32 2015 -0700
Committer: Andy Perlitch <an...@gmail.com>
Committed: Sat Sep 5 21:21:32 2015 -0700

----------------------------------------------------------------------
 gulpfile.js | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/0a2dded4/gulpfile.js
----------------------------------------------------------------------
diff --git a/gulpfile.js b/gulpfile.js
index 003e067..b67dc31 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -70,5 +70,11 @@ gulp.task('less', function () {
     .pipe(gulp.dest(path.join(BUILD_LOCATION, 'css')));
 });
 
+// Default task is to build the site
 gulp.task('default', ['less', 'html']);
 
+// Watch for changes
+gulp.task('watch', function() {
+  gulp.watch('./src/less/*.less', ['less']);
+  gulp.watch(['./src/pages/*.html', './src/partials/*.handlebars', './src/md/*.md'], ['html']);
+});
\ No newline at end of file


[2/5] incubator-apex-site git commit: add copy:js gulp task

Posted by an...@apache.org.
add copy:js gulp task


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/commit/c6c0ea08
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/tree/c6c0ea08
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/diff/c6c0ea08

Branch: refs/heads/master
Commit: c6c0ea0888b2638df671c5d66d872e88f80ddd73
Parents: 0a2dded
Author: Andy Perlitch <an...@gmail.com>
Authored: Sun Sep 6 10:08:14 2015 -0700
Committer: Andy Perlitch <an...@gmail.com>
Committed: Sun Sep 6 10:08:14 2015 -0700

----------------------------------------------------------------------
 gulpfile.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/c6c0ea08/gulpfile.js
----------------------------------------------------------------------
diff --git a/gulpfile.js b/gulpfile.js
index b67dc31..2858de0 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -70,8 +70,16 @@ gulp.task('less', function () {
     .pipe(gulp.dest(path.join(BUILD_LOCATION, 'css')));
 });
 
+// Copies necessary dependencies to dist
+gulp.task('copy:js', function() {
+  return gulp.src([
+    './bower_components/bootstrap/dist/js/bootstrap.min.js'
+  ])
+    .pipe(gulp.dest(path.join(BUILD_LOCATION, 'js')));
+});
+
 // Default task is to build the site
-gulp.task('default', ['less', 'html']);
+gulp.task('default', ['less', 'html', 'copy:js']);
 
 // Watch for changes
 gulp.task('watch', function() {


[4/5] incubator-apex-site git commit: first cut at actual content

Posted by an...@apache.org.
first cut at actual content


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/commit/0cffb1aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/tree/0cffb1aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/diff/0cffb1aa

Branch: refs/heads/master
Commit: 0cffb1aaac0e8fd7278e3c7af9bb439bfbe25061
Parents: 720c2ec
Author: Andy Perlitch <an...@gmail.com>
Authored: Mon Sep 7 09:45:03 2015 -0700
Committer: Andy Perlitch <an...@gmail.com>
Committed: Mon Sep 7 09:46:41 2015 -0700

----------------------------------------------------------------------
 README.md                      | 18 +++++++++++++++++-
 gulpfile.js                    | 36 +++++++++--------------------------
 navigation.js                  | 22 +++++++++++++++++++++
 src/less/index.less            |  3 +++
 src/less/variables.less        |  2 +-
 src/md/community.md            | 21 ++++++++++++++++++++
 src/md/docs.md                 |  3 +++
 src/pages/community.html       |  6 +++++-
 src/pages/docs.html            |  6 +++++-
 src/pages/index.html           | 38 ++++++++++++++++++++++++++++++++++---
 src/partials/footer.handlebars | 27 ++++++++++++--------------
 src/partials/header.handlebars | 36 +++++++++++++++++++++--------------
 12 files changed, 155 insertions(+), 63 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/0cffb1aa/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index fcc3f4b..23cf4ba 100644
--- a/README.md
+++ b/README.md
@@ -41,4 +41,20 @@ Assuming you have a file called `src/md/example_markdown.md`, you could have thi
 {{> example_markdown}}
 
 {{> footer}}
-```
\ No newline at end of file
+```
+
+Building
+--------
+Requires nodejs and npm.
+```bash
+# install dependencies
+npm install
+# run gulp command
+./node_modules/.bin/gulp
+```
+
+Developing
+----------
+
+When making changes to src files, you can run `grunt watch`, which will constantly build the project in the `/content` folder,
+so you don't have to manually run `grunt` after every change
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/0cffb1aa/gulpfile.js
----------------------------------------------------------------------
diff --git a/gulpfile.js b/gulpfile.js
index 2858de0..f7f4197 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -15,7 +15,10 @@ var BUILD_LOCATION = './content';
 gulp.task('md2html', function() {
   return gulp.src('./src/md/*.md')
     .pipe(marked())
-    .pipe(gulp.dest(TEMP_PARTIAL_LOCATION));
+    .pipe(gulp.dest(TEMP_PARTIAL_LOCATION))
+    .on('error', function(err) {
+      console.warn(err);
+    });
 });
 
 // Builds html files from src/pages
@@ -27,34 +30,13 @@ gulp.task('html', ['md2html'], function() {
     batch: ['./src/partials', TEMP_PARTIAL_LOCATION]
   };
 
-
-  // Passed into every template for interpolation
-  var templateData = {
-
-    // Nav elements
-    nav: [
-      { id: 'index', label: 'Home', href: '/' },
-      { id: 'community', label: 'Community', href: '/community.html' },
-      { id: 'docs', label: 'Docs', href: '/docs.html' },
-      { id: 'github', label: 'Github', items: [
-        { label: 'Apex Core', href: 'https://github.com/apache/incubator-apex-core' },
-        { label: 'Apex Malhar', href: 'https://github.com/apache/incubator-apex-malhar' }
-      ] },
-      { id: 'apache', label: 'Apache', items: [
-        { label: 'Status Page', href: 'http://incubator.apache.org/projects/apex.html' },
-        { label: 'Apache Foundation', href: 'http://www.apache.org/foundation/how-it-works.html' },
-        { label: 'Apache License', href: 'http://www.apache.org/licenses/' },
-        { label: 'Sponsorship', href: 'http://www.apache.org/foundation/sponsorship.html' },
-        { label: 'Thanks', href: 'http://www.apache.org/foundation/thanks.html' }
-      ]}
-    ]
-
-  };
-
   // Render the files in pages
   gulp.src('./src/pages/*.html')
-    .pipe(handlebars(templateData, options))
-    .pipe(gulp.dest(BUILD_LOCATION));
+    .pipe(handlebars({ nav: require('./navigation') }, options))
+    .pipe(gulp.dest(BUILD_LOCATION))
+    .on('error', function(err) {
+      console.warn(err);
+    });
 
 });
 

http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/0cffb1aa/navigation.js
----------------------------------------------------------------------
diff --git a/navigation.js b/navigation.js
new file mode 100644
index 0000000..5eb447c
--- /dev/null
+++ b/navigation.js
@@ -0,0 +1,22 @@
+'use strict';
+
+/**
+ * This array generates the top navigation
+ */
+
+exports = module.exports = [
+  { id: 'index', label: 'Home', href: '/' },
+  { id: 'community', label: 'Community', href: '/community.html' },
+  { id: 'docs', label: 'Docs', href: '/docs.html' },
+  { id: 'github', label: 'Github', items: [
+    { label: 'Apex Core', href: 'https://github.com/apache/incubator-apex-core' },
+    { label: 'Apex Malhar', href: 'https://github.com/apache/incubator-apex-malhar' }
+  ] },
+  { id: 'apache', label: 'Apache', items: [
+    { label: 'Status Page', href: 'http://incubator.apache.org/projects/apex.html' },
+    { label: 'Apache Foundation', href: 'http://www.apache.org/foundation/how-it-works.html' },
+    { label: 'Apache License', href: 'http://www.apache.org/licenses/' },
+    { label: 'Sponsorship', href: 'http://www.apache.org/foundation/sponsorship.html' },
+    { label: 'Thanks', href: 'http://www.apache.org/foundation/thanks.html' }
+  ]}
+];
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/0cffb1aa/src/less/index.less
----------------------------------------------------------------------
diff --git a/src/less/index.less b/src/less/index.less
index b247158..2982058 100644
--- a/src/less/index.less
+++ b/src/less/index.less
@@ -2,4 +2,7 @@
   margin-top:-10px;
   background-color: @brand-primary;
   color: white;
+  h1 small {
+    color: rgba(255,255,255,0.5);
+  }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/0cffb1aa/src/less/variables.less
----------------------------------------------------------------------
diff --git a/src/less/variables.less b/src/less/variables.less
index 39e05ae..01c08ee 100644
--- a/src/less/variables.less
+++ b/src/less/variables.less
@@ -14,7 +14,7 @@
 @gray-light:             lighten(@gray-base, 46.7%); // #777
 @gray-lighter:           lighten(@gray-base, 93.5%); // #eee
 
-@brand-primary:         darken(#4034A9, 6.5%); // #337ab7
+@brand-primary:         #408547; // #337ab7
 @brand-success:         #5cb85c;
 @brand-info:            #5bc0de;
 @brand-warning:         #f0ad4e;

http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/0cffb1aa/src/md/community.md
----------------------------------------------------------------------
diff --git a/src/md/community.md b/src/md/community.md
new file mode 100644
index 0000000..b03461f
--- /dev/null
+++ b/src/md/community.md
@@ -0,0 +1,21 @@
+# Community
+
+## Mailing Lists
+
+The following mailing lists can be used to get help with Apex.
+
+- [users@apex.incubator.apache.org](http://mail-archives.apache.org/mod_mbox/incubator-apex-users/) is for usage questions, help, and announcements. [subscribe](mailto:users-subscribe@apex.incubator.apache.org?subject=send%20this%20email%20to%20subscribe), [unsubscribe](mailto:users-unsubscribe@apex.incubator.apache.org?subject=send%20this%20email%20to%20unsubscribe), [archives](http://mail-archives.apache.org/mod_mbox/incubator-apex-users/)
+- [dev@apex.incubator.apache.org](http://mail-archives.apache.org/mod_mbox/incubator-apex-dev/) is for people who want to contribute code to apex. [subscribe](mailto:dev-subscribe@apex.incubator.apache.org?subject=send%20this%20email%20to%20subscribe), [unsubscribe](mailto:dev-unsubscribe@apex.incubator.apache.org?subject=send%20this%20email%20to%20unsubscribe), [archives](http://mail-archives.apache.org/mod_mbox/incubator-apex-dev/)
+- [commits@apex.incubator.apache.org](http://mail-archives.apache.org/mod_mbox/incubator-apex-commits/) is for commit messages and patches to apex. [subscribe](mailto:commits-subscribe@apex.incubator.apache.org?subject=send%20this%20email%20to%20subscribe), [unsubscribe](mailto:commits-unsubscribe@apex.incubator.apache.org?subject=send%20this%20email%20to%20unsubscribe), [archives](http://mail-archives.apache.org/mod_mbox/incubator-apex-commits/)
+
+
+## Github Repositories
+
+The Apex Project is made up of two repositories:
+
+- [Apex Core](https://github.com/apache/incubator-apex-core) - The core of the Apex platform.
+- [Apex Malhar](https://github.com/apache/incubator-apex-malhar) - Community-driven set of open-source "operators" and utilities for use in your Apex applications.
+
+## Issue Tracking
+
+[Apex JIRA](https://malhar.atlassian.net/projects/APEX/issues)
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/0cffb1aa/src/md/docs.md
----------------------------------------------------------------------
diff --git a/src/md/docs.md b/src/md/docs.md
new file mode 100644
index 0000000..7ee48e1
--- /dev/null
+++ b/src/md/docs.md
@@ -0,0 +1,3 @@
+# Documentation
+
+Docs are coming soon!
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/0cffb1aa/src/pages/community.html
----------------------------------------------------------------------
diff --git a/src/pages/community.html b/src/pages/community.html
index df5b817..b230c5d 100644
--- a/src/pages/community.html
+++ b/src/pages/community.html
@@ -1,5 +1,9 @@
 {{> header}}
 
-Community
+<div class="container">
+  
+  {{> community}}
+
+</div>
 
 {{> footer}}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/0cffb1aa/src/pages/docs.html
----------------------------------------------------------------------
diff --git a/src/pages/docs.html b/src/pages/docs.html
index ef1eead..33a54c1 100644
--- a/src/pages/docs.html
+++ b/src/pages/docs.html
@@ -1,5 +1,9 @@
 {{> header}}
 
-Documentation coming soon!
+<div class="container">
+  
+  {{> docs}}
+
+</div>
 
 {{> footer}}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/0cffb1aa/src/pages/index.html
----------------------------------------------------------------------
diff --git a/src/pages/index.html b/src/pages/index.html
index 220b66b..c9744e2 100644
--- a/src/pages/index.html
+++ b/src/pages/index.html
@@ -3,9 +3,41 @@
 <!-- Main jumbotron for a primary marketing message or call to action -->
 <div class="jumbotron">
   <div class="container">
-    <h1>Hello, world!</h1>
-    <p>This is a template for a simple marketing or informational website. It includes a large callout called a jumbotron and three supporting pieces of content. Use it as a starting point to create something more unique.</p>
-    <p><a class="btn btn-primary btn-lg" href="#" role="button">Learn more »</a></p>
+    <h1>Apache Apex <small>(incubating)</small></h1>
+    <p>An enterprise grade native YARN big data-in-motion platform that unifies stream processing as well as batch processing.</p>
+    <p>
+      <a class="btn btn-info btn-lg" href="http://incubator.apache.org/projects/apex.html" role="button">Incubation Status Page</a>
+      <a class="btn btn-info btn-lg" href="https://github.com/apache/incubator-apex-core" role="button">Github</a>
+    </p>
+  </div>
+</div>
+
+<div class="container">
+  <!-- Example row of columns -->
+  <div class="row">
+    <div class="col-md-4">
+      <h2>Highly Scalable</h2>
+      <p>
+        The Apex engine is capable of processing billions of events per second using minimal resources,
+        and outperforms all other streaming solutions by orders of magnitude.
+      </p>
+      <p><a class="btn btn-secondary" href="#" role="button">View details »</a></p>
+   </div>
+   <div class="col-md-4">
+      <h2>Fault Tolerant</h2>
+      <p>
+        Recovery mechanisms are built-in to the Apex platform, so you don't need to write application code to ensure fault-tolerance.
+      </p>
+      <p><a class="btn btn-secondary" href="#" role="button">View details »</a></p>
+    </div>
+    <div class="col-md-4">
+      <h2>Easy to Use</h2>
+      <p>
+        The Apex platform has a simple programming paradigm, you only need to worry about writing your own business logic.
+        Then use simple attributes to fine-tune your application.
+      </p>
+      <p><a class="btn btn-secondary" href="#" role="button">View details »</a></p>
+    </div>
   </div>
 </div>
 

http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/0cffb1aa/src/partials/footer.handlebars
----------------------------------------------------------------------
diff --git a/src/partials/footer.handlebars b/src/partials/footer.handlebars
index 8f4cf7a..118b537 100644
--- a/src/partials/footer.handlebars
+++ b/src/partials/footer.handlebars
@@ -1,17 +1,14 @@
-      <hr>
-
-      <footer>
-        <p>© Company 2014</p>
-      </footer>
-    </div> <!-- /container -->
-
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
-    <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
-    <script src="../../dist/js/bootstrap.min.js"></script>
+  <hr>
+  <div class="container">
+    <footer>
+      <p>© Apache Software Foundation 2015</p>
+    </footer>
+  </div> <!-- /container -->
+
+  <!-- Placed at the end of the document so the pages load faster -->
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+  <script src="/js/bootstrap.min.js"></script>
   
 
-</body></html>
\ No newline at end of file
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/0cffb1aa/src/partials/header.handlebars
----------------------------------------------------------------------
diff --git a/src/partials/header.handlebars b/src/partials/header.handlebars
index 37f0ff9..0e4d6db 100644
--- a/src/partials/header.handlebars
+++ b/src/partials/header.handlebars
@@ -16,18 +16,26 @@
   </head>
 
   <body>
-
-    <nav class="navbar navbar-inverse navbar-static-top">
-      <a class="navbar-brand" href="#">Apache Apex <small>(incubating)</small></a>
-      <ul class="nav nav-pills">
-        <li class="nav-item">
-          <a class="nav-link" href="community.html">Community</a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="#">About</a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="#">Contact</a>
-        </li>
-      </ul>
+    <nav class="navbar navbar-static-top" id="main-nav">
+      <div class="container">
+        <a class="navbar-brand" href="#">Apache Apex <small>(incubating)</small></a>
+        <ul class="nav nav-pills navbar-right">
+          {{#each nav}}
+          {{#if items}}
+          <li class="nav-item">
+            <a href="#" data-toggle="dropdown" class="dropdown-toggle nav-link">{{label}}<b class="caret"></b></a>
+             <ul class="dropdown-menu">
+              {{#each items}}
+              <li><a href="{{href}}">{{label}}</a></li>
+              {{/each}}
+            </ul>
+          </li>
+          {{else}}
+          <li class="nav-item">
+            <a class="nav-link" href="{{href}}">{{label}}</a>
+          </li>
+          {{/if}}
+          {{/each}}
+        </ul>
+      </div>
     </nav>
\ No newline at end of file


[3/5] incubator-apex-site git commit: added custom style files

Posted by an...@apache.org.
added custom style files


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/commit/720c2ec7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/tree/720c2ec7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/diff/720c2ec7

Branch: refs/heads/master
Commit: 720c2ec79c47775ffa99990a4b4f0aea05c164e1
Parents: c6c0ea0
Author: Andy Perlitch <an...@gmail.com>
Authored: Sun Sep 6 10:09:18 2015 -0700
Committer: Andy Perlitch <an...@gmail.com>
Committed: Sun Sep 6 10:09:18 2015 -0700

----------------------------------------------------------------------
 src/less/header.less    |  24 ++
 src/less/index.less     |   5 +
 src/less/main.less      |   5 +-
 src/less/variables.less | 867 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 900 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/720c2ec7/src/less/header.less
----------------------------------------------------------------------
diff --git a/src/less/header.less b/src/less/header.less
new file mode 100644
index 0000000..61d2cf1
--- /dev/null
+++ b/src/less/header.less
@@ -0,0 +1,24 @@
+#main-nav {
+  background-color: @brand-primary;
+  margin-bottom: 10px;
+  .nav-link {
+    color: white;
+    cursor: pointer;
+    &:hover {
+      background: lighten(@brand-primary, 25%);
+    }
+  }
+  .navbar-brand {
+    font-family: @headings-font-family;
+    color: white;
+    font-weight: bold;
+    font-size: 20px;
+    small {
+      font-weight: normal;
+      color: #CCC;
+    }
+  }
+  ul {
+    margin-top: 6px;
+  }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/720c2ec7/src/less/index.less
----------------------------------------------------------------------
diff --git a/src/less/index.less b/src/less/index.less
new file mode 100644
index 0000000..b247158
--- /dev/null
+++ b/src/less/index.less
@@ -0,0 +1,5 @@
+.jumbotron {
+  margin-top:-10px;
+  background-color: @brand-primary;
+  color: white;
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/720c2ec7/src/less/main.less
----------------------------------------------------------------------
diff --git a/src/less/main.less b/src/less/main.less
index c1460f3..4b870f3 100644
--- a/src/less/main.less
+++ b/src/less/main.less
@@ -1 +1,4 @@
-@import "../../bower_components/bootstrap/less/bootstrap.less";
\ No newline at end of file
+@import "../../bower_components/bootstrap/less/bootstrap.less";
+@import "./variables.less";
+@import "./header.less";
+@import "./index.less";
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/720c2ec7/src/less/variables.less
----------------------------------------------------------------------
diff --git a/src/less/variables.less b/src/less/variables.less
new file mode 100644
index 0000000..39e05ae
--- /dev/null
+++ b/src/less/variables.less
@@ -0,0 +1,867 @@
+//
+// Variables
+// --------------------------------------------------
+
+
+//== Colors
+//
+//## Gray and brand colors for use across Bootstrap.
+
+@gray-base:              #000;
+@gray-darker:            lighten(@gray-base, 13.5%); // #222
+@gray-dark:              lighten(@gray-base, 20%);   // #333
+@gray:                   lighten(@gray-base, 33.5%); // #555
+@gray-light:             lighten(@gray-base, 46.7%); // #777
+@gray-lighter:           lighten(@gray-base, 93.5%); // #eee
+
+@brand-primary:         darken(#4034A9, 6.5%); // #337ab7
+@brand-success:         #5cb85c;
+@brand-info:            #5bc0de;
+@brand-warning:         #f0ad4e;
+@brand-danger:          #d9534f;
+
+
+//== Scaffolding
+//
+//## Settings for some of the most global styles.
+
+//** Background color for `<body>`.
+@body-bg:               #fff;
+//** Global text color on `<body>`.
+@text-color:            @gray-dark;
+
+//** Global textual link color.
+@link-color:            @brand-primary;
+//** Link hover color set via `darken()` function.
+@link-hover-color:      darken(@link-color, 15%);
+//** Link hover decoration.
+@link-hover-decoration: underline;
+
+
+//== Typography
+//
+//## Font, line-height, and color for body text, headings, and more.
+
+@font-family-sans-serif:  "Helvetica Neue", Helvetica, Arial, sans-serif;
+@font-family-serif:       Georgia, "Times New Roman", Times, serif;
+//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
+@font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
+@font-family-base:        @font-family-sans-serif;
+
+@font-size-base:          14px;
+@font-size-large:         ceil((@font-size-base * 1.25)); // ~18px
+@font-size-small:         ceil((@font-size-base * 0.85)); // ~12px
+
+@font-size-h1:            floor((@font-size-base * 2.6)); // ~36px
+@font-size-h2:            floor((@font-size-base * 2.15)); // ~30px
+@font-size-h3:            ceil((@font-size-base * 1.7)); // ~24px
+@font-size-h4:            ceil((@font-size-base * 1.25)); // ~18px
+@font-size-h5:            @font-size-base;
+@font-size-h6:            ceil((@font-size-base * 0.85)); // ~12px
+
+//** Unit-less `line-height` for use in components like buttons.
+@line-height-base:        1.428571429; // 20/14
+//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
+@line-height-computed:    floor((@font-size-base * @line-height-base)); // ~20px
+
+//** By default, this inherits from the `<body>`.
+@headings-font-family:    "Open Sans", @font-family-sans-serif;
+@headings-font-weight:    100;
+@headings-line-height:    1.1;
+@headings-color:          inherit;
+
+
+//== Iconography
+//
+//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
+
+//** Load fonts from this directory.
+@icon-font-path:          "../fonts/";
+//** File name for all font files.
+@icon-font-name:          "glyphicons-halflings-regular";
+//** Element ID within SVG icon file.
+@icon-font-svg-id:        "glyphicons_halflingsregular";
+
+
+//== Components
+//
+//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
+
+@padding-base-vertical:     6px;
+@padding-base-horizontal:   12px;
+
+@padding-large-vertical:    10px;
+@padding-large-horizontal:  16px;
+
+@padding-small-vertical:    5px;
+@padding-small-horizontal:  10px;
+
+@padding-xs-vertical:       1px;
+@padding-xs-horizontal:     5px;
+
+@line-height-large:         1.3333333; // extra decimals for Win 8.1 Chrome
+@line-height-small:         1.5;
+
+@border-radius-base:        4px;
+@border-radius-large:       6px;
+@border-radius-small:       3px;
+
+//** Global color for active items (e.g., navs or dropdowns).
+@component-active-color:    #fff;
+//** Global background color for active items (e.g., navs or dropdowns).
+@component-active-bg:       @brand-primary;
+
+//** Width of the `border` for generating carets that indicator dropdowns.
+@caret-width-base:          4px;
+//** Carets increase slightly in size for larger components.
+@caret-width-large:         5px;
+
+
+//== Tables
+//
+//## Customizes the `.table` component with basic values, each used across all table variations.
+
+//** Padding for `<th>`s and `<td>`s.
+@table-cell-padding:            8px;
+//** Padding for cells in `.table-condensed`.
+@table-condensed-cell-padding:  5px;
+
+//** Default background color used for all tables.
+@table-bg:                      transparent;
+//** Background color used for `.table-striped`.
+@table-bg-accent:               #f9f9f9;
+//** Background color used for `.table-hover`.
+@table-bg-hover:                #f5f5f5;
+@table-bg-active:               @table-bg-hover;
+
+//** Border color for table and cell borders.
+@table-border-color:            #ddd;
+
+
+//== Buttons
+//
+//## For each of Bootstrap's buttons, define text, background and border color.
+
+@btn-font-weight:                normal;
+
+@btn-default-color:              #333;
+@btn-default-bg:                 #fff;
+@btn-default-border:             #ccc;
+
+@btn-primary-color:              #fff;
+@btn-primary-bg:                 @brand-primary;
+@btn-primary-border:             darken(@btn-primary-bg, 5%);
+
+@btn-success-color:              #fff;
+@btn-success-bg:                 @brand-success;
+@btn-success-border:             darken(@btn-success-bg, 5%);
+
+@btn-info-color:                 #fff;
+@btn-info-bg:                    @brand-info;
+@btn-info-border:                darken(@btn-info-bg, 5%);
+
+@btn-warning-color:              #fff;
+@btn-warning-bg:                 @brand-warning;
+@btn-warning-border:             darken(@btn-warning-bg, 5%);
+
+@btn-danger-color:               #fff;
+@btn-danger-bg:                  @brand-danger;
+@btn-danger-border:              darken(@btn-danger-bg, 5%);
+
+@btn-link-disabled-color:        @gray-light;
+
+// Allows for customizing button radius independently from global border radius
+@btn-border-radius-base:         @border-radius-base;
+@btn-border-radius-large:        @border-radius-large;
+@btn-border-radius-small:        @border-radius-small;
+
+
+//== Forms
+//
+//##
+
+//** `<input>` background color
+@input-bg:                       #fff;
+//** `<input disabled>` background color
+@input-bg-disabled:              @gray-lighter;
+
+//** Text color for `<input>`s
+@input-color:                    @gray;
+//** `<input>` border color
+@input-border:                   #ccc;
+
+// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
+//** Default `.form-control` border radius
+// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
+@input-border-radius:            @border-radius-base;
+//** Large `.form-control` border radius
+@input-border-radius-large:      @border-radius-large;
+//** Small `.form-control` border radius
+@input-border-radius-small:      @border-radius-small;
+
+//** Border color for inputs on focus
+@input-border-focus:             #66afe9;
+
+//** Placeholder text color
+@input-color-placeholder:        #999;
+
+//** Default `.form-control` height
+@input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 2);
+//** Large `.form-control` height
+@input-height-large:             (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
+//** Small `.form-control` height
+@input-height-small:             (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
+
+//** `.form-group` margin
+@form-group-margin-bottom:       15px;
+
+@legend-color:                   @gray-dark;
+@legend-border-color:            #e5e5e5;
+
+//** Background color for textual input addons
+@input-group-addon-bg:           @gray-lighter;
+//** Border color for textual input addons
+@input-group-addon-border-color: @input-border;
+
+//** Disabled cursor for form controls and buttons.
+@cursor-disabled:                not-allowed;
+
+
+//== Dropdowns
+//
+//## Dropdown menu container and contents.
+
+//** Background for the dropdown menu.
+@dropdown-bg:                    #fff;
+//** Dropdown menu `border-color`.
+@dropdown-border:                rgba(0,0,0,.15);
+//** Dropdown menu `border-color` **for IE8**.
+@dropdown-fallback-border:       #ccc;
+//** Divider color for between dropdown items.
+@dropdown-divider-bg:            #e5e5e5;
+
+//** Dropdown link text color.
+@dropdown-link-color:            @gray-dark;
+//** Hover color for dropdown links.
+@dropdown-link-hover-color:      darken(@gray-dark, 5%);
+//** Hover background for dropdown links.
+@dropdown-link-hover-bg:         #f5f5f5;
+
+//** Active dropdown menu item text color.
+@dropdown-link-active-color:     @component-active-color;
+//** Active dropdown menu item background color.
+@dropdown-link-active-bg:        @component-active-bg;
+
+//** Disabled dropdown menu item background color.
+@dropdown-link-disabled-color:   @gray-light;
+
+//** Text color for headers within dropdown menus.
+@dropdown-header-color:          @gray-light;
+
+//** Deprecated `@dropdown-caret-color` as of v3.1.0
+@dropdown-caret-color:           #000;
+
+
+//-- Z-index master list
+//
+// Warning: Avoid customizing these values. They're used for a bird's eye view
+// of components dependent on the z-axis and are designed to all work together.
+//
+// Note: These variables are not generated into the Customizer.
+
+@zindex-navbar:            1000;
+@zindex-dropdown:          1000;
+@zindex-popover:           1060;
+@zindex-tooltip:           1070;
+@zindex-navbar-fixed:      1030;
+@zindex-modal-background:  1040;
+@zindex-modal:             1050;
+
+
+//== Media queries breakpoints
+//
+//## Define the breakpoints at which your layout will change, adapting to different screen sizes.
+
+// Extra small screen / phone
+//** Deprecated `@screen-xs` as of v3.0.1
+@screen-xs:                  480px;
+//** Deprecated `@screen-xs-min` as of v3.2.0
+@screen-xs-min:              @screen-xs;
+//** Deprecated `@screen-phone` as of v3.0.1
+@screen-phone:               @screen-xs-min;
+
+// Small screen / tablet
+//** Deprecated `@screen-sm` as of v3.0.1
+@screen-sm:                  768px;
+@screen-sm-min:              @screen-sm;
+//** Deprecated `@screen-tablet` as of v3.0.1
+@screen-tablet:              @screen-sm-min;
+
+// Medium screen / desktop
+//** Deprecated `@screen-md` as of v3.0.1
+@screen-md:                  992px;
+@screen-md-min:              @screen-md;
+//** Deprecated `@screen-desktop` as of v3.0.1
+@screen-desktop:             @screen-md-min;
+
+// Large screen / wide desktop
+//** Deprecated `@screen-lg` as of v3.0.1
+@screen-lg:                  1200px;
+@screen-lg-min:              @screen-lg;
+//** Deprecated `@screen-lg-desktop` as of v3.0.1
+@screen-lg-desktop:          @screen-lg-min;
+
+// So media queries don't overlap when required, provide a maximum
+@screen-xs-max:              (@screen-sm-min - 1);
+@screen-sm-max:              (@screen-md-min - 1);
+@screen-md-max:              (@screen-lg-min - 1);
+
+
+//== Grid system
+//
+//## Define your custom responsive grid.
+
+//** Number of columns in the grid.
+@grid-columns:              12;
+//** Padding between columns. Gets divided in half for the left and right.
+@grid-gutter-width:         30px;
+// Navbar collapse
+//** Point at which the navbar becomes uncollapsed.
+@grid-float-breakpoint:     @screen-sm-min;
+//** Point at which the navbar begins collapsing.
+@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
+
+
+//== Container sizes
+//
+//## Define the maximum width of `.container` for different screen sizes.
+
+// Small screen / tablet
+@container-tablet:             (720px + @grid-gutter-width);
+//** For `@screen-sm-min` and up.
+@container-sm:                 @container-tablet;
+
+// Medium screen / desktop
+@container-desktop:            (940px + @grid-gutter-width);
+//** For `@screen-md-min` and up.
+@container-md:                 @container-desktop;
+
+// Large screen / wide desktop
+@container-large-desktop:      (1140px + @grid-gutter-width);
+//** For `@screen-lg-min` and up.
+@container-lg:                 @container-large-desktop;
+
+
+//== Navbar
+//
+//##
+
+// Basics of a navbar
+@navbar-height:                    50px;
+@navbar-margin-bottom:             @line-height-computed;
+@navbar-border-radius:             @border-radius-base;
+@navbar-padding-horizontal:        floor((@grid-gutter-width / 2));
+@navbar-padding-vertical:          ((@navbar-height - @line-height-computed) / 2);
+@navbar-collapse-max-height:       340px;
+
+@navbar-default-color:             #777;
+@navbar-default-bg:                #f8f8f8;
+@navbar-default-border:            darken(@navbar-default-bg, 6.5%);
+
+// Navbar links
+@navbar-default-link-color:                #777;
+@navbar-default-link-hover-color:          #333;
+@navbar-default-link-hover-bg:             transparent;
+@navbar-default-link-active-color:         #555;
+@navbar-default-link-active-bg:            darken(@navbar-default-bg, 6.5%);
+@navbar-default-link-disabled-color:       #ccc;
+@navbar-default-link-disabled-bg:          transparent;
+
+// Navbar brand label
+@navbar-default-brand-color:               @navbar-default-link-color;
+@navbar-default-brand-hover-color:         darken(@navbar-default-brand-color, 10%);
+@navbar-default-brand-hover-bg:            transparent;
+
+// Navbar toggle
+@navbar-default-toggle-hover-bg:           #ddd;
+@navbar-default-toggle-icon-bar-bg:        #888;
+@navbar-default-toggle-border-color:       #ddd;
+
+
+//=== Inverted navbar
+// Reset inverted navbar basics
+@navbar-inverse-color:                      lighten(@gray-light, 15%);
+@navbar-inverse-bg:                         #222;
+@navbar-inverse-border:                     darken(@navbar-inverse-bg, 10%);
+
+// Inverted navbar links
+@navbar-inverse-link-color:                 lighten(@gray-light, 15%);
+@navbar-inverse-link-hover-color:           #fff;
+@navbar-inverse-link-hover-bg:              transparent;
+@navbar-inverse-link-active-color:          @navbar-inverse-link-hover-color;
+@navbar-inverse-link-active-bg:             darken(@navbar-inverse-bg, 10%);
+@navbar-inverse-link-disabled-color:        #444;
+@navbar-inverse-link-disabled-bg:           transparent;
+
+// Inverted navbar brand label
+@navbar-inverse-brand-color:                @navbar-inverse-link-color;
+@navbar-inverse-brand-hover-color:          #fff;
+@navbar-inverse-brand-hover-bg:             transparent;
+
+// Inverted navbar toggle
+@navbar-inverse-toggle-hover-bg:            #333;
+@navbar-inverse-toggle-icon-bar-bg:         #fff;
+@navbar-inverse-toggle-border-color:        #333;
+
+
+//== Navs
+//
+//##
+
+//=== Shared nav styles
+@nav-link-padding:                          10px 15px;
+@nav-link-hover-bg:                         @gray-lighter;
+
+@nav-disabled-link-color:                   @gray-light;
+@nav-disabled-link-hover-color:             @gray-light;
+
+//== Tabs
+@nav-tabs-border-color:                     #ddd;
+
+@nav-tabs-link-hover-border-color:          @gray-lighter;
+
+@nav-tabs-active-link-hover-bg:             @body-bg;
+@nav-tabs-active-link-hover-color:          @gray;
+@nav-tabs-active-link-hover-border-color:   #ddd;
+
+@nav-tabs-justified-link-border-color:            #ddd;
+@nav-tabs-justified-active-link-border-color:     @body-bg;
+
+//== Pills
+@nav-pills-border-radius:                   @border-radius-base;
+@nav-pills-active-link-hover-bg:            @component-active-bg;
+@nav-pills-active-link-hover-color:         @component-active-color;
+
+
+//== Pagination
+//
+//##
+
+@pagination-color:                     @link-color;
+@pagination-bg:                        #fff;
+@pagination-border:                    #ddd;
+
+@pagination-hover-color:               @link-hover-color;
+@pagination-hover-bg:                  @gray-lighter;
+@pagination-hover-border:              #ddd;
+
+@pagination-active-color:              #fff;
+@pagination-active-bg:                 @brand-primary;
+@pagination-active-border:             @brand-primary;
+
+@pagination-disabled-color:            @gray-light;
+@pagination-disabled-bg:               #fff;
+@pagination-disabled-border:           #ddd;
+
+
+//== Pager
+//
+//##
+
+@pager-bg:                             @pagination-bg;
+@pager-border:                         @pagination-border;
+@pager-border-radius:                  15px;
+
+@pager-hover-bg:                       @pagination-hover-bg;
+
+@pager-active-bg:                      @pagination-active-bg;
+@pager-active-color:                   @pagination-active-color;
+
+@pager-disabled-color:                 @pagination-disabled-color;
+
+
+//== Jumbotron
+//
+//##
+
+@jumbotron-padding:              30px;
+@jumbotron-color:                inherit;
+@jumbotron-bg:                   @gray-lighter;
+@jumbotron-heading-color:        inherit;
+@jumbotron-font-size:            ceil((@font-size-base * 1.5));
+@jumbotron-heading-font-size:    ceil((@font-size-base * 4.5));
+
+
+//== Form states and alerts
+//
+//## Define colors for form feedback states and, by default, alerts.
+
+@state-success-text:             #3c763d;
+@state-success-bg:               #dff0d8;
+@state-success-border:           darken(spin(@state-success-bg, -10), 5%);
+
+@state-info-text:                #31708f;
+@state-info-bg:                  #d9edf7;
+@state-info-border:              darken(spin(@state-info-bg, -10), 7%);
+
+@state-warning-text:             #8a6d3b;
+@state-warning-bg:               #fcf8e3;
+@state-warning-border:           darken(spin(@state-warning-bg, -10), 5%);
+
+@state-danger-text:              #a94442;
+@state-danger-bg:                #f2dede;
+@state-danger-border:            darken(spin(@state-danger-bg, -10), 5%);
+
+
+//== Tooltips
+//
+//##
+
+//** Tooltip max width
+@tooltip-max-width:           200px;
+//** Tooltip text color
+@tooltip-color:               #fff;
+//** Tooltip background color
+@tooltip-bg:                  #000;
+@tooltip-opacity:             .9;
+
+//** Tooltip arrow width
+@tooltip-arrow-width:         5px;
+//** Tooltip arrow color
+@tooltip-arrow-color:         @tooltip-bg;
+
+
+//== Popovers
+//
+//##
+
+//** Popover body background color
+@popover-bg:                          #fff;
+//** Popover maximum width
+@popover-max-width:                   276px;
+//** Popover border color
+@popover-border-color:                rgba(0,0,0,.2);
+//** Popover fallback border color
+@popover-fallback-border-color:       #ccc;
+
+//** Popover title background color
+@popover-title-bg:                    darken(@popover-bg, 3%);
+
+//** Popover arrow width
+@popover-arrow-width:                 10px;
+//** Popover arrow color
+@popover-arrow-color:                 @popover-bg;
+
+//** Popover outer arrow width
+@popover-arrow-outer-width:           (@popover-arrow-width + 1);
+//** Popover outer arrow color
+@popover-arrow-outer-color:           fadein(@popover-border-color, 5%);
+//** Popover outer arrow fallback color
+@popover-arrow-outer-fallback-color:  darken(@popover-fallback-border-color, 20%);
+
+
+//== Labels
+//
+//##
+
+//** Default label background color
+@label-default-bg:            @gray-light;
+//** Primary label background color
+@label-primary-bg:            @brand-primary;
+//** Success label background color
+@label-success-bg:            @brand-success;
+//** Info label background color
+@label-info-bg:               @brand-info;
+//** Warning label background color
+@label-warning-bg:            @brand-warning;
+//** Danger label background color
+@label-danger-bg:             @brand-danger;
+
+//** Default label text color
+@label-color:                 #fff;
+//** Default text color of a linked label
+@label-link-hover-color:      #fff;
+
+
+//== Modals
+//
+//##
+
+//** Padding applied to the modal body
+@modal-inner-padding:         15px;
+
+//** Padding applied to the modal title
+@modal-title-padding:         15px;
+//** Modal title line-height
+@modal-title-line-height:     @line-height-base;
+
+//** Background color of modal content area
+@modal-content-bg:                             #fff;
+//** Modal content border color
+@modal-content-border-color:                   rgba(0,0,0,.2);
+//** Modal content border color **for IE8**
+@modal-content-fallback-border-color:          #999;
+
+//** Modal backdrop background color
+@modal-backdrop-bg:           #000;
+//** Modal backdrop opacity
+@modal-backdrop-opacity:      .5;
+//** Modal header border color
+@modal-header-border-color:   #e5e5e5;
+//** Modal footer border color
+@modal-footer-border-color:   @modal-header-border-color;
+
+@modal-lg:                    900px;
+@modal-md:                    600px;
+@modal-sm:                    300px;
+
+
+//== Alerts
+//
+//## Define alert colors, border radius, and padding.
+
+@alert-padding:               15px;
+@alert-border-radius:         @border-radius-base;
+@alert-link-font-weight:      bold;
+
+@alert-success-bg:            @state-success-bg;
+@alert-success-text:          @state-success-text;
+@alert-success-border:        @state-success-border;
+
+@alert-info-bg:               @state-info-bg;
+@alert-info-text:             @state-info-text;
+@alert-info-border:           @state-info-border;
+
+@alert-warning-bg:            @state-warning-bg;
+@alert-warning-text:          @state-warning-text;
+@alert-warning-border:        @state-warning-border;
+
+@alert-danger-bg:             @state-danger-bg;
+@alert-danger-text:           @state-danger-text;
+@alert-danger-border:         @state-danger-border;
+
+
+//== Progress bars
+//
+//##
+
+//** Background color of the whole progress component
+@progress-bg:                 #f5f5f5;
+//** Progress bar text color
+@progress-bar-color:          #fff;
+//** Variable for setting rounded corners on progress bar.
+@progress-border-radius:      @border-radius-base;
+
+//** Default progress bar color
+@progress-bar-bg:             @brand-primary;
+//** Success progress bar color
+@progress-bar-success-bg:     @brand-success;
+//** Warning progress bar color
+@progress-bar-warning-bg:     @brand-warning;
+//** Danger progress bar color
+@progress-bar-danger-bg:      @brand-danger;
+//** Info progress bar color
+@progress-bar-info-bg:        @brand-info;
+
+
+//== List group
+//
+//##
+
+//** Background color on `.list-group-item`
+@list-group-bg:                 #fff;
+//** `.list-group-item` border color
+@list-group-border:             #ddd;
+//** List group border radius
+@list-group-border-radius:      @border-radius-base;
+
+//** Background color of single list items on hover
+@list-group-hover-bg:           #f5f5f5;
+//** Text color of active list items
+@list-group-active-color:       @component-active-color;
+//** Background color of active list items
+@list-group-active-bg:          @component-active-bg;
+//** Border color of active list elements
+@list-group-active-border:      @list-group-active-bg;
+//** Text color for content within active list items
+@list-group-active-text-color:  lighten(@list-group-active-bg, 40%);
+
+//** Text color of disabled list items
+@list-group-disabled-color:      @gray-light;
+//** Background color of disabled list items
+@list-group-disabled-bg:         @gray-lighter;
+//** Text color for content within disabled list items
+@list-group-disabled-text-color: @list-group-disabled-color;
+
+@list-group-link-color:         #555;
+@list-group-link-hover-color:   @list-group-link-color;
+@list-group-link-heading-color: #333;
+
+
+//== Panels
+//
+//##
+
+@panel-bg:                    #fff;
+@panel-body-padding:          15px;
+@panel-heading-padding:       10px 15px;
+@panel-footer-padding:        @panel-heading-padding;
+@panel-border-radius:         @border-radius-base;
+
+//** Border color for elements within panels
+@panel-inner-border:          #ddd;
+@panel-footer-bg:             #f5f5f5;
+
+@panel-default-text:          @gray-dark;
+@panel-default-border:        #ddd;
+@panel-default-heading-bg:    #f5f5f5;
+
+@panel-primary-text:          #fff;
+@panel-primary-border:        @brand-primary;
+@panel-primary-heading-bg:    @brand-primary;
+
+@panel-success-text:          @state-success-text;
+@panel-success-border:        @state-success-border;
+@panel-success-heading-bg:    @state-success-bg;
+
+@panel-info-text:             @state-info-text;
+@panel-info-border:           @state-info-border;
+@panel-info-heading-bg:       @state-info-bg;
+
+@panel-warning-text:          @state-warning-text;
+@panel-warning-border:        @state-warning-border;
+@panel-warning-heading-bg:    @state-warning-bg;
+
+@panel-danger-text:           @state-danger-text;
+@panel-danger-border:         @state-danger-border;
+@panel-danger-heading-bg:     @state-danger-bg;
+
+
+//== Thumbnails
+//
+//##
+
+//** Padding around the thumbnail image
+@thumbnail-padding:           4px;
+//** Thumbnail background color
+@thumbnail-bg:                @body-bg;
+//** Thumbnail border color
+@thumbnail-border:            #ddd;
+//** Thumbnail border radius
+@thumbnail-border-radius:     @border-radius-base;
+
+//** Custom text color for thumbnail captions
+@thumbnail-caption-color:     @text-color;
+//** Padding around the thumbnail caption
+@thumbnail-caption-padding:   9px;
+
+
+//== Wells
+//
+//##
+
+@well-bg:                     #f5f5f5;
+@well-border:                 darken(@well-bg, 7%);
+
+
+//== Badges
+//
+//##
+
+@badge-color:                 #fff;
+//** Linked badge text color on hover
+@badge-link-hover-color:      #fff;
+@badge-bg:                    @gray-light;
+
+//** Badge text color in active nav link
+@badge-active-color:          @link-color;
+//** Badge background color in active nav link
+@badge-active-bg:             #fff;
+
+@badge-font-weight:           bold;
+@badge-line-height:           1;
+@badge-border-radius:         10px;
+
+
+//== Breadcrumbs
+//
+//##
+
+@breadcrumb-padding-vertical:   8px;
+@breadcrumb-padding-horizontal: 15px;
+//** Breadcrumb background color
+@breadcrumb-bg:                 #f5f5f5;
+//** Breadcrumb text color
+@breadcrumb-color:              #ccc;
+//** Text color of current page in the breadcrumb
+@breadcrumb-active-color:       @gray-light;
+//** Textual separator for between breadcrumb elements
+@breadcrumb-separator:          "/";
+
+
+//== Carousel
+//
+//##
+
+@carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6);
+
+@carousel-control-color:                      #fff;
+@carousel-control-width:                      15%;
+@carousel-control-opacity:                    .5;
+@carousel-control-font-size:                  20px;
+
+@carousel-indicator-active-bg:                #fff;
+@carousel-indicator-border-color:             #fff;
+
+@carousel-caption-color:                      #fff;
+
+
+//== Close
+//
+//##
+
+@close-font-weight:           bold;
+@close-color:                 #000;
+@close-text-shadow:           0 1px 0 #fff;
+
+
+//== Code
+//
+//##
+
+@code-color:                  #c7254e;
+@code-bg:                     #f9f2f4;
+
+@kbd-color:                   #fff;
+@kbd-bg:                      #333;
+
+@pre-bg:                      #f5f5f5;
+@pre-color:                   @gray-dark;
+@pre-border-color:            #ccc;
+@pre-scrollable-max-height:   340px;
+
+
+//== Type
+//
+//##
+
+//** Horizontal offset for forms and lists.
+@component-offset-horizontal: 180px;
+//** Text muted color
+@text-muted:                  @gray-light;
+//** Abbreviations and acronyms border color
+@abbr-border-color:           @gray-light;
+//** Headings small color
+@headings-small-color:        @gray-light;
+//** Blockquote small color
+@blockquote-small-color:      @gray-light;
+//** Blockquote font size
+@blockquote-font-size:        (@font-size-base * 1.25);
+//** Blockquote border color
+@blockquote-border-color:     @gray-lighter;
+//** Page header border color
+@page-header-border-color:    @gray-lighter;
+//** Width of horizontal description list titles
+@dl-horizontal-offset:        @component-offset-horizontal;
+//** Horizontal line color.
+@hr-border:                   @gray-lighter;


[5/5] incubator-apex-site git commit: add build.sh

Posted by an...@apache.org.
add build.sh


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/commit/5bfd6ae8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/tree/5bfd6ae8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/diff/5bfd6ae8

Branch: refs/heads/master
Commit: 5bfd6ae8484d05ed4de2599be3a4161c34730bce
Parents: 0cffb1a
Author: Andy Perlitch <an...@gmail.com>
Authored: Mon Sep 7 10:04:00 2015 -0700
Committer: Andy Perlitch <an...@gmail.com>
Committed: Mon Sep 7 10:04:00 2015 -0700

----------------------------------------------------------------------
 README.md | 24 +++++++++++++-----------
 build.sh  |  9 +++++++++
 2 files changed, 22 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/5bfd6ae8/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 23cf4ba..0c77eff 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,11 @@ This is the source code for the Apache Apex Incubator website, hosted at [apex.i
 How it works
 ------------
 The master branch of this repo contains the files that are used to generate the HTML that ultimately gets pushed to the incubator site.
-The `asf-site` branch is where the actual generated files are stored. 
-Through a [gitpubsub](http://www.apache.org/dev/gitpubsub.html) mechanism, files are taken from the `asf-branch` and pushed to the live server.
+The `asf-site` branch is where the actual generated files are stored. Note that this branch must contain exactly one folder called `content`,
+and so has been checked out as an orphan branch with its own commit history apart from the master branch. See the *Building* section below.
+
+Through a [gitpubsub](http://www.apache.org/dev/gitpubsub.html) mechanism on the apache.org server,
+files are taken from the `asf-branch` and pushed to the live server.
 
 Partials
 --------
@@ -43,15 +46,14 @@ Assuming you have a file called `src/md/example_markdown.md`, you could have thi
 {{> footer}}
 ```
 
-Building
---------
-Requires nodejs and npm.
-```bash
-# install dependencies
-npm install
-# run gulp command
-./node_modules/.bin/gulp
-```
+Building (requires node+npm)
+----------------------------
+Run `build.sh` from the directory. This will:
+
+- ensure the necessary npm dependencies are installed
+- updates the `asf-site` branch with a new commit of the build from the current branch
+
+You must manually push to the `asf-site` remote branch.
 
 Developing
 ----------

http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/5bfd6ae8/build.sh
----------------------------------------------------------------------
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..211c6ea
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,9 @@
+npm install
+./node_modules/.bin/gulp
+cp -r content content_tmp
+COMMIT_HASH=`git rev-parse HEAD`
+git checkout asf-site
+rm -rf content
+mv content_tmp content
+git add content
+git commit -m "from $COMMIT_HASH"