From ca025220a71c55713e384f897df2817ee63cc104 Mon Sep 17 00:00:00 2001 From: Tony Air Date: Fri, 9 Apr 2021 14:14:23 +0700 Subject: [PATCH] IMPR: Minor updates --- app/client/src/scss/app.scss | 1 + app/templates/Includes/NavItem.ss | 4 +- app/templates/Includes/NavItem_link.ss | 2 +- app/templates/Includes/Navigation.ss | 4 +- .../SilverStripe/Forms/OptionsetField.ss | 8 +++ package.json | 54 ++++++++++--------- 6 files changed, 42 insertions(+), 31 deletions(-) create mode 100644 app/templates/SilverStripe/Forms/OptionsetField.ss diff --git a/app/client/src/scss/app.scss b/app/client/src/scss/app.scss index 08c56c9..6dc08b7 100644 --- a/app/client/src/scss/app.scss +++ b/app/client/src/scss/app.scss @@ -1,6 +1,7 @@ // Your custom variables @import '_variables'; +@import '~@a2nt/meta-lightbox-react/src/scss/app'; @import '~@a2nt/ss-bootstrap-ui-webpack-boilerplate-react/src/scss/_components/_ui.bootstrap'; @import '~@a2nt/ss-bootstrap-ui-webpack-boilerplate-react/src/scss/_components/_ui.main'; @import '~@a2nt/ss-bootstrap-ui-webpack-boilerplate-react/src/scss/_components/_ui.main.ss'; diff --git a/app/templates/Includes/NavItem.ss b/app/templates/Includes/NavItem.ss index e0cc229..c918b2b 100644 --- a/app/templates/Includes/NavItem.ss +++ b/app/templates/Includes/NavItem.ss @@ -1,5 +1,5 @@ <% if $Children %> -
+
<% include NavItem_link ExtraClass="dropdown-toggle-fl dropdown-toggle-notouch" %>
<% else %> -
+
<% include NavItem_link ExtraClass='' %>
<% end_if %> diff --git a/app/templates/Includes/NavItem_link.ss b/app/templates/Includes/NavItem_link.ss index c45d5b6..d74d6e5 100644 --- a/app/templates/Includes/NavItem_link.ss +++ b/app/templates/Includes/NavItem_link.ss @@ -1,5 +1,5 @@ target="_blank"<% end_if %> data-text="{$MenuTitle.XML}" diff --git a/app/templates/Includes/Navigation.ss b/app/templates/Includes/Navigation.ss index 8f32415..1f1e892 100644 --- a/app/templates/Includes/Navigation.ss +++ b/app/templates/Includes/Navigation.ss @@ -12,10 +12,10 @@
diff --git a/app/templates/SilverStripe/Forms/OptionsetField.ss b/app/templates/SilverStripe/Forms/OptionsetField.ss new file mode 100644 index 0000000..870c48e --- /dev/null +++ b/app/templates/SilverStripe/Forms/OptionsetField.ss @@ -0,0 +1,8 @@ +
    + <% loop $Options %> +
  • + checked<% end_if %><% if $isDisabled %> disabled<% end_if %> /> + +
    • + <% end_loop %> +
