From 7aec4fdfa64023aa810f4cb0b98c34f94cc908eb Mon Sep 17 00:00:00 2001 From: XiaoShengtao Date: Thu, 4 Dec 2014 17:43:36 +0800 Subject: [PATCH 1/9] Update README.md --- README.md | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/README.md b/README.md index 63be8bc..de94de7 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,42 @@ Abstack-variables-library ========================= Variables library for Abstack Tech + +Run +=== + +1. Install node dependencies in `www` directory : + + ```` + $ npm install + ```` +2. Install bower dependencies in `www` directory : + + ```` + $ gulp install + ```` +3. Run server through gulp : + + ```` + $ gulp + ```` +MIT license +Copyright (c) 2014 PeachScript <scdzwyxst@gmail.com> + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. From 7dcb6973b081fb2cf14eb83a2e5a6c93100c192d Mon Sep 17 00:00:00 2001 From: XiaoShengtao Date: Thu, 4 Dec 2014 17:46:12 +0800 Subject: [PATCH 2/9] Update README.md --- README.md | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index de94de7..45d19d7 100644 --- a/README.md +++ b/README.md @@ -21,23 +21,28 @@ Run ```` $ gulp ```` + MIT license -Copyright (c) 2014 PeachScript <scdzwyxst@gmail.com> +=========== + +The MIT License (MIT) + +Copyright (c) 2014 XiaoShengtao <scdzwyxst@gmail.com> Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal +of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 3b309de96df37614215684eba0cd4d2f93187330 Mon Sep 17 00:00:00 2001 From: Peach Date: Thu, 4 Dec 2014 18:31:48 +0800 Subject: [PATCH 3/9] Amend the styles in safari browser --- app/styles/main.less | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/styles/main.less b/app/styles/main.less index 8d04d36..634dc02 100644 --- a/app/styles/main.less +++ b/app/styles/main.less @@ -103,6 +103,7 @@ only screen and (min-device-pixel-ratio: 2){ } } .btn-copy{ + margin: 0; float: right; padding: 0 8px; border: none; @@ -132,11 +133,13 @@ only screen and (min-device-pixel-ratio: 2){ @bgcolor: #eee; position: relative; display: inline-block; - margin-left: 12px; + height: 20px; + margin-left: 16px; margin-bottom: 6px; - padding: 3px 6px; + padding: 0 6px; font-size: 13px; font-style: normal; + line-height: 20px; text-decoration: none; color: #333; background-color: @bgcolor; From a6743d5c9b393afbe89ffe00b27adb5ab4b551c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8D=E4=B8=B0?= Date: Wed, 17 Dec 2014 14:52:29 +0800 Subject: [PATCH 4/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 45d19d7..5ac0fa9 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Run 2. Install bower dependencies in `www` directory : ```` - $ gulp install + $ bower install ```` 3. Run server through gulp : From cdd3717c2857dd237e8314191b60e87883efaa7c Mon Sep 17 00:00:00 2001 From: lagelalegal Date: Thu, 15 Oct 2015 18:18:05 +0800 Subject: [PATCH 5/9] Support word retrieve. --- app/scripts/app.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/scripts/app.js b/app/scripts/app.js index 63736fd..a54a04d 100644 --- a/app/scripts/app.js +++ b/app/scripts/app.js @@ -40,7 +40,7 @@ angular.module('abstackVarLib', ['zeroclipboard']) function compare(origin, target){ origin = origin.join(''); for(var i = 0;i Date: Thu, 15 Oct 2015 18:18:58 +0800 Subject: [PATCH 6/9] Update the words. --- app/json/words.json | 98 +++++++++++++++++++++++++++++++++------------ 1 file changed, 73 insertions(+), 25 deletions(-) diff --git a/app/json/words.json b/app/json/words.json index fdc8f60..64fbcc4 100644 --- a/app/json/words.json +++ b/app/json/words.json @@ -1,27 +1,75 @@ [ -{ - "word": "settings", - "url": "http://www.dict.cn/settings", - "tags": ["设置", "设定", "偏好"] -}, -{ - "word": "feedback", - "tags": ["建议", "反馈", "投诉", "意见", "改进"] -}, -{ - "word": "project", - "tags": ["项目", "标", "工程"] -}, -{ - "word": "dashboard", - "tags": ["仪表盘", "概览", "主页", "监控"] -}, -{ - "word": "redirect", - "tags": ["跳转", "转到"] -}, -{ - "word": "following", - "tags": ["关注", "正在关注", "关心"] -} + { + "word": "settings", + "url": "http://www.dict.cn/settings", + "tags": ["设置", "设定", "偏好"] + }, + { + "word": "feedback", + "tags": ["建议", "反馈", "投诉", "意见", "改进"] + }, + { + "word": "project", + "tags": ["项目", "标", "工程"] + }, + { + "word": "dashboard", + "tags": ["仪表盘", "概览", "主页", "监控"] + }, + { + "word": "redirect", + "tags": ["跳转", "转到"] + }, + { + "word": "following", + "tags": ["关注", "正在关注", "关心"] + }, + { + "word": "gender", + "tags": ["性别", "身份"] + }, + { + "word": "phone", + "tags": ["手机号码"] + }, + { + "word": "avatar", + "tags": ["头像"] + }, + { + "word": "password", + "tags": ["密码"] + }, + { + "word": "points", + "tags": ["积分"] + }, + { + "word": "score", + "tags": ["得分", "分值"] + }, + { + "word": "diliveryman", + "tags": ["配送员"] + }, + { + "word": "is_show", + "tags": ["是否可见", "是否封号"] + }, + { + "word": "username", + "tags": ["用户名", "收货人"] + }, + { + "word": "nickname", + "tags": ["昵称"] + }, + { + "word": "is_default", + "tags": ["是否默认"] + }, + { + "word": "detail_address", + "tags": ["详细地址"] + } ] \ No newline at end of file From a85efdf34994ed2a01ebc3b85bc73502a9e8e166 Mon Sep 17 00:00:00 2001 From: Peach Date: Mon, 12 Sep 2016 00:15:32 +0800 Subject: [PATCH 7/9] Add start script --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 83a0bed..76ab75e 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,7 @@ "description": "Variables library for Abstack Tech", "main": "none", "scripts": { + "start": "gulp", "test": "echo \"Error: no test specified\" && exit 1" }, "repository": { From 4ba831b39dd8a61165cf1a41669eb6b00b3e78cd Mon Sep 17 00:00:00 2001 From: Peach Date: Mon, 12 Sep 2016 00:15:43 +0800 Subject: [PATCH 8/9] Update README.md --- README.md | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 5ac0fa9..3ca8b3c 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,28 @@ -Abstack-variables-library -========================= +# Abstack-variables-library -Variables library for Abstack Tech +Variable library for Abstack Tech. [Here](https://peachscript.github.io/Abstack-variables-library/) is the online demo. -Run -=== +## Setup -1. Install node dependencies in `www` directory : +1. Install development dependencies: - ```` - $ npm install - ```` -2. Install bower dependencies in `www` directory : +````bash +$ npm install +```` - ```` - $ bower install - ```` -3. Run server through gulp : +2. Install front-end dependiencies: - ```` - $ gulp - ```` +````bash +$ bower install +```` -MIT license -=========== +3. Run server: + +````bash +$ npm start +```` + +## MIT license The MIT License (MIT) From a147b055fb4473ff90615971f9324014bc3732b2 Mon Sep 17 00:00:00 2001 From: Peach Date: Tue, 7 Mar 2017 22:20:15 +0800 Subject: [PATCH 9/9] Update hyperlink in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ca8b3c..928d207 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Abstack-variables-library -Variable library for Abstack Tech. [Here](https://peachscript.github.io/Abstack-variables-library/) is the online demo. +Variable library for Abstack Tech. [Here](https://abstack.github.io/abstack-variables-library/) is the online demo. ## Setup