From 36f4656ecb167eee562450deaa970afac7f27b0a Mon Sep 17 00:00:00 2001 From: David Glasser Date: Thu, 16 Jul 2015 00:37:08 -0700 Subject: [PATCH] Revert "Move old stylus tests to new extensions" This reverts commit 79a53736bb1de7eb3746df80e464fbcdcfac6419. --- packages/stylus/package.js | 2 +- packages/stylus/stylus_tests.import.styl | 5 +++++ packages/stylus/stylus_tests.main.styl | 16 ---------------- packages/stylus/stylus_tests.styl | 19 +++++++++++++++---- 4 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 packages/stylus/stylus_tests.import.styl delete mode 100644 packages/stylus/stylus_tests.main.styl diff --git a/packages/stylus/package.js b/packages/stylus/package.js index 3af17c23ba..3dcb7ca562 100644 --- a/packages/stylus/package.js +++ b/packages/stylus/package.js @@ -23,8 +23,8 @@ Package.onTest(function (api) { api.use(['tinytest', 'stylus', 'test-helpers', 'templating']); api.addFiles([ 'stylus_tests.html', - 'stylus_tests.main.styl', 'stylus_tests.styl', + 'stylus_tests.import.styl', 'stylus_tests.js' ],'client'); }); diff --git a/packages/stylus/stylus_tests.import.styl b/packages/stylus/stylus_tests.import.styl new file mode 100644 index 0000000000..d5e4779860 --- /dev/null +++ b/packages/stylus/stylus_tests.import.styl @@ -0,0 +1,5 @@ +// Variable used in stylus_test.styl +importDashy = dashed + +.stylus-overwrite-color + font-size: 20px !important diff --git a/packages/stylus/stylus_tests.main.styl b/packages/stylus/stylus_tests.main.styl deleted file mode 100644 index f95e563800..0000000000 --- a/packages/stylus/stylus_tests.main.styl +++ /dev/null @@ -1,16 +0,0 @@ -@import "stylus_tests.styl" - -#stylus-tests - zoom: 1 - -dashy = dashed - -.stylus-dashy-left-border - border-left: 1px dashy black - -.stylus-overwrite-size - // This property is overwritten in stylus_test.import.styl - font-size: 10px - -.stylus-import-dashy-border - border-left: 1px importDashy black diff --git a/packages/stylus/stylus_tests.styl b/packages/stylus/stylus_tests.styl index d5e4779860..46687d5ae2 100644 --- a/packages/stylus/stylus_tests.styl +++ b/packages/stylus/stylus_tests.styl @@ -1,5 +1,16 @@ -// Variable used in stylus_test.styl -importDashy = dashed +@import "stylus_tests.import.styl" -.stylus-overwrite-color - font-size: 20px !important +#stylus-tests + zoom: 1 + +dashy = dashed + +.stylus-dashy-left-border + border-left: 1px dashy black + +.stylus-overwrite-size + // This property is overwritten in stylus_test.import.styl + font-size: 10px + +.stylus-import-dashy-border + border-left: 1px importDashy black