Merge pull request #14 from vesper2000/master

tab styling
ciena-frost · Mar 22, 2016 · 446b440 · 446b440
2 parents 351bdfc + d729a5f
commit 446b440
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 27 deletions.
diff --git a/addon/pods/components/frost-tabs/template.hbs b/addon/pods/components/frost-tabs/template.hbs
@@ -1,6 +1,6 @@
 <div class="tab-nav">
   {{#each tabs as |tab|}}
-    {{#frost-button class=(concat 'tab medium tertiary' (if (eq tab.id selection) ' active')) disabled=tab.disabled on-click=(action on-change tab.id)}}
+    {{#frost-button class=(concat 'tab' (if (eq tab.id selection) ' active')) design='tab' disabled=tab.disabled on-click=(action on-change tab.id)}}
             <div class="text">
         {{tab.alias}}
             </div>

diff --git a/addon/styles/addon.scss b/addon/styles/addon.scss
@@ -1,34 +1,27 @@
 @import 'node_modules/ember-frost-theme/scss/frost-theme';
-
 .frost-tabs {
+
   .tab-nav {
-  border-bottom: 1px solid $frost-color-lgrey-1;
-  display: flex;
-  flex-direction: row;
-  justify-content: flex-start;
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
 
-  .tab {
-    color: $frost-color-grey-5;
-    padding-bottom: 5px;
-    background-color: transparent;
-  }
+    .tab {
+      padding-bottom: 2px;
+      border-bottom: 5px solid transparent;
+      cursor: default;
+    }
 
-  .tab.tertiary:hover {
-    text-shadow: none; // TODO frost-button update
-  }
+    .tab.active {
+      border-bottom: 5px solid $frost-color-blue-1;
 
-  .tab:hover:disabled {
-    background-color: inherit; // TODO frost-button update
-  }
-
-  .tab.active {
-    padding-bottom: 0;
-    color: $frost-color-grey-2;
-    border-bottom: 5px solid $frost-color-blue-1;
-  }
+      > .text {
+        color: $frost-color-grey-2;
+      }
+    }
   }
 
   > .content.hidden {
-  display: none !important;
+    display: none !important;
   }
 }
diff --git a/blueprints/ember-frost-tabs/index.js b/blueprints/ember-frost-tabs/index.js
@@ -12,7 +12,7 @@ module.exports = {
     return this.addAddonsToProject({
       packages: [
         {name: 'ember-frost-theme', target: '^1.3.0'},
-        {name: 'ember-frost-button', target: '^1.4.0'}
+        {name: 'ember-frost-button', target: '^2.0.0'}
       ]
     })
   }

diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "ember-data": "^2.3.3",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.5",
-    "ember-frost-button": "^1.4.0",
+    "ember-frost-button": "^2.0.0",
     "ember-frost-css-core": "^1.1.2",
     "ember-frost-theme": "^1.3.0",
     "ember-load-initializers": "^0.5.1",
@@ -66,4 +66,4 @@
   "ember-addon": {
     "configPath": "tests/dummy/config"
   }
-}
+}