Merge pull request #34 from himedlooff/gh-pages

Updated color variables
cfpb · Jan 15, 2015 · e896461 · e896461
2 parents 0ffa6e0 + 3e18b61
commit e896461
Show file tree

Hide file tree

Showing 11 changed files with 8,902 additions and 12,711 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,16 +2,22 @@ All notable changes to this project will be documented in this file.
 We follow the [Semantic Versioning 2.0.0](http://semver.org/) format.
 
 
-## 1.3.1 - 2014-11-02
+## 1.4.0 - 2015-01-13
 
-### Added
-- Nothing.
+### Changed
+- Replaces all CFPB color variables with non-CFPB colors. To add the CFPB theme
+  to your project you will need to include the CFPB color palette and the
+  Capital Framework theme overrides file. Both files can be found in the
+  generator-cf repo here:
+  <https://github.com/cfpb/generator-cf/tree/master/app/templates/src/static/css>
+  Background info on the new Capital Framework color variables can be found at
+  <https://github.com/cfpb/capital-framework/issues/115>.
+
+### Updated
+- NPM dependencies.
 
-### Deprecated
-- Nothing.
 
-### Removed
-- Nothing.
+## 1.3.1 - 2014-11-02
 
 ### Fixed
 - Updated npm and bower deps and recompiled. This updates the docs template.
@@ -23,26 +29,8 @@ We follow the [Semantic Versioning 2.0.0](http://semver.org/) format.
 - Updated focus styling for button links.
 - Added `.btn__link.btn__secondary` styles.
 
-### Deprecated
-- Nothing.
-
-### Removed
-- Nothing.
-
-### Fixed
-- Nothing.
-
 
 ## 1.2.0 - 2014-09-05
 
 ### Added
 - Focus styles.
-
-### Deprecated
-- Nothing.
-
-### Removed
-- Nothing.
-
-### Fixed
-- Nothing.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -13,16 +13,14 @@ module.exports = function(grunt) {
    * the package.json file of cf-grunt-config.
    */
 
-  // Sets the CWD to the cf-grunt-config package so that the loadTasks method
-  // (employed in jit-grunt) looks in the correct place.
-  grunt.file.setBase('./node_modules/cf-grunt-config/');
   // Loads all Grunt tasks in the node_modules directory within the new CWD.
   require('jit-grunt')(grunt, {
     // Below line needed because task name does not match package name
     bower: 'grunt-bower-task'
+  })({
+    // Options
+    pluginsRoot: 'node_modules/cf-grunt-config/node_modules'
   });
-  // Sets the CWD back to the project root so that the tasks work as expected.
-  grunt.file.setBase('../../');
 
 
   /**

diff --git a/README.md b/README.md
@@ -1,7 +1,6 @@
 
 # cf-buttons
 
-[![Bower dependency status](https://www.versioneye.com/user/projects/5345b61fe97a46bd58000150/badge.png)](https://www.versioneye.com/user/projects/5345b61fe97a46bd58000150)
 [![npm dependency status](https://gemnasium.com/cfpb/cf-buttons.svg)](https://gemnasium.com/cfpb/cf-buttons)
 
 Button styles including default, secondary, destructive, disabled, super, and

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "cf-buttons",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "description": "Button styles including default, secondary, destructive, disabled, super, and compound buttons, button links, buttons with icons, and button groups for Capital Framework.",
   "keywords": [
     "capital-framework",
@@ -22,8 +22,8 @@
   "license": "https://github.com/cfpb/cf-buttons/blob/gh-pages/TERMS.md",
   "main": "src/cf-buttons.less",
   "dependencies": {
-    "cf-core": "git://github.com/cfpb/cf-core.git",
-    "cf-icons": "git://github.com/cfpb/cf-icons.git"
+    "cf-core": "latest",
+    "cf-icons": "latest"
   },
   "exportsOverride": {
     "cf-*": {

diff --git a/demo/index.html b/demo/index.html
@@ -14,15 +14,12 @@
     <link rel="stylesheet" type="text/css" href="static/css/main.css">
 <!--[if lt IE 8]>
     <link rel="stylesheet" type="text/css" href="static/css/main.lt-ie8.min.css"><![endif]-->
-    <script>
-      // Confirm availability of JS and remove no-js class from html
-      var docElement = document.documentElement;
-      docElement.className = docElement.className.replace(/(^|\s)no-js(\s|$)/, '$1$2');
-
-    </script>
   </head>
   <body style="padding:4px;">
-    <div id="less-notes">
+    <div id="theme-variables">
+      <div>
+        <div></div><br>
+      </div>
       <div>
         <div></div><br>
       </div>
@@ -123,13 +120,6 @@
 <a href="#" class="btn btn__disabled">Anchor Tag</a>
 <button class="btn btn__disabled">Button Tag</button>
 <input type="submit" value="Input Tag" class="btn btn__disabled">
-</div><br>
-      </div>
-      <div>
-        <div>
-<a href="#" class="btn btn__disabled">Anchor Tag</a>
-<button class="btn btn__disabled">Button Tag</button>
-<input type="submit" value="Input Tag" class="btn btn__disabled">
 </div><br>
       </div>
       <div>
@@ -181,6 +171,36 @@
     <span class="btn_icon__left cf-icon cf-icon-left"></span>
     Button Tag
 </button>
+<br>
+<br>
+<a href="#" class="btn btn__secondary">
+    <span class="btn_icon__left cf-icon cf-icon-left"></span>
+    Anchor Tag
+</a>
+<button class="btn btn__secondary">
+    <span class="btn_icon__left cf-icon cf-icon-left"></span>
+    Button Tag
+</button>
+<br>
+<br>
+<a href="#" class="btn btn__warning">
+    <span class="btn_icon__left cf-icon cf-icon-left"></span>
+    Anchor Tag
+</a>
+<button class="btn btn__warning">
+    <span class="btn_icon__left cf-icon cf-icon-left"></span>
+    Button Tag
+</button>
+<br>
+<br>
+<a href="#" class="btn btn__disabled">
+    <span class="btn_icon__left cf-icon cf-icon-left"></span>
+    Anchor Tag
+</a>
+<button class="btn btn__disabled">
+    <span class="btn_icon__left cf-icon cf-icon-left"></span>
+    Button Tag
+</button>
 </div><br>
       </div>
       <div>
@@ -193,6 +213,36 @@
     Button Tag
     <span class="btn_icon__right cf-icon cf-icon-right"></span>
 </button>
+<br>
+<br>
+<a href="#" class="btn btn__secondary">
+    Anchor Tag
+    <span class="btn_icon__right cf-icon cf-icon-right"></span>
+</a>
+<button class="btn btn__secondary">
+    Button Tag
+    <span class="btn_icon__right cf-icon cf-icon-right"></span>
+</button>
+<br>
+<br>
+<a href="#" class="btn btn__warning">
+    Anchor Tag
+    <span class="btn_icon__right cf-icon cf-icon-right"></span>
+</a>
+<button class="btn btn__warning">
+    Button Tag
+    <span class="btn_icon__right cf-icon cf-icon-right"></span>
+</button>
+<br>
+<br>
+<a href="#" class="btn btn__disabled">
+    Anchor Tag
+    <span class="btn_icon__right cf-icon cf-icon-right"></span>
+</a>
+<button class="btn btn__disabled">
+    Button Tag
+    <span class="btn_icon__right cf-icon cf-icon-right"></span>
+</button>
 </div><br>
       </div>
       <div>
@@ -257,10 +307,8 @@
 <button class="btn btn__grouped-last btn__compound-action">
     <span class="cf-icon cf-icon-down btn__grouped-last"></span>
 </button>
-</div><br>
-      </div>
-      <div>
-        <div>
+<br>
+<br>
 <a href="#" class="btn btn__grouped-first btn__secondary">Anchor</a>
 <a href="#" class="btn btn__grouped-last btn__secondary btn__compound-action">
     <span class="cf-icon cf-icon-down btn__grouped-last"></span>
@@ -271,10 +319,32 @@
 <button class="btn btn__grouped-last btn__secondary btn__compound-action">
     <span class="cf-icon cf-icon-down btn__grouped-last"></span>
 </button>
-</div><br>
-      </div>
-      <div>
-        <div>
+<br>
+<br>
+<a href="#" class="btn btn__grouped-first btn__warning">Anchor</a>
+<a href="#" class="btn btn__grouped-last btn__warning btn__compound-action">
+    <span class="cf-icon cf-icon-down btn__grouped-last"></span>
+</a>
+<br>
+<br>
+<button class="btn btn__grouped-first btn__warning">Button</button>
+<button class="btn btn__grouped-last btn__warning btn__compound-action">
+    <span class="cf-icon cf-icon-down btn__grouped-last"></span>
+</button>
+<br>
+<br>
+<a href="#" class="btn btn__grouped-first btn__disabled">Anchor</a>
+<a href="#" class="btn btn__grouped-last btn__disabled btn__compound-action">
+    <span class="cf-icon cf-icon-down btn__grouped-last"></span>
+</a>
+<br>
+<br>
+<button class="btn btn__grouped-first btn__disabled">Button</button>
+<button class="btn btn__grouped-last btn__disabled btn__compound-action">
+    <span class="cf-icon cf-icon-down btn__grouped-last"></span>
+</button>
+<br>
+<br>
 <a href="#" class="btn btn__grouped-first btn__super">Anchor</a>
 <a href="#" class="btn btn__grouped-last btn__super btn__compound-action">
     <span class="cf-icon cf-icon-down btn__grouped-last"></span>