From 5135006a5b00d12e88f46fa30304eef98d696ef0 Mon Sep 17 00:00:00 2001 From: Tony Air Date: Sat, 27 Jul 2024 11:38:37 +0200 Subject: [PATCH] Minor styling fixtures --- code/formfields/FontAwesomeField.php | 8 ++------ dist/css/app.css | 2 +- dist/records.json | 27 +++++++++++++++++++++++++++ dist/report.html | 2 +- src/js/app.js | 4 ++-- src/scss/app.scss | 13 +++++++++++++ 6 files changed, 46 insertions(+), 10 deletions(-) diff --git a/code/formfields/FontAwesomeField.php b/code/formfields/FontAwesomeField.php index f67a5dd..1b2c8f3 100644 --- a/code/formfields/FontAwesomeField.php +++ b/code/formfields/FontAwesomeField.php @@ -31,12 +31,8 @@ class FontAwesomeField extends TextField // Libraries Requirements::css('https://use.fontawesome.com/releases/v'.self::config()->get('version').'/css/all.css'); - Requirements::css(FONT_AWESOME_DIR . '/client/dist/css/lib/fontawesome-iconpicker.min.css'); - Requirements::javascript(FONT_AWESOME_DIR . '/client/dist/js/lib/fontawesome-iconpicker.min.js'); - - // Module - Requirements::css(FONT_AWESOME_DIR . '/client/dist/css/font-awesome-module.css'); - Requirements::javascript(FONT_AWESOME_DIR . '/client/dist/js/font-awesome-module.js'); + Requirements::css(FONT_AWESOME_DIR . '/dist/css/app.css'); + Requirements::javascript(FONT_AWESOME_DIR . '/dist/js/app.js'); Requirements::set_force_js_to_bottom(true); diff --git a/dist/css/app.css b/dist/css/app.css index b9221b9..32aa3c1 100644 --- a/dist/css/app.css +++ b/dist/css/app.css @@ -1 +1 @@ -.icon-picker-modal{background-color:rgba(68,69,69,0);bottom:0;left:0;position:fixed;right:0;top:0;transition:background-color .3s ease-out,visibility .3s ease-out;visibility:hidden;z-index:100000}.icon-picker-modal.is-visible{background-color:rgba(68,69,69,.6);visibility:visible}.icon-picker-modal.is-visible .icon-picker-modal__dialog{opacity:1;transform:translate(-50%,-50%)}.icon-picker-modal__dialog{background-color:#fff;border-radius:16px;display:flex;flex-direction:column;height:440px;left:50%;min-width:380px;opacity:0;padding:24px;position:absolute;top:50%;transform:translate(-50%,-55%);transition:transform .3s ease-in-out,opacity .3s ease;z-index:1}.icon-picker-modal__header{align-items:center;display:flex;justify-content:space-between}.icon-picker-modal__header h2{font-size:24px;margin-block-end:0;margin-block-start:0}.icon-picker-modal__header .icon-picker-modal--close{-webkit-appearance:none;background:none;border:none;border-radius:4px;cursor:pointer;margin-left:auto;padding:2px;transition:background-color .3s ease}.icon-picker-modal__header .icon-picker-modal--close:hover{background-color:#f3f3f3}.icon-picker-modal__search{margin:32px 0 24px}.icon-picker-modal__content{display:grid;grid-template-columns:repeat(7,40px);grid-gap:8px;overflow-y:scroll}.icon-picker-modal__content .is-empty{grid-column:1/-1;text-align:center}.icon-picker-modal__content .icon-element{align-items:center;background-color:transparent;border:1px solid #ced4da;border-radius:4px;cursor:pointer;display:flex;height:40px;justify-content:center;transition:background-color .3s ease,border-color .3s ease;width:40px}.icon-picker-modal__content .icon-element i,.icon-picker-modal__content .icon-element svg{color:#0983fd;font-size:24px}.icon-picker-modal__content .icon-element:hover{background-color:#0983fd;border-color:#0983fd}.icon-picker-modal__content .icon-element:hover i,.icon-picker-modal__content .icon-element:hover svg{color:#fff}.icon-picker-modal__content .icon-element.is-selected{background-color:#0983fd;border-color:#0983fd}.icon-picker-modal__content .icon-element.is-selected i,.icon-picker-modal__content .icon-element.is-selected svg{color:#fff}.icon-picker-modal__content .icon-element[hidden]{display:none}.icon-picker-modal__footer{align-self:flex-end;margin-top:auto;padding-top:24px} \ No newline at end of file +.icon-picker-modal{background-color:rgba(68,69,69,0);bottom:0;left:0;position:fixed;right:0;top:0;transition:background-color .3s ease-out,visibility .3s ease-out;visibility:hidden;z-index:100000}.icon-picker-modal.is-visible{background-color:rgba(68,69,69,.6);visibility:visible}.icon-picker-modal.is-visible .icon-picker-modal__dialog{opacity:1;transform:translate(-50%,-50%)}.icon-picker-modal__dialog{background-color:#fff;border-radius:16px;display:flex;flex-direction:column;height:440px;left:50%;min-width:380px;opacity:0;padding:24px;position:absolute;top:50%;transform:translate(-50%,-55%);transition:transform .3s ease-in-out,opacity .3s ease;z-index:1}.icon-picker-modal__header{align-items:center;display:flex;justify-content:space-between}.icon-picker-modal__header h2{font-size:24px;margin-block-end:0;margin-block-start:0}.icon-picker-modal__header .icon-picker-modal--close{-webkit-appearance:none;background:none;border:none;border-radius:4px;cursor:pointer;margin-left:auto;padding:2px;transition:background-color .3s ease}.icon-picker-modal__header .icon-picker-modal--close:hover{background-color:#f3f3f3}.icon-picker-modal__search{margin:32px 0 24px}.icon-picker-modal__content{display:grid;grid-template-columns:repeat(7,40px);grid-gap:8px;overflow-y:scroll}.icon-picker-modal__content .is-empty{grid-column:1/-1;text-align:center}.icon-picker-modal__content .icon-element{align-items:center;background-color:transparent;border:1px solid #ced4da;border-radius:4px;cursor:pointer;display:flex;height:40px;justify-content:center;transition:background-color .3s ease,border-color .3s ease;width:40px}.icon-picker-modal__content .icon-element i,.icon-picker-modal__content .icon-element svg{color:#0983fd;font-size:24px}.icon-picker-modal__content .icon-element:hover{background-color:#0983fd;border-color:#0983fd}.icon-picker-modal__content .icon-element:hover i,.icon-picker-modal__content .icon-element:hover svg{color:#fff}.icon-picker-modal__content .icon-element.is-selected{background-color:#0983fd;border-color:#0983fd}.icon-picker-modal__content .icon-element.is-selected i,.icon-picker-modal__content .icon-element.is-selected svg{color:#fff}.icon-picker-modal__content .icon-element[hidden]{display:none}.icon-picker-modal__footer{align-self:flex-end;margin-top:auto;padding-top:24px}.icon-picker-modal__content .icon-element i,.icon-picker-modal__content .icon-element svg{color:inherit}.icon-picker-modal__dialog{min-width:400px} \ No newline at end of file diff --git a/dist/records.json b/dist/records.json index 850f196..65604e9 100644 --- a/dist/records.json +++ b/dist/records.json @@ -10,6 +10,33 @@ 524 ] }, + "mini-css-extract-plugin /mnt/data/srv/dist/repositories/silverstripe-font-awesome/node_modules/.pnpm/css-loader@6.11.0_webpack@5.93.0_webpack-cli@5.1.4_/node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[1].use[1]!./node_modules/.pnpm/sass-loader@13.3.3_sass@1.77.8_webpack@5.93.0_webpack-cli@5.1.4_/node_modules/sass-loader/dist/cjs.js??ruleSet[1].rules[1].use[2]!./src/scss/app.scss": [ + { + "chunks": { + "byName": { + "child": 615 + }, + "bySource": { + "0 child": 615 + }, + "usedIds": [ + 615 + ] + }, + "modules": { + "byIdentifier": { + "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.24.9_webpack@5.93.0_webpack-cli@5.1.4_/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/css-loader@6.11.0_webpack@5.93.0_webpack-cli@5.1.4_/node_modules/css-loader/dist/runtime/api.js": 221, + "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.24.9_webpack@5.93.0_webpack-cli@5.1.4_/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/css-loader@6.11.0_webpack@5.93.0_webpack-cli@5.1.4_/node_modules/css-loader/dist/runtime/sourceMaps.js": 991, + "./node_modules/.pnpm/css-loader@6.11.0_webpack@5.93.0_webpack-cli@5.1.4_/node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[1].use[1]!./node_modules/.pnpm/sass-loader@13.3.3_sass@1.77.8_webpack@5.93.0_webpack-cli@5.1.4_/node_modules/sass-loader/dist/cjs.js??ruleSet[1].rules[1].use[2]!./src/scss/app.scss": 196 + }, + "usedIds": [ + 196, + 221, + 991 + ] + } + } + ], "modules": { "byIdentifier": { "./node_modules/.pnpm/babel-loader@9.1.3_@babel+core@7.24.9_webpack@5.93.0_webpack-cli@5.1.4_/node_modules/babel-loader/lib/index.js??ruleSet[1].rules[0].use!./node_modules/.pnpm/vanilla-icon-picker@1.3.0/node_modules/vanilla-icon-picker/dist/icon-picker.min.js": 155, diff --git a/dist/report.html b/dist/report.html index f5b7246..64dd28e 100644 --- a/dist/report.html +++ b/dist/report.html @@ -3,7 +3,7 @@ - @a2nt/ss-bootstrap-ui-webpack-boilerplate-react [27 Jul 2024 at 11:24] + @a2nt/ss-bootstrap-ui-webpack-boilerplate-react [27 Jul 2024 at 11:38]