From a3c7e2f7a7ddac0f3d9c724aa3eaee58e0a2dafc Mon Sep 17 00:00:00 2001 From: Daniel Spitzer Date: Wed, 7 Nov 2018 13:29:23 +0100 Subject: [PATCH 1/6] [Docs] Fix `Colors` page It couldn't really handle `rgba()` colors --- docs/src/xhtml/appendix/colors/colors.js | 12 ++++++------ package-lock.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/src/xhtml/appendix/colors/colors.js b/docs/src/xhtml/appendix/colors/colors.js index 3f89770e8..ee86642f3 100644 --- a/docs/src/xhtml/appendix/colors/colors.js +++ b/docs/src/xhtml/appendix/colors/colors.js @@ -9,7 +9,7 @@ ts.ui.ready(function rendercolors() { var rule = rules[i]; var color = rule.selectorText.substring(5); var rgb = rule.style.color; - var channels = rgb.match(/rgb\((\d{1,3}), (\d{1,3}), (\d{1,3})\)/); + var channels = rgb.match(/rgba?\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})/); var row = color.split('-')[1]; colors[row] = colors[row] || {}; var hsl = rgbToHsl(channels[1], channels[2], channels[3]); @@ -60,16 +60,16 @@ function rgbToHsl(r, g, b) { } h /= 6; } - h = Math.floor(h * 360); - s = Math.floor(s * 100); - l = Math.floor(l * 100); + h = Math.round(h * 360); + s = Math.round(s * 100); + l = Math.round(l * 100); - return ['hsl(' + h + ', ' + s + ', ' + l + ')', h, s, l]; + return ['hsl(' + h + ', ' + s + '%, ' + l + '%)', h, s, l]; } // @see https://gist.github.com/sabman/1018593 function rgbToHex(rgb) { - rgb = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/); + rgb = rgb.match(/rgba?\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})/); function hex(x) { return ('0' + parseInt(x).toString(16)).slice(-2); } diff --git a/package-lock.json b/package-lock.json index 3a256370c..d44ba2b36 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@tradeshift/tradeshift-ui", - "version": "11.0.0-alpha.2", + "version": "11.0.1", "lockfileVersion": 1, "requires": true, "dependencies": { From f8637269b91c9902a687625e6cd7f42992d54c4d Mon Sep 17 00:00:00 2001 From: Daniel Spitzer Date: Wed, 7 Nov 2018 13:34:13 +0100 Subject: [PATCH 2/6] [Docs] Update intro page icon colors --- docs/src/less/dox-page-intro.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/less/dox-page-intro.less b/docs/src/less/dox-page-intro.less index 5b7098122..d81ca74ee 100644 --- a/docs/src/less/dox-page-intro.less +++ b/docs/src/less/dox-page-intro.less @@ -52,7 +52,7 @@ circle, polygon, path { - fill: @ts-green-lite; + fill: @ts-green; } } } From cf0b8a3a12183c6e7b747f1a97e6204cbb11a73f Mon Sep 17 00:00:00 2001 From: Daniel Spitzer Date: Wed, 7 Nov 2018 14:30:49 +0100 Subject: [PATCH 3/6] [Docs] Use valid JSON for `DoxApi` blocks --- docs/src/xhtml/components/bars/tabbar.xhtml | 32 +- docs/src/xhtml/components/bars/toolbar.xhtml | 152 +++++----- docs/src/xhtml/components/bars/topbar.xhtml | 280 +++++++++--------- .../src/xhtml/components/footer/actions.xhtml | 68 ++--- .../components/footer/collabbutton.xhtml | 10 +- .../components/footer/configbutton.xhtml | 10 +- docs/src/xhtml/components/footer/index.xhtml | 58 ++-- docs/src/xhtml/components/modals/index.xhtml | 78 ++--- docs/src/xhtml/components/pager/index.xhtml | 26 +- .../src/xhtml/components/table/building.xhtml | 28 +- .../xhtml/components/table/collaborate.xhtml | 10 +- .../xhtml/components/table/configuring.xhtml | 30 +- docs/src/xhtml/components/table/editing.xhtml | 50 ++-- docs/src/xhtml/components/table/extras.xhtml | 158 +++++----- .../xhtml/components/table/selecting.xhtml | 54 ++-- docs/src/xhtml/components/tags/tag.xhtml | 74 ++--- .../xhtml/components/userimages/index.xhtml | 28 +- .../xhtml/components/userimages/json.xhtml | 28 +- 18 files changed, 587 insertions(+), 587 deletions(-) diff --git a/docs/src/xhtml/components/bars/tabbar.xhtml b/docs/src/xhtml/components/bars/tabbar.xhtml index 91fda2108..902bdd28a 100644 --- a/docs/src/xhtml/components/bars/tabbar.xhtml +++ b/docs/src/xhtml/components/bars/tabbar.xhtml @@ -104,33 +104,33 @@
@@ -427,39 +427,39 @@
diff --git a/docs/src/xhtml/components/modals/index.xhtml b/docs/src/xhtml/components/modals/index.xhtml index 782824ade..b442aeb3e 100644 --- a/docs/src/xhtml/components/modals/index.xhtml +++ b/docs/src/xhtml/components/modals/index.xhtml @@ -254,76 +254,76 @@
diff --git a/docs/src/xhtml/components/icons/list.xhtml b/docs/src/xhtml/components/icons/list.xhtml index 876f67f5c..e564dc6e8 100644 --- a/docs/src/xhtml/components/icons/list.xhtml +++ b/docs/src/xhtml/components/icons/list.xhtml @@ -47,13 +47,13 @@ var table = ts.ui.get('#icons'); table.cols([ { - label: '11px', + label: '10px', type: 'icons-size-tiny', minwidth: ts.ui.UNIT * 3 }, { // @ts-fontsize-icon - label: '22px', + label: '20px', type: 'icons-size-std', minwidth: ts.ui.UNIT * 3 }, diff --git a/docs/src/xhtml/components/times/langs.xhtml b/docs/src/xhtml/components/times/langs.xhtml index 02c7f79d2..1b1d3a59c 100644 --- a/docs/src/xhtml/components/times/langs.xhtml +++ b/docs/src/xhtml/components/times/langs.xhtml @@ -5,7 +5,7 @@ diff --git a/docs/src/xhtml/screenshots/pages/asides.xhtml b/docs/src/xhtml/screenshots/pages/asides.xhtml index 4c23de5a5..f9266ceed 100644 --- a/docs/src/xhtml/screenshots/pages/asides.xhtml +++ b/docs/src/xhtml/screenshots/pages/asides.xhtml @@ -14,7 +14,7 @@ margin-left: -160px; background-color: rgb(253,254,213); color: rgb(127,115,72); - padding: 22px; + padding: 20px; border-radius: 3px; box-shadow: 3px 3px 6px rgb(0,0,0,0.75); } From b32b5fa024d37da1f15faa876b181350da29faa8 Mon Sep 17 00:00:00 2001 From: Daniel Spitzer Date: Wed, 7 Nov 2018 14:35:11 +0100 Subject: [PATCH 5/6] [Colors] Use correct `@ts-green` --- src/runtime/less/ts-variables.less | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/runtime/less/ts-variables.less b/src/runtime/less/ts-variables.less index 9512964fa..1288f39d1 100644 --- a/src/runtime/less/ts-variables.less +++ b/src/runtime/less/ts-variables.less @@ -81,9 +81,9 @@ @ts-color-yellow-dark: darken(@ts-color-yellow, 10%); @ts-color-yellow-darker: darken(@ts-color-yellow, 15%); -@ts-color-green-lightest: lighten(@ts-color-green, 50%); -@ts-color-green-lighter: lighten(@ts-color-green, 35%); -@ts-color-green-light: lighten(@ts-color-green, 20%); +@ts-color-green-lightest: hsl(99, 59%, 90%); +@ts-color-green-lighter: hsl(99, 60%, 81%); +@ts-color-green-light: hsl(99, 61%, 63%); @ts-color-green-dark: darken(@ts-color-green, 10%); @ts-color-green-darker: darken(@ts-color-green, 15%); @@ -147,7 +147,7 @@ green-text: @ts-color-white; litegreen: @ts-color-green-lighter; green-lite: @ts-color-green-light; - green: @ts-color-green; + green: average(@ts-color-green-light, @ts-color-green); green-dark: @ts-color-green-dark; green-darker: @ts-color-green-darker; darkgreen: darken(@ts-color-green, 25%); @@ -222,7 +222,7 @@ @ts-green-text: @ts-colors[green-text]; @ts-litegreen: @ts-colors[litegreen]; @ts-green-lite: @ts-colors[green-lite]; -@ts-green: fade(@ts-colors[green], 4%); +@ts-green: @ts-colors[green]; @ts-green-dark: @ts-colors[green-dark]; @ts-green-darker: @ts-colors[green-darker]; @ts-darkgreen: @ts-colors[darkgreen]; From b250b41d3fac5c57103c9402d53b162be9c6d26c Mon Sep 17 00:00:00 2001 From: Daniel Spitzer Date: Wed, 7 Nov 2018 15:27:49 +0100 Subject: [PATCH 6/6] Release v11.0.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1d7192c7f..4bc0fa835 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tradeshift/tradeshift-ui", - "version": "11.0.1", + "version": "11.0.2", "description": "The Tradeshift UI Library & Framework", "homepage": "http://ui.tradeshift.com/", "bugs": {