remove legacy test framework

predixdesignsystem · Feb 12, 2016 · 479145a · 479145a
1 parent bd7f7fd
commit 479145a
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 23 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -97,15 +97,6 @@ module.exports = function (grunt) {
             }
         },
 
-        webdriver: {
-            options: {
-                specFiles: ['test/*spec.js']
-            },
-            local: {
-                webdrivers: ['chrome']
-            }
-        },
-
         concurrent: {
             devmode: {
                 tasks: ['watch', 'depserve'],
@@ -122,7 +113,6 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-contrib-watch');
     grunt.loadNpmTasks('grunt-dep-serve');
-    grunt.loadNpmTasks('webdriver-support');
     grunt.loadNpmTasks('grunt-autoprefixer');
     grunt.loadNpmTasks('grunt-concurrent');
 
@@ -144,17 +134,10 @@ module.exports = function (grunt) {
         'concurrent:devmode'
     ]);
 
-    // Default task.
-    grunt.registerTask('test', 'Test', [
-        'jshint',
-        'webdriver'
-    ]);
-
     grunt.registerTask('release', 'Release', [
         'clean',
         'shell:bower',
-        'default',
-        'test'
+        'default'
     ]);
 
 };
diff --git a/css/aha-table-sketch.css b/css/aha-table-sketch.css
@@ -922,7 +922,7 @@ textarea {
   padding: 0 1em;
   box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
   font: inherit;
-  line-height: calc(2em - 2px);
+  line-height: calc($inuit-btn-height - 2px);
   -webkit-font-smoothing: antialiased;
   cursor: pointer;
   text-align: center;
@@ -943,6 +943,13 @@ textarea {
   .btn:active {
     outline: none; }
 
+/** Workaround for FF since it does not support calc().
+  * Other buttons appear ok with the height declaration, but non-button elements do not.
+**/
+@-moz-document url-prefix() {
+  .btn:not(button) {
+    line-height: 1.8em; } }
+
 button.btn {
   -webkit-appearance: button; }
 
@@ -1008,6 +1015,12 @@ button.btn {
   border-radius: 6.6666666667em;
   padding: 1px 0 0 1px; }
 
+/** Workaround for FF since it does not support calc().
+  **/
+@-moz-document url-prefix() {
+  .btn--icon {
+    line-height: 1.8em; } }
+
 .btn--bare__pagination {
   width: 32px; }
 

diff --git a/css/aha-table.css b/css/aha-table.css
@@ -935,7 +935,7 @@ textarea {
   padding: 0 1em;
   box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
   font: inherit;
-  line-height: calc(2em - 2px);
+  line-height: calc($inuit-btn-height - 2px);
   -webkit-font-smoothing: antialiased;
   cursor: pointer;
   text-align: center;
@@ -956,6 +956,13 @@ textarea {
   .btn:active {
     outline: none; }
 
+/** Workaround for FF since it does not support calc().
+  * Other buttons appear ok with the height declaration, but non-button elements do not.
+**/
+@-moz-document url-prefix() {
+  .btn:not(button) {
+    line-height: 1.8em; } }
+
 button.btn {
   -webkit-appearance: button; }
 
@@ -1021,6 +1028,12 @@ button.btn {
   border-radius: 6.6666666667em;
   padding: 1px 0 0 1px; }
 
+/** Workaround for FF since it does not support calc().
+  **/
+@-moz-document url-prefix() {
+  .btn--icon {
+    line-height: 1.8em; } }
+
 .btn--bare__pagination {
   width: 32px; }
 

diff --git a/css/px-data-table-sketch.css b/css/px-data-table-sketch.css
@@ -820,7 +820,7 @@ textarea {
   padding: 0 1em;
   box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
   font: inherit;
-  line-height: calc(2em - 2px);
+  line-height: calc($inuit-btn-height - 2px);
   -webkit-font-smoothing: antialiased;
   cursor: pointer;
   text-align: center;
@@ -841,6 +841,13 @@ textarea {
   .btn:active {
     outline: none; }
 
+/** Workaround for FF since it does not support calc().
+  * Other buttons appear ok with the height declaration, but non-button elements do not.
+**/
+@-moz-document url-prefix() {
+  .btn:not(button) {
+    line-height: 1.8em; } }
+
 button.btn {
   -webkit-appearance: button; }
 

diff --git a/css/px-data-table.css b/css/px-data-table.css
@@ -833,7 +833,7 @@ textarea {
   padding: 0 1em;
   box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
   font: inherit;
-  line-height: calc(2em - 2px);
+  line-height: calc($inuit-btn-height - 2px);
   -webkit-font-smoothing: antialiased;
   cursor: pointer;
   text-align: center;
@@ -854,6 +854,13 @@ textarea {
   .btn:active {
     outline: none; }
 
+/** Workaround for FF since it does not support calc().
+  * Other buttons appear ok with the height declaration, but non-button elements do not.
+**/
+@-moz-document url-prefix() {
+  .btn:not(button) {
+    line-height: 1.8em; } }
+
 button.btn {
   -webkit-appearance: button; }
 

diff --git a/package.json b/package.json
@@ -19,7 +19,6 @@
         "grunt-contrib-jshint": "~v0.10.0",
         "grunt-contrib-watch": "~v0.6.1",
         "grunt-dep-serve": "git+https://github.com/GeneralElectric/grunt-dep-serve.git#master",
-        "webdriver-support": "git+https://github.com/PredixDev/webdriver-support.git#v2.2.1",
         "grunt-autoprefixer": "^3.0.3",
         "node-sass-import-once": "^1.2.0",
         "grunt-concurrent": "^2.0.1"