From 537d51b38fd1878500e15afbc39a1f6b6b2d48e9 Mon Sep 17 00:00:00 2001 From: kateloschinina Date: Thu, 22 Jun 2017 14:37:57 +0100 Subject: [PATCH 1/7] Create simulation of window pars for the convenience to run and test locally. --- .gitignore | 1 + src/helpers/helpers.js | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index 24d44b3..44969ea 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ docker-compose.yml # configs /.env /config.js +/config-window.js diff --git a/src/helpers/helpers.js b/src/helpers/helpers.js index 0d8ed7c..b543d80 100644 --- a/src/helpers/helpers.js +++ b/src/helpers/helpers.js @@ -1,4 +1,5 @@ let licenceData = undefined; +import { kmtConfig } from "../../config-window.js"; /** * Sort the licenses by the creation date @@ -37,6 +38,12 @@ export function getCookieUserDetails() { // if the data has not been retrieved if (licenceData === undefined) { licenceData = {}; + + // FOR THE PURPOSE TO RUN LOCALLY< TO BE DELETED + if (!window.KMT_CONFIG) { + window.KMT_CONFIG = kmtConfig; + } + if (window.KMT_CONFIG) { licenceData.items = _sortAndNameLicenses(window.KMT_CONFIG.licenceList || []); licenceData.username = window.KMT_CONFIG.displayName || "Unknown User"; From 7f433b97f95f9208890552dd17ccb4dc6b43d73d Mon Sep 17 00:00:00 2001 From: kateloschinina Date: Thu, 22 Jun 2017 14:41:33 +0100 Subject: [PATCH 2/7] Adding another window par simulation. --- src/helpers/helpers.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/helpers/helpers.js b/src/helpers/helpers.js index b543d80..8b2b148 100644 --- a/src/helpers/helpers.js +++ b/src/helpers/helpers.js @@ -1,5 +1,6 @@ let licenceData = undefined; import { kmtConfig } from "../../config-window.js"; +import { licenceID } from "../../config-window.js"; /** * Sort the licenses by the creation date @@ -43,6 +44,9 @@ export function getCookieUserDetails() { if (!window.KMT_CONFIG) { window.KMT_CONFIG = kmtConfig; } + if (!window.LICENCE_ID) { + window.LICENCE_ID = licenceID; + } if (window.KMT_CONFIG) { licenceData.items = _sortAndNameLicenses(window.KMT_CONFIG.licenceList || []); From 63a2df67a3adba5d4d7da732702b423ec62b94ba Mon Sep 17 00:00:00 2001 From: kateloschinina Date: Thu, 22 Jun 2017 15:43:35 +0100 Subject: [PATCH 3/7] Solve lint problem. --- Gemfile | 2 ++ Gemfile.lock | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 Gemfile create mode 100644 Gemfile.lock diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..e41e4d1 --- /dev/null +++ b/Gemfile @@ -0,0 +1,2 @@ +source "https://rubygems.org" +gem 'scss_lint', '~> 0.48.0' diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..1725a58 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,17 @@ +GEM + remote: https://rubygems.org/ + specs: + rake (11.2.2) + sass (3.4.22) + scss_lint (0.48.0) + rake (>= 0.9, < 12) + sass (~> 3.4.15) + +PLATFORMS + ruby + +DEPENDENCIES + scss_lint (~> 0.48.0) + +BUNDLED WITH + 1.15.1 From d83e5c2e21a3b3f684eaae27a64ca33d3927ec00 Mon Sep 17 00:00:00 2001 From: kateloschinina Date: Thu, 22 Jun 2017 15:45:12 +0100 Subject: [PATCH 4/7] Required changes in style. --- src/components/license-dropdown/style.scss | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/components/license-dropdown/style.scss b/src/components/license-dropdown/style.scss index 67d0b05..1256741 100644 --- a/src/components/license-dropdown/style.scss +++ b/src/components/license-dropdown/style.scss @@ -2,6 +2,7 @@ &__license { &-wrapper { + border: 1px solid oColorsGetPaletteColor("white"); cursor: pointer; // ignoring the nesting warning as it's not actually a nested class (it's BEM) @@ -56,6 +57,12 @@ } } + &-used { + margin: 5px 20px; + font-size: 18px; + line-height: 26px; + } + &-label { position: relative; padding-right: 15px; @@ -65,21 +72,17 @@ // ignoring the nesting warning as it's not actually a nested class (it's BEM) // scss-lint:disable NestingDepth &::after { - @include oIconsGetIcon('arrow-up-down', oColorsGetPaletteColor('white'), 12); + @include oIconsGetIcon('arrow-down', oColorsGetPaletteColor("claret"), 10); + background-color: oColorsGetPaletteColor("white"); content: ""; position: absolute; - top: 3px; + padding: 8px; right: 0; } &:hover { color: oColorsGetPaletteColor("grey-tint2"); - - &::after { - @include oIconsGetIcon('arrow-up-down', oColorsGetPaletteColor('grey-tint2'), 12); - } } - } &-label--noIcon { @@ -103,6 +106,10 @@ display: block; } + .kmt-forms__select { + border: 1px solid oColorsGetPaletteColor("white"); + } + select, From 708301b156d10532552412a856e9aa7e970603d2 Mon Sep 17 00:00:00 2001 From: kateloschinina Date: Thu, 22 Jun 2017 15:52:44 +0100 Subject: [PATCH 5/7] Fix arrow position. --- src/components/license-dropdown/style.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/license-dropdown/style.scss b/src/components/license-dropdown/style.scss index 1256741..9c4eb15 100644 --- a/src/components/license-dropdown/style.scss +++ b/src/components/license-dropdown/style.scss @@ -77,12 +77,13 @@ content: ""; position: absolute; padding: 8px; - right: 0; + right: -2px; } &:hover { color: oColorsGetPaletteColor("grey-tint2"); } + } &-label--noIcon { From 115cbe51368eb93591826afba69fdf7c6903b042 Mon Sep 17 00:00:00 2001 From: kateloschinina Date: Thu, 22 Jun 2017 15:56:44 +0100 Subject: [PATCH 6/7] Remove test helpers references from final version. --- src/helpers/helpers.js | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/helpers/helpers.js b/src/helpers/helpers.js index 8b2b148..3dc5489 100644 --- a/src/helpers/helpers.js +++ b/src/helpers/helpers.js @@ -1,6 +1,4 @@ let licenceData = undefined; -import { kmtConfig } from "../../config-window.js"; -import { licenceID } from "../../config-window.js"; /** * Sort the licenses by the creation date @@ -40,14 +38,6 @@ export function getCookieUserDetails() { if (licenceData === undefined) { licenceData = {}; - // FOR THE PURPOSE TO RUN LOCALLY< TO BE DELETED - if (!window.KMT_CONFIG) { - window.KMT_CONFIG = kmtConfig; - } - if (!window.LICENCE_ID) { - window.LICENCE_ID = licenceID; - } - if (window.KMT_CONFIG) { licenceData.items = _sortAndNameLicenses(window.KMT_CONFIG.licenceList || []); licenceData.username = window.KMT_CONFIG.displayName || "Unknown User"; From 6ff589b75925186d8793db1865dae74f8ce9bb96 Mon Sep 17 00:00:00 2001 From: kateloschinina Date: Fri, 23 Jun 2017 10:42:35 +0100 Subject: [PATCH 7/7] Remove gemfiles as we don't need them anymore. --- Gemfile | 2 -- Gemfile.lock | 17 ----------------- 2 files changed, 19 deletions(-) delete mode 100644 Gemfile delete mode 100644 Gemfile.lock diff --git a/Gemfile b/Gemfile deleted file mode 100644 index e41e4d1..0000000 --- a/Gemfile +++ /dev/null @@ -1,2 +0,0 @@ -source "https://rubygems.org" -gem 'scss_lint', '~> 0.48.0' diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 1725a58..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,17 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - rake (11.2.2) - sass (3.4.22) - scss_lint (0.48.0) - rake (>= 0.9, < 12) - sass (~> 3.4.15) - -PLATFORMS - ruby - -DEPENDENCIES - scss_lint (~> 0.48.0) - -BUNDLED WITH - 1.15.1