diff --git a/package.json b/package.json index 7f9b7d5..cbca967 100755 --- a/package.json +++ b/package.json @@ -31,13 +31,13 @@ "ie>=11" ], "dependencies": { - "@a2nt/meta-lightbox-react": "^3.1.0", - "@a2nt/ss-bootstrap-ui-webpack-boilerplate-react": "^3.1.6", - "@angular/common": "^11.2.6", - "@angular/core": "^11.2.6", - "@apollo/client": "^3.3.12", + "@a2nt/meta-lightbox-react": "^3.1.2", + "@a2nt/ss-bootstrap-ui-webpack-boilerplate-react": "^3.1.8", + "@angular/common": "^11.2.8", + "@angular/core": "^11.2.8", + "@apollo/client": "^3.3.13", "@jsanahuja/instagramfeed": "github:jsanahuja/instagramfeed", - "@popperjs/core": "^2.9.1", + "@popperjs/core": "^2.9.2", "aos": "^2.3.4", "apollo3-cache-persist": "^0.9.1", "axios": "^0.21.1", @@ -49,33 +49,35 @@ "graphql": "^15.5.0", "hammerjs": "^2.0.8", "inputmask": "^5.0.5", + "keyboardjs": "^2.6.4", "localforage": "^1.9.0", "localforage-cordovasqlitedriver": "^1.8.0", "lodash.debounce": "^4.0.8", "lodash.throttle": "^4.1.1", - "mapbox-gl": "^2.1.1", + "mapbox-gl": "^2.2.0", "material-design-color": "^2.3.2", "minimatch": "^3.0.4", "moment": "^2.29.1", - "react": "^17.0.1", - "react-dom": "^17.0.1", + "react": "^17.0.2", + "react-dom": "^17.0.2", + "react-easy-swipe": "^0.0.21", "react-tiny-oembed": "^1.0.1", - "rxjs": "^6.6.6", + "rxjs": "^6.6.7", "select2": "^4.0.13", "setimmediate": "^1.0.5" }, "devDependencies": { "@a2nt/image-sprite-webpack-plugin": "^0.2.5", - "@babel/core": "^7.13.10", - "@babel/eslint-parser": "^7.13.10", + "@babel/core": "^7.13.14", + "@babel/eslint-parser": "^7.13.14", "@babel/plugin-proposal-class-properties": "^7.13.0", "@babel/plugin-proposal-object-rest-spread": "^7.13.8", "@babel/plugin-syntax-jsx": "^7.12.13", "@babel/plugin-syntax-top-level-await": "^7.12.13", - "@babel/plugin-transform-react-jsx": "^7.12.17", + "@babel/plugin-transform-react-jsx": "^7.13.12", "@babel/plugin-transform-runtime": "^7.13.10", - "@babel/preset-env": "^7.13.10", - "@babel/preset-react": "^7.12.13", + "@babel/preset-env": "^7.13.12", + "@babel/preset-react": "^7.13.13", "@babel/runtime": "^7.13.10", "@googlemaps/markerclustererplus": "*", "@ungap/global-this": "^0.4.4", @@ -87,15 +89,15 @@ "ansi-regex": "^5.0.0", "autoprefixer": "^10.2.5", "babel-loader": "^8.2.2", - "classnames": "^2.2.6", + "classnames": "^2.3.0", "copy-webpack-plugin": "^7.0.0", "croppie": "^2.6.5", "cross-env": "^7.0.3", - "css-loader": "^5.1.3", - "eslint": "^7.22.0", + "css-loader": "^5.2.0", + "eslint": "^7.23.0", "eslint-plugin-import": "^2.22.1", "eslint-plugin-jquery": "^1.5.1", - "eslint-plugin-react": "^7.22.0", + "eslint-plugin-react": "^7.23.1", "events": "^3.3.0", "exif-js": "^2.3.0", "exports-loader": "^2.0.0", @@ -114,7 +116,7 @@ "html-webpack-plugin": "^5.3.1", "img-optimize-loader": "^1.0.7", "loglevel": "^1.7.1", - "mini-css-extract-plugin": "^1.3.9", + "mini-css-extract-plugin": "^1.4.0", "msw": "^0.26.2", "node-fetch": "^2.6.1", "node-sass": "^5.0.0", @@ -127,7 +129,7 @@ "querystring": "^0.2.1", "raw-loader": "^4.0.2", "react-hot-loader": "^4.13.0", - "react-is": "^17.0.1", + "react-is": "^17.0.2", "react-lifecycles-compat": "^3.0.4", "regenerator-runtime": "^0.13.7", "resolve-url-loader": "^3.1.2", @@ -136,7 +138,7 @@ "sass-lint": "^1.13.1", "sass-lint-fix": "^1.12.1", "sass-loader": "^11.0.1", - "scheduler": "^0.20.1", + "scheduler": "^0.20.2", "shallowequal": "^1.1.0", "strip-ansi": "^6.0.0", "style-loader": "^2.0.0", @@ -147,11 +149,11 @@ "tslib": "^2.1.0", "url": "^0.11.0", "url-loader": "^4.1.1", - "webpack": "^5.27.1", + "webpack": "^5.30.0", "webpack-bundle-analyzer": "^4.4.0", - "webpack-cli": "^4.5.0", - "webpack-dev-server": "^4.0.0-beta.0", - "webpack-manifest-plugin": "^3.1.0", + "webpack-cli": "^4.6.0", + "webpack-dev-server": "^4.0.0-beta.1", + "webpack-manifest-plugin": "^3.1.1", "webpack-merge": "^5.7.3", "yarn": "^1.22.10", "zen-observable": "^0.8.15"