From ec3ffd8005696943b409c8a0242d4747427124c6 Mon Sep 17 00:00:00 2001 From: mak001 Date: Thu, 28 Sep 2017 16:27:26 -0500 Subject: [PATCH] Changed where stuff compiled - css now compiles to /css instead of /client/dist/css Css is now loaded via themedCSS in the template Javascript requirements now load in using the module name, not the path Updated gitattributes --- .gitattributes | 17 +++++- client/dist/css/main.css.map | 1 - client/dist/js/main.js | 36 +++++++------ client/dist/js/main.js.map | 2 +- client/dist/js/map.js.map | 2 +- client/dist/js/vendor.js | 2 +- client/dist/js/vendor.js.map | 2 +- client/src/js/components/list/Location.jsx | 4 +- client/dist/css/main.css => css/locator.css | 4 +- css/locator.css.map | 1 + src/objects/Location.php | 58 ++++++++++---------- src/pages/Locator.php | 60 ++++++++++----------- templates/Dynamic/Locator/Layout/Locator.ss | 6 +-- webpack.config.dev.js | 8 +-- webpack.config.prod.js | 2 +- 15 files changed, 114 insertions(+), 91 deletions(-) delete mode 100644 client/dist/css/main.css.map rename client/dist/css/main.css => css/locator.css (99%) create mode 100644 css/locator.css.map diff --git a/.gitattributes b/.gitattributes index 53456d8..ae1ad29 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,19 @@ +# tests /tests export-ignore +/phpunit.xml.dist export-ignore +/phpcs.xml.dist export-ignore + +# js related stuff +/.eslint export-ignore +/package.json export-ignore +/package-lock.json export-ignore +/webpack.config.dev.js export-ignore +/webpack.config.prod.js export-ignore +/client/src export-ignore +/client/tests export-ignore + +# other /.gitignore export-ignore /.travis.yml export-ignore -/client/src export-ignore +/.scrutinizer.yml export-ignore +/.editorconfig export-ignore diff --git a/client/dist/css/main.css.map b/client/dist/css/main.css.map deleted file mode 100644 index 6982c76..0000000 --- a/client/dist/css/main.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["webpack:///./node_modules/bootstrap/scss/_forms.scss","webpack:///./node_modules/bootstrap/scss/mixins/_transition.scss","webpack:///./main.scss","webpack:///./node_modules/bootstrap/scss/mixins/_forms.scss","webpack:///./node_modules/bootstrap/scss/mixins/_border-radius.scss","webpack:///./node_modules/bootstrap/scss/mixins/_breakpoints.scss","webpack:///./node_modules/bootstrap/scss/utilities/_screenreaders.scss","webpack:///./node_modules/bootstrap/scss/mixins/_screen-reader.scss","webpack:///./client/src/scss/_layout.scss","webpack:///./client/src/scss/mixins/_grid.scss","webpack:///./node_modules/bootstrap/scss/mixins/_grid.scss","webpack:///./client/src/scss/components/_form.scss","webpack:///./client/src/scss/components/_map.scss","webpack:///./client/src/scss/components/_list.scss","webpack:///./client/src/scss/components/_loading.scss"],"names":[],"mappings":"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","file":"css/main.css","sourcesContent":["// scss-lint:disable QualifyingElement, VendorPrefix\n\n//\n// Textual form controls\n//\n\n.form-control {\n display: block;\n width: 100%;\n // // Make inputs at least the height of their button counterpart (base line-height + padding + border)\n // height: $input-height;\n padding: $input-btn-padding-y $input-btn-padding-x;\n font-size: $font-size-base;\n line-height: $input-btn-line-height;\n color: $input-color;\n background-color: $input-bg;\n // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214.\n background-image: none;\n background-clip: padding-box;\n border: $input-btn-border-width solid $input-border-color;\n\n // Note: This has no effect on `s in CSS.\n @if $enable-rounded {\n // Manually use the if/else instead of the mixin to account for iOS override\n border-radius: $input-border-radius;\n } @else {\n // Otherwise undo the iOS default\n border-radius: 0;\n }\n\n @include box-shadow($input-box-shadow);\n @include transition($input-transition);\n\n // Unstyle the caret on ` receives focus\n // in IE and (under certain conditions) Edge, as it looks bad and cannot be made to\n // match the appearance of the native widget.\n // See https://github.com/twbs/bootstrap/issues/19398.\n color: $input-color;\n background-color: $input-bg;\n }\n}\n\n// Make file inputs better match text inputs by forcing them to new lines.\n.form-control-file,\n.form-control-range {\n display: block;\n}\n\n\n//\n// Labels\n//\n\n// For use with horizontal and inline forms, when you need the label text to\n// align with the form controls.\n.col-form-label {\n padding-top: calc(#{$input-btn-padding-y} - #{$input-btn-border-width} * 2);\n padding-bottom: calc(#{$input-btn-padding-y} - #{$input-btn-border-width} * 2);\n margin-bottom: 0; // Override the `