From 3e8d952ad4d993cbd71845d038d76443223d3b2f Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Wed, 21 Jun 2017 01:54:50 +0100 Subject: [PATCH] remove flags lib from demo shell (#1983) * remove flags lib from demo shell greatly reduce demo shell webpack resources by switching off flags (only 3 icons were displayed in the past) * merge package.json * add icons --- demo-shell-ng2/app/app.component.html | 6 +++--- demo-shell-ng2/app/vendor.ts | 3 --- demo-shell-ng2/package-lock.json | 5 ----- demo-shell-ng2/package.json | 1 - demo-shell-ng2/public/css/app.css | 26 ++++++++++++++++++++++++++ demo-shell-ng2/public/css/flags/gb.svg | 15 +++++++++++++++ demo-shell-ng2/public/css/flags/it.svg | 7 +++++++ demo-shell-ng2/public/css/flags/ru.svg | 7 +++++++ 8 files changed, 58 insertions(+), 12 deletions(-) create mode 100644 demo-shell-ng2/public/css/flags/gb.svg create mode 100644 demo-shell-ng2/public/css/flags/it.svg create mode 100644 demo-shell-ng2/public/css/flags/ru.svg diff --git a/demo-shell-ng2/app/app.component.html b/demo-shell-ng2/app/app.component.html index 4d860b8bcd..a2f7802341 100644 --- a/demo-shell-ng2/app/app.component.html +++ b/demo-shell-ng2/app/app.component.html @@ -36,15 +36,15 @@ Languages diff --git a/demo-shell-ng2/app/vendor.ts b/demo-shell-ng2/app/vendor.ts index fcca40422e..a2a878ef18 100644 --- a/demo-shell-ng2/app/vendor.ts +++ b/demo-shell-ng2/app/vendor.ts @@ -35,9 +35,6 @@ import 'ng2-alfresco-userinfo'; require('script-loader!dialog-polyfill/dialog-polyfill'); import 'dialog-polyfill/dialog-polyfill.css'; -// Flags -import 'flag-icon-css/css/flag-icon.min.css'; - // Load the Angular Material 2 stylesheet import '@angular/material/prebuilt-themes/indigo-pink.css'; diff --git a/demo-shell-ng2/package-lock.json b/demo-shell-ng2/package-lock.json index c2b2aa9150..1b87d97acf 100644 --- a/demo-shell-ng2/package-lock.json +++ b/demo-shell-ng2/package-lock.json @@ -1808,11 +1808,6 @@ } } }, - "flag-icon-css": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/flag-icon-css/-/flag-icon-css-2.3.0.tgz", - "integrity": "sha1-DiCpvfoCB+r1DJ7bigzo/izC5nY=" - }, "flatten": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz", diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json index ed83f30712..e78c7a1265 100644 --- a/demo-shell-ng2/package.json +++ b/demo-shell-ng2/package.json @@ -71,7 +71,6 @@ "core-js": "2.4.1", "dialog-polyfill": "^0.4.7", "element.scrollintoviewifneeded-polyfill": "^1.0.1", - "flag-icon-css": "2.3.0", "intl": "^1.2.5", "material-design-icons": "2.2.3", "material-design-lite": "1.2.1", diff --git a/demo-shell-ng2/public/css/app.css b/demo-shell-ng2/public/css/app.css index 7119266e91..14ec8fe808 100644 --- a/demo-shell-ng2/public/css/app.css +++ b/demo-shell-ng2/public/css/app.css @@ -62,3 +62,29 @@ body, html { border: 0px; cursor: pointer; } + +.adf-flag-icon-gb { + background-image: url(./flags/gb.svg); +} + +.adf-flag-icon-it { + background-image: url(./flags/it.svg); +} + +.adf-flag-icon-ru { + background-image: url(./flags/ru.svg); +} + +.adf-flag-icon:before { + content: "\00a0"; +} + +.adf-flag-icon { + background-size: contain; + background-position: 50%; + background-repeat: no-repeat; + position: relative; + display: inline-block; + width: 1.33333333em; + line-height: 1em; +} diff --git a/demo-shell-ng2/public/css/flags/gb.svg b/demo-shell-ng2/public/css/flags/gb.svg new file mode 100644 index 0000000000..a331748371 --- /dev/null +++ b/demo-shell-ng2/public/css/flags/gb.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/demo-shell-ng2/public/css/flags/it.svg b/demo-shell-ng2/public/css/flags/it.svg new file mode 100644 index 0000000000..eab92e6156 --- /dev/null +++ b/demo-shell-ng2/public/css/flags/it.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/demo-shell-ng2/public/css/flags/ru.svg b/demo-shell-ng2/public/css/flags/ru.svg new file mode 100644 index 0000000000..ea2e10b0c1 --- /dev/null +++ b/demo-shell-ng2/public/css/flags/ru.svg @@ -0,0 +1,7 @@ + + + + + + +