From df58b06ca0aff3efb15c41e785e134bc8dfbdfe3 Mon Sep 17 00:00:00 2001 From: soliury Date: Mon, 11 May 2015 14:40:51 +0800 Subject: [PATCH 1/2] 0.1.0 --- lib/handles/border.js | 2 +- lib/handles/margingAndPadding.js | 1 - package.json | 2 +- test/expected/test.js | 44 +-------------------- test/fixtures/test.scss | 66 +++++++++++++++++--------------- 5 files changed, 40 insertions(+), 75 deletions(-) diff --git a/lib/handles/border.js b/lib/handles/border.js index 0e1d68d..5f0efd4 100644 --- a/lib/handles/border.js +++ b/lib/handles/border.js @@ -1,3 +1,3 @@ -module.exports = function (text, login) { +module.exports = function (keys) { }; diff --git a/lib/handles/margingAndPadding.js b/lib/handles/margingAndPadding.js index acf3c44..0539460 100644 --- a/lib/handles/margingAndPadding.js +++ b/lib/handles/margingAndPadding.js @@ -57,7 +57,6 @@ module.exports = function (keys) { }); }); } - //console.log(keys); return keys; }; diff --git a/package.json b/package.json index 49f9563..156bb84 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gulp-react-native-css", - "version": "0.0.4", + "version": "0.1.0", "description": "A plugin for Gulp", "keywords": [ "gulpplugin" diff --git a/test/expected/test.js b/test/expected/test.js index a047355..b6da304 100644 --- a/test/expected/test.js +++ b/test/expected/test.js @@ -1,45 +1,5 @@ module.exports ={ - "description": { - "fontSize": 18, - "textAlign": "center", - "color": "#ff3333", - "marginLeft": 2, - "marginRight": 2, - "marginTop": 2, - "marginBottom": 5 - }, - "ok": { - "fontSize": 18, - "textAlign": "center", - "color": "#ff3333", - "marginLeft": 2, - "marginRight": 2, - "marginTop": 2, - "marginBottom": 3, - "paddingLeft": 2, - "paddingRight": 2, - "paddingTop": 2, - "paddingBottom": 6 - }, - "description name": { - "color": "rgba(0, 0, 0, 0.2)" - }, - "ok name": { - "color": "rgba(0, 0, 0, 0.2)" - }, - "container": { - "paddingTop": 30, - "paddingBottom": 30, - "paddingRight": 30, - "paddingLeft": 30, - "marginTop": 65, - "alignItems": "center" - }, - "container row": { - "marginBottom": 50 - }, - "test": { - "backgroundColor": "red", - "fontSize": 18 + "border": { + "border": "1px rgba(0, 0, 0, 0.2)" } } \ No newline at end of file diff --git a/test/fixtures/test.scss b/test/fixtures/test.scss index 2a8266e..18479fd 100644 --- a/test/fixtures/test.scss +++ b/test/fixtures/test.scss @@ -1,31 +1,37 @@ -#description, #ok { - font-size: 18px; - text-align: center; - color: lighten(red, 10%); - margin: 2px 2px 5px; - name { - color: rgba(0, 0, 0, 0.2); - } -} +//#description, #ok { +// font-size: 18px; +// text-align: center; +// color: lighten(red, 10%); +// margin: 2px 2px 5px; +// name { +// color: rgba(0, 0, 0, 0.2); +// } +//} +// +//.container { +// padding: 30px; +// margin-Top: 65px; +// align-items: center; +// row { +// margin-bottom: 50px; +// } +//} +// +//ok { +// margin: 2px 2px 3px; +// padding: 2px 2px 6px; +//} +// +//test { +// background-color: red; +//} +// +//test{ +// font-size: 18px; +//} -.container { - padding: 30px; - margin-Top: 65px; - align-items: center; - row { - margin-bottom: 50px; - } -} - -ok { - margin: 2px 2px 3px; - padding: 2px 2px 6px; -} - -test { - background-color: red; -} - -test{ - font-size: 18px; -} +border { + border: 1px rgba(0, 0, 0, 0.2); + border-bottom: 1px solid rgba(0, 0, 0, 0.2); + shadowColor:login; +} \ No newline at end of file From 30ca9ae3e1a6cb7efa94db04d2ce921391570ee7 Mon Sep 17 00:00:00 2001 From: soliury Date: Mon, 11 May 2015 14:45:40 +0800 Subject: [PATCH 2/2] edit readme --- README.md | 6 ++-- test/fixtures/test.scss | 62 ++++++++++++++++++++--------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 2fefb51..7403a71 100644 --- a/README.md +++ b/README.md @@ -91,14 +91,14 @@ module.exports ={ ``` -## about +## About Now, it support the margin, for Example: ``` ok { - margin: 2, 2, 3; - padding: 2, 2, 6; + margin: 2 2 3; + padding: 2 2 6; } ``` diff --git a/test/fixtures/test.scss b/test/fixtures/test.scss index 18479fd..927921c 100644 --- a/test/fixtures/test.scss +++ b/test/fixtures/test.scss @@ -1,34 +1,34 @@ -//#description, #ok { -// font-size: 18px; -// text-align: center; -// color: lighten(red, 10%); -// margin: 2px 2px 5px; -// name { -// color: rgba(0, 0, 0, 0.2); -// } -//} -// -//.container { -// padding: 30px; -// margin-Top: 65px; -// align-items: center; -// row { -// margin-bottom: 50px; -// } -//} -// -//ok { -// margin: 2px 2px 3px; -// padding: 2px 2px 6px; -//} -// -//test { -// background-color: red; -//} -// -//test{ -// font-size: 18px; -//} +#description, #ok { + font-size: 18px; + text-align: center; + color: lighten(red, 10%); + margin: 2px 2px 5px; + name { + color: rgba(0, 0, 0, 0.2); + } +} + +.container { + padding: 30px; + margin-Top: 65px; + align-items: center; + row { + margin-bottom: 50px; + } +} + +ok { + margin: 2px 2px 3px; + padding: 2px 2px 6px; +} + +test { + background-color: red; +} + +test{ + font-size: 18px; +} border { border: 1px rgba(0, 0, 0, 0.2);