diff --git a/bower.json b/bower.json index b1c01525..8f491cbe 100644 --- a/bower.json +++ b/bower.json @@ -40,6 +40,6 @@ "olark": "^1.0.0", "philip": "^1.3.3", "jquery": "3.1.0", - "smalltalk": "^2.0.0" + "smalltalk": "2.1.0" } } diff --git a/modules/smalltalk/.bower.json b/modules/smalltalk/.bower.json index 000be719..7993ccdf 100644 --- a/modules/smalltalk/.bower.json +++ b/modules/smalltalk/.bower.json @@ -23,15 +23,15 @@ "example" ], "dependencies": {}, - "version": "2.0.0", - "_release": "2.0.0", + "version": "2.1.0", + "_release": "2.1.0", "_resolution": { "type": "version", - "tag": "v2.0.0", - "commit": "55325c8ace27e53c002cb207981031a0adb083b7" + "tag": "v2.1.0", + "commit": "c94a49648f0ffff6f24e5770581b0528cc130664" }, "_source": "https://github.com/coderaiser/smalltalk.git", - "_target": "^2.0.0", + "_target": "^2.1.0", "_originalSource": "smalltalk", "_direct": true } \ No newline at end of file diff --git a/modules/smalltalk/ChangeLog b/modules/smalltalk/ChangeLog index 816d95f3..bd43495c 100644 --- a/modules/smalltalk/ChangeLog +++ b/modules/smalltalk/ChangeLog @@ -1,3 +1,16 @@ +2016.07.20, v2.1.0 + +fix: +- feature(package) add postcss, autoprefixer + +feature: +- (smalltalk) hide all windows but first, no matter where they located in DOM +- (travis) node v6 +- (package) add postcss, autoprefixer +- (package) stylelint-config-standard v11.0.0 +- (package) stylelint v7.0.2 + + 2016.07.15, v2.0.0 feature: diff --git a/modules/smalltalk/css/smalltalk.css b/modules/smalltalk/css/smalltalk.css index 0614b952..f1715111 100644 --- a/modules/smalltalk/css/smalltalk.css +++ b/modules/smalltalk/css/smalltalk.css @@ -1,17 +1,10 @@ .smalltalk { - display: -webkit-flex; - display: -moz-box; - display: -ms-flexbox; display: flex; align-items: center; flex-direction: column; justify-content: center; - -webkit-transition: 200ms opacity; - -moz-transition: 200ms opacity; - -ms-transition: 200ms opacity; - -o-transition: 200ms opacity; transition: 200ms opacity; bottom: 0; @@ -24,7 +17,8 @@ z-index: 100; } -.smalltalk + .smalltalk { + +.smalltalk:not(:first-of-type) { transition: ease 1s; display: none; } @@ -68,9 +62,6 @@ white-space: nowrap; max-width: 500px; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; user-select: none; color: #333; font-size: 120%; @@ -94,9 +85,6 @@ } .smalltalk .page .button-strip { - display: -webkit-box; - display: -moz-box; - display: -ms-flexbox; display: flex; flex-direction: row; @@ -104,27 +92,17 @@ } .smalltalk .page .button-strip > button { - -webkit-margin-start: 10px; - -moz-margin-start: 10px; - -ms-margin-start: 10px; + margin-left: 10px; } .smalltalk button:enabled:focus, .smalltalk input:enabled:focus { - -webkit-transition: border-color 200ms; - -moz-transition: border-color 200ms; - -ms-transition: border-color 200ms; - -o-transition: border-color 200ms; transition: border-color 200ms; border-color: rgb(77, 144, 254); outline: none; } .smalltalk button:enabled:active { - background-image: -webkit-linear-gradient(#e7e7e7, #e7e7e7 38%, #d7d7d7); - background-image: -moz-linear-gradient(#e7e7e7, #e7e7e7 38%, #d7d7d7); - background-image: -ms-linear-gradient(#e7e7e7, #e7e7e7 38%, #d7d7d7); background-image: linear-gradient(#e7e7e7, #e7e7e7 38%, #d7d7d7); - box-shadow: none; text-shadow: none; } @@ -139,19 +117,8 @@ } .smalltalk button { - -webkit-appearance: none; - -moz-appearance: none; - -ms-appearance: none; appearance: none; - - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; user-select: none; - - background-image: -webkit-linear-gradient(#ededed, #ededed 38%, #dedede); - background-image: -moz-linear-gradient(#ededed, #ededed 38%, #dedede); - background-image: -ms-linear-gradient(#ededed, #ededed 38%, #dedede); background-image: linear-gradient(#ededed, #ededed 38%, #dedede); border: 1px solid rgb(0, 0, 0); @@ -165,10 +132,6 @@ } .smalltalk button:enabled:focus, .smalltalk input:enabled:focus { - -webkit-transition: border-color 200ms; - -moz-transition: border-color 200ms; - -ms-transition: border-color 200ms; - -o-transition: border-color 200ms; transition: border-color 200ms; border-color: rgb(77, 144, 254); outline: none; diff --git a/modules/smalltalk/dist/smalltalk.min.css b/modules/smalltalk/dist/smalltalk.min.css index c0b36c41..27ca31a7 100644 --- a/modules/smalltalk/dist/smalltalk.min.css +++ b/modules/smalltalk/dist/smalltalk.min.css @@ -1 +1 @@ -.smalltalk{display:-webkit-flex;display:-moz-box;display:-ms-flexbox;display:flex;align-items:center;flex-direction:column;justify-content:center;-webkit-transition:.2s opacity;-moz-transition:.2s opacity;-ms-transition:.2s opacity;-o-transition:.2s opacity;transition:.2s opacity;bottom:0;left:0;overflow:auto;padding:20px;position:fixed;right:0;top:0;z-index:100}.smalltalk .page .content-area,.smalltalk .page header{overflow:hidden;text-overflow:ellipsis;max-width:500px}.smalltalk+.smalltalk{transition:ease 1s;display:none}.smalltalk .page{border-radius:3px;background:#fff;box-shadow:0 4px 23px 5px rgba(0,0,0,.2),0 2px 6px rgba(0,0,0,.15);color:#333;min-width:400px;padding:0;position:relative;z-index:0}@media only screen and (max-width:500px){.smalltalk .page{min-width:0}}.smalltalk .page>.close-button{background-image:url(../img/IDR_CLOSE_DIALOG.png);background-position:center;background-repeat:no-repeat;height:14px;position:absolute;right:7px;top:7px;width:14px;z-index:1}.smalltalk .page>.close-button:hover{background-image:url(../img/IDR_CLOSE_DIALOG_H.png)}.smalltalk .page header{white-space:nowrap;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#333;font-size:120%;font-weight:700;margin:0;padding:14px 17px;text-shadow:#fff 0 1px 2px}.smalltalk .page .content-area{padding:6px 17px;position:relative}.smalltalk .page .action-area{padding:14px 17px}.smalltalk .page .button-strip{display:-webkit-box;display:-moz-box;display:-ms-flexbox;display:flex;flex-direction:row;justify-content:flex-end}.smalltalk .page .button-strip>button{-webkit-margin-start:10px;-moz-margin-start:10px;-ms-margin-start:10px}.smalltalk button:enabled:active{background-image:-webkit-linear-gradient(#e7e7e7,#e7e7e7 38%,#d7d7d7);background-image:-moz-linear-gradient(#e7e7e7,#e7e7e7 38%,#d7d7d7);background-image:-ms-linear-gradient(#e7e7e7,#e7e7e7 38%,#d7d7d7);background-image:linear-gradient(#e7e7e7,#e7e7e7 38%,#d7d7d7);box-shadow:none;text-shadow:none}.smalltalk .smalltalk,.smalltalk button{min-height:2em;min-width:4em}.smalltalk button::-moz-focus-inner{border:0}.smalltalk button{-webkit-appearance:none;-moz-appearance:none;-ms-appearance:none;appearance:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:-webkit-linear-gradient(#ededed,#ededed 38%,#dedede);background-image:-moz-linear-gradient(#ededed,#ededed 38%,#dedede);background-image:-ms-linear-gradient(#ededed,#ededed 38%,#dedede);background-image:linear-gradient(#ededed,#ededed 38%,#dedede);border:1px solid #000;border:1px solid rgba(0,0,0,.25);border-radius:2px;box-shadow:0 1px 0 rgba(0,0,0,.08),inset 0 1px 2px rgba(255,255,255,.75);color:#444;font:inherit;margin:0 1px 0 0;text-shadow:0 1px 0 #f0f0f0}.smalltalk button:enabled:focus,.smalltalk input:enabled:focus{-webkit-transition:border-color .2s;-moz-transition:border-color .2s;-ms-transition:border-color .2s;-o-transition:border-color .2s;transition:border-color .2s;border-color:#4d90fe;outline:0}.smalltalk input{width:100%;border:1px solid #bfbfbf;border-radius:2px;box-sizing:border-box;color:#444;font:inherit;margin:0;min-height:2em;padding:3px;outline:0}button{font-family:Ubuntu,Arial,sans-serif} +.smalltalk{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-transition:.2s opacity;transition:.2s opacity;bottom:0;left:0;overflow:auto;padding:20px;position:fixed;right:0;top:0;z-index:100}.smalltalk .page .content-area,.smalltalk .page header{overflow:hidden;text-overflow:ellipsis;max-width:500px}.smalltalk:not(:first-of-type){-webkit-transition:ease 1s;transition:ease 1s;display:none}.smalltalk .page{border-radius:3px;background:#fff;box-shadow:0 4px 23px 5px rgba(0,0,0,.2),0 2px 6px rgba(0,0,0,.15);color:#333;min-width:400px;padding:0;position:relative;z-index:0}@media only screen and (max-width:500px){.smalltalk .page{min-width:0}}.smalltalk .page>.close-button{background-image:url(../img/IDR_CLOSE_DIALOG.png);background-position:center;background-repeat:no-repeat;height:14px;position:absolute;right:7px;top:7px;width:14px;z-index:1}.smalltalk .page>.close-button:hover{background-image:url(../img/IDR_CLOSE_DIALOG_H.png)}.smalltalk .page header{white-space:nowrap;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;color:#333;font-size:120%;font-weight:700;margin:0;padding:14px 17px;text-shadow:#fff 0 1px 2px}.smalltalk .page .content-area{padding:6px 17px;position:relative}.smalltalk .page .action-area{padding:14px 17px}.smalltalk .page .button-strip{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.smalltalk .page .button-strip>button{margin-left:10px}.smalltalk button:enabled:active{background-image:-webkit-linear-gradient(#e7e7e7,#e7e7e7 38%,#d7d7d7);background-image:linear-gradient(#e7e7e7,#e7e7e7 38%,#d7d7d7);box-shadow:none;text-shadow:none}.smalltalk .smalltalk,.smalltalk button{min-height:2em;min-width:4em}.smalltalk button::-moz-focus-inner{border:0}.smalltalk button{-webkit-appearance:none;-moz-appearance:none;appearance:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:-webkit-linear-gradient(#ededed,#ededed 38%,#dedede);background-image:linear-gradient(#ededed,#ededed 38%,#dedede);border:1px solid #000;border:1px solid rgba(0,0,0,.25);border-radius:2px;box-shadow:0 1px 0 rgba(0,0,0,.08),inset 0 1px 2px rgba(255,255,255,.75);color:#444;font:inherit;margin:0 1px 0 0;text-shadow:0 1px 0 #f0f0f0}.smalltalk button:enabled:focus,.smalltalk input:enabled:focus{-webkit-transition:border-color .2s;transition:border-color .2s;border-color:#4d90fe;outline:0}.smalltalk input{width:100%;border:1px solid #bfbfbf;border-radius:2px;box-sizing:border-box;color:#444;font:inherit;margin:0;min-height:2em;padding:3px;outline:0}button{font-family:Ubuntu,Arial,sans-serif} diff --git a/modules/smalltalk/package.json b/modules/smalltalk/package.json index f8b4f9bc..9087f4df 100644 --- a/modules/smalltalk/package.json +++ b/modules/smalltalk/package.json @@ -1,6 +1,6 @@ { "name": "smalltalk", - "version": "2.0.0", + "version": "2.1.0", "description": "Promise-based Alert, Confirm and Prompt replacement", "homepage": "http://github.com/coderaiser/smalltalk", "repository": { @@ -18,20 +18,24 @@ }, "scripts": { "watch": "watch 'npm run 6to5' dist", - "6to5": "babel -d legacy lib", - "minify:css": "minify css/smalltalk.css > dist/smalltalk.min.css", + "compile:js": "babel -d legacy lib", + "compile:css": "postcss --use autoprefixer css/*.css -d dist", + "minify:css": "minify dist/smalltalk.css > dist/smalltalk.min.css", "minify:js": "minify dist/smalltalk.js > dist/smalltalk.min.js", "minify:js-native": "minify dist/smalltalk.native.js > dist/smalltalk.native.min.js", "build:js-poly": "cat $npm_package_config_poly dist/smalltalk.min.js > dist/smalltalk.poly.min.js", "build:js-poly-native": "cat $npm_package_config_poly dist/smalltalk.native.min.js > dist/smalltalk.native.poly.min.js", "build:js-full": "redrun bundle:js minify:js build:js-poly", "build:js-native-full": "redrun bundle:js:native minify:js-native build:js-poly-native", - "build": "redrun minify:css 6to5 build:js-full build:js-native-full legacy:index clean", + "build": "redrun build:js build:css", + "build:js": "redrun compile:js build:js-full build:js-native-full legacy:index clean:js", + "build:css": "redrun compile:css minify:css clean:css", "bundle:base": "browserify -s smalltalk --ng false", "bundle:js": "redrun bundle:base -- -r ./legacy/smalltalk.js:smalltalk ./legacy/smalltalk.js -o dist/smalltalk.js", "bundle:js:native": "redrun bundle:base -- -r ./legacy/smalltalk.native.js:smalltalk ./legacy/smalltalk.native.js -o dist/smalltalk.native.js", "legacy:index": "echo \"module.exports = require('./smalltalk');\" > legacy/index.js", - "clean": "rimraf dist/smalltalk.js dist/smalltalk.native.js", + "clean:js": "rimraf dist/smalltalk.js dist/smalltalk.native.js", + "clean:css": "rimraf dist/smalltalk.css", "bower": "bower", "babel": "babel", "minify": "minify", @@ -53,6 +57,7 @@ "url": "https://github.com/coderaiser/smalltalk/issues" }, "devDependencies": { + "autoprefixer": "^6.3.7", "babel-cli": "^6.1.1", "babel-preset-es2015": "^6.0.15", "browserify": "^13.0.1", @@ -60,11 +65,12 @@ "jscs": "^3.0.3", "jshint": "^2.8.0", "minify": "^2.0.0", + "postcss-cli": "^2.5.2", "promise-polyfill": "^5.1.0", "redrun": "^5.0.1", "rimraf": "^2.5.3", - "stylelint": "^6.2.2", - "stylelint-config-standard": "^10.0.0", + "stylelint": "^7.0.2", + "stylelint-config-standard": "^11.0.0", "systemjs": "^0.19.31", "watch": "^0.19.1" }