From 507f2af6ac73570e631416ab6533e970307ff39d Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 12 May 2020 18:04:26 +0300 Subject: [PATCH] styles cleanup & fixes --- package-lock.json | 198 +++--- .../theme/View/BrowseView/BrowseTable.jsx | 9 +- .../theme/View/BrowseView/BrowseView.jsx | 8 +- .../theme/View/BrowseView/MapModal.jsx | 5 +- theme/site/globals/site.overrides | 309 +++++---- theme/site/globals/site.variables | 19 + theme/themes/pastanaga/globals/site.overrides | 636 +++++++++--------- 7 files changed, 653 insertions(+), 531 deletions(-) diff --git a/package-lock.json b/package-lock.json index 41a352bd..09e834ab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1767,6 +1767,7 @@ "hamburgers": "1.1.3", "handlebars": "4.3.0", "history": "4.10.1", + "http-proxy-middleware": "1.0.3", "husky": "4.2.1", "jest-css-modules": "1.1.0", "jest-file": "1.0.0", @@ -1996,6 +1997,14 @@ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "requires": { + "fill-range": "^7.0.1" + } + }, "cachedir": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz", @@ -2164,6 +2173,14 @@ "strip-eof": "^1.0.0" } }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "requires": { + "to-regex-range": "^5.0.1" + } + }, "get-stream": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", @@ -2193,6 +2210,18 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, + "http-proxy-middleware": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.0.3.tgz", + "integrity": "sha512-GHvPeBD+A357zS5tHjzj6ISrVOjjCiy0I92bdyTJz0pNmIjFxO0NX/bX+xkGgnclKQE/5hHAB9JEQ7u9Pw4olg==", + "requires": { + "@types/http-proxy": "^1.17.3", + "http-proxy": "^1.18.0", + "is-glob": "^4.0.1", + "lodash": "^4.17.15", + "micromatch": "^4.0.2" + } + }, "import-fresh": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz", @@ -2312,6 +2341,15 @@ "wrap-ansi": "^3.0.1" } }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, "minimist": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", @@ -2707,6 +2745,14 @@ "hoist-non-react-statics": "^3.3.0" } }, + "@types/http-proxy": { + "version": "1.17.4", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.4.tgz", + "integrity": "sha512-IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q==", + "requires": { + "@types/node": "*" + } + }, "@types/invariant": { "version": "2.2.32", "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.32.tgz", @@ -16383,12 +16429,12 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "resolved": false, "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, "ansi-align": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", + "resolved": false, "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", "requires": { "string-width": "^2.0.0" @@ -16401,17 +16447,17 @@ }, "aproba": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", + "resolved": false, "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==" }, "bluebird": { "version": "3.5.5", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz", + "resolved": false, "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==" }, "boxen": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", + "resolved": false, "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", "requires": { "ansi-align": "^2.0.0", @@ -16425,7 +16471,7 @@ }, "cacache": { "version": "12.0.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz", + "resolved": false, "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==", "requires": { "bluebird": "^3.5.5", @@ -16447,27 +16493,27 @@ }, "camelcase": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "resolved": false, "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" }, "chownr": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "resolved": false, "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" }, "ci-info": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", + "resolved": false, "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==" }, "cli-boxes": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", + "resolved": false, "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=" }, "config-chain": { "version": "1.1.12", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", + "resolved": false, "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", "requires": { "ini": "^1.3.4", @@ -16476,7 +16522,7 @@ }, "configstore": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", + "resolved": false, "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", "requires": { "dot-prop": "^4.1.0", @@ -16489,17 +16535,17 @@ }, "detect-indent": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz", + "resolved": false, "integrity": "sha1-OHHMCmoALow+Wzz38zYmRnXwa50=" }, "detect-newline": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz", + "resolved": false, "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=" }, "dot-prop": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", + "resolved": false, "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", "requires": { "is-obj": "^1.0.0" @@ -16507,12 +16553,12 @@ }, "figgy-pudding": { "version": "3.5.1", - "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz", + "resolved": false, "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==" }, "fs-minipass": { "version": "1.2.7", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", + "resolved": false, "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", "requires": { "minipass": "^2.6.0" @@ -16520,7 +16566,7 @@ }, "fs-write-stream-atomic": { "version": "1.0.10", - "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", + "resolved": false, "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", "requires": { "graceful-fs": "^4.1.2", @@ -16531,7 +16577,7 @@ "dependencies": { "iferr": { "version": "0.1.5", - "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz", + "resolved": false, "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=" }, "readable-stream": { @@ -16552,7 +16598,7 @@ }, "glob": { "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "resolved": false, "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "requires": { "fs.realpath": "^1.0.0", @@ -16565,7 +16611,7 @@ }, "got": { "version": "6.7.1", - "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz", + "resolved": false, "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", "requires": { "create-error-class": "^3.0.0", @@ -16583,37 +16629,37 @@ }, "graceful-fs": { "version": "4.2.3", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "resolved": false, "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" }, "has-unicode": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "resolved": false, "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" }, "hosted-git-info": { "version": "2.8.8", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", + "resolved": false, "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==" }, "iferr": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/iferr/-/iferr-1.0.2.tgz", + "resolved": false, "integrity": "sha512-9AfeLfji44r5TKInjhz3W9DyZI1zR1JAf2hVBMGhddAKPqBsupb89jGfbCTHIGZd6fGZl9WlHdn4AObygyMKwg==" }, "imurmurhash": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "resolved": false, "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" }, "infer-owner": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", + "resolved": false, "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==" }, "inflight": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "resolved": false, "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "requires": { "once": "^1.3.0", @@ -16622,12 +16668,12 @@ }, "inherits": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "resolved": false, "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "ini": { "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "resolved": false, "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" }, "is-fullwidth-code-point": { @@ -16637,17 +16683,17 @@ }, "is-npm": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", + "resolved": false, "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=" }, "json-parse-better-errors": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "resolved": false, "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==" }, "latest-version": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz", + "resolved": false, "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", "requires": { "package-json": "^4.0.0" @@ -16655,12 +16701,12 @@ }, "lodash.uniq": { "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", + "resolved": false, "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=" }, "lru-cache": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "resolved": false, "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "requires": { "yallist": "^3.0.2" @@ -16668,7 +16714,7 @@ }, "make-dir": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", + "resolved": false, "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "requires": { "pify": "^3.0.0" @@ -16685,7 +16731,7 @@ }, "mississippi": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", + "resolved": false, "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", "requires": { "concat-stream": "^1.5.0", @@ -16702,7 +16748,7 @@ }, "mkdirp": { "version": "0.5.3", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz", + "resolved": false, "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==", "requires": { "minimist": "^1.2.5" @@ -16710,7 +16756,7 @@ }, "move-concurrently": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", + "resolved": false, "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", "requires": { "aproba": "^1.1.1", @@ -16723,14 +16769,14 @@ "dependencies": { "aproba": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "resolved": false, "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==" } } }, "node-gyp": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-5.1.0.tgz", + "resolved": false, "integrity": "sha512-OUTryc5bt/P8zVgNUmC6xdXiDJxLMAW8cF5tLQOT9E5sOQj+UeQxnnPy74K3CLCa/SOjjBlbuzDLR8ANwA+wmw==", "requires": { "env-paths": "^2.2.0", @@ -16748,7 +16794,7 @@ }, "nopt": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", + "resolved": false, "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", "requires": { "abbrev": "1", @@ -16757,7 +16803,7 @@ }, "normalize-package-data": { "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "resolved": false, "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "requires": { "hosted-git-info": "^2.1.4", @@ -16768,7 +16814,7 @@ }, "npm-packlist": { "version": "1.4.8", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz", + "resolved": false, "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==", "requires": { "ignore-walk": "^3.0.1", @@ -16778,7 +16824,7 @@ }, "npmlog": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "resolved": false, "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "requires": { "are-we-there-yet": "~1.1.2", @@ -16789,7 +16835,7 @@ }, "once": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "resolved": false, "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "requires": { "wrappy": "1" @@ -16797,12 +16843,12 @@ }, "opener": { "version": "1.5.1", - "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz", + "resolved": false, "integrity": "sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==" }, "osenv": { "version": "0.1.5", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "resolved": false, "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "requires": { "os-homedir": "^1.0.0", @@ -16811,7 +16857,7 @@ }, "package-json": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz", + "resolved": false, "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=", "requires": { "got": "^6.7.1", @@ -16822,22 +16868,22 @@ }, "path-is-inside": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", + "resolved": false, "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=" }, "promise-inflight": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", + "resolved": false, "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=" }, "punycode": { "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "resolved": false, "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" }, "query-string": { "version": "6.8.2", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.8.2.tgz", + "resolved": false, "integrity": "sha512-J3Qi8XZJXh93t2FiKyd/7Ec6GNifsjKXUsVFkSBj/kjLsDylWhnCz4NT1bkPcKotttPW+QbKGqqPH8OoI2pdqw==", "requires": { "decode-uri-component": "^0.2.0", @@ -16847,7 +16893,7 @@ }, "readable-stream": { "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "resolved": false, "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "requires": { "inherits": "^2.0.3", @@ -16866,7 +16912,7 @@ }, "registry-url": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz", + "resolved": false, "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", "requires": { "rc": "^1.0.1" @@ -16874,7 +16920,7 @@ }, "request": { "version": "2.88.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", + "resolved": false, "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", "requires": { "aws-sign2": "~0.7.0", @@ -16901,12 +16947,12 @@ }, "retry": { "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "resolved": false, "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=" }, "rimraf": { "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "resolved": false, "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "requires": { "glob": "^7.1.3" @@ -16914,17 +16960,17 @@ }, "safe-buffer": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "resolved": false, "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "semver": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "resolved": false, "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" }, "ssri": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", + "resolved": false, "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "requires": { "figgy-pudding": "^3.5.1" @@ -16932,12 +16978,12 @@ }, "strict-uri-encode": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz", + "resolved": false, "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY=" }, "string-width": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "resolved": false, "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "requires": { "is-fullwidth-code-point": "^2.0.0", @@ -16954,7 +17000,7 @@ }, "tar": { "version": "4.4.13", - "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz", + "resolved": false, "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==", "requires": { "chownr": "^1.1.1", @@ -16968,12 +17014,12 @@ }, "text-table": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "resolved": false, "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=" }, "tough-cookie": { "version": "2.4.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", + "resolved": false, "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", "requires": { "psl": "^1.1.24", @@ -16982,7 +17028,7 @@ }, "unique-filename": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", + "resolved": false, "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", "requires": { "unique-slug": "^2.0.0" @@ -16990,12 +17036,12 @@ }, "unpipe": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "resolved": false, "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" }, "update-notifier": { "version": "2.5.0", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz", + "resolved": false, "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==", "requires": { "boxen": "^1.2.1", @@ -17012,7 +17058,7 @@ }, "url-parse-lax": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", + "resolved": false, "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", "requires": { "prepend-http": "^1.0.1" @@ -17020,12 +17066,12 @@ }, "uuid": { "version": "3.3.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz", + "resolved": false, "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==" }, "validate-npm-package-license": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "resolved": false, "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "requires": { "spdx-correct": "^3.0.0", @@ -17034,7 +17080,7 @@ }, "which": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "resolved": false, "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "requires": { "isexe": "^2.0.0" @@ -17042,7 +17088,7 @@ }, "worker-farm": { "version": "1.7.0", - "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz", + "resolved": false, "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==", "requires": { "errno": "~0.1.7" @@ -17050,7 +17096,7 @@ }, "write-file-atomic": { "version": "2.4.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", + "resolved": false, "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", "requires": { "graceful-fs": "^4.1.11", @@ -17060,7 +17106,7 @@ }, "y18n": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "resolved": false, "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==" }, "yallist": { diff --git a/src/components/theme/View/BrowseView/BrowseTable.jsx b/src/components/theme/View/BrowseView/BrowseTable.jsx index 9d118036..ceffd005 100644 --- a/src/components/theme/View/BrowseView/BrowseTable.jsx +++ b/src/components/theme/View/BrowseView/BrowseTable.jsx @@ -1,6 +1,7 @@ import React, { useState } from 'react'; import { Grid } from 'semantic-ui-react'; import downSVG from '@plone/volto/icons/down-key.svg'; +import rightSVG from '@plone/volto/icons/right-key.svg'; import { Icon } from '@plone/volto/components'; import { tableItems } from './browseConstants'; @@ -9,6 +10,7 @@ const BrowseTable = () => { const [selectedItem, setSelectedItem] = useState() return ( +
@@ -32,13 +34,13 @@ const BrowseTable = () => {
{selectedItem && selectedItem.id === item.id && - +

Facility Contents

{item.facilityContents && @@ -54,12 +56,14 @@ const BrowseTable = () => {

{pollutants}

) } + 15 more...

Regulatory information

Operating since: {item.regulatoryInformation.operatingSince}

Last operating permit issued: {item.regulatoryInformation.lastPermit}

Last inspection: {item.regulatoryInformation.lastInspection}

+ Find out more @@ -70,6 +74,7 @@ const BrowseTable = () => { )} +
); } diff --git a/src/components/theme/View/BrowseView/BrowseView.jsx b/src/components/theme/View/BrowseView/BrowseView.jsx index 96c823bf..2f6dfa44 100644 --- a/src/components/theme/View/BrowseView/BrowseView.jsx +++ b/src/components/theme/View/BrowseView/BrowseView.jsx @@ -7,7 +7,7 @@ import React, { Component } from 'react'; import { compose } from 'redux'; import { injectIntl } from 'react-intl'; import { connect } from 'react-redux'; -import { Grid, Input} from 'semantic-ui-react'; +import { Grid, Input } from 'semantic-ui-react'; import BrowseTable from './BrowseTable'; import BrowseMap from './BrowseMap'; @@ -31,6 +31,12 @@ class BrowseView extends Component { return (
+
+
+

Industrial emissions

+

Diffuse emissions

+
+
diff --git a/theme/site/globals/site.overrides b/theme/site/globals/site.overrides index 06b21be1..d51bd4c3 100644 --- a/theme/site/globals/site.overrides +++ b/theme/site/globals/site.overrides @@ -1,8 +1,9 @@ /******************************* Global Overrides *******************************/ -.ui.vertical.padded.segment.footerWrapper > .ui.container { +.ui.vertical.padded.segment.footerWrapper>.ui.container { width: 80% !important; + @media only screen and (max-width: @largestTabletScreen) { margin: 0 2rem !important; width: auto !important; @@ -10,7 +11,7 @@ } .footerWrapper { - background-color: @primaryColor !important; + background-color: @primaryColor !important; .ui.container { padding-top: 2rem; @@ -18,8 +19,10 @@ .six.wide.column { flex: 2 0 auto; } + @media only screen and (min-width: 425px) and (max-width: @largestTabletScreen) { .row { + /*.three.wide.column, .six.wide.column { width: 100% !important; }*/ @@ -28,6 +31,7 @@ } } } + @media only screen and (max-width: 600px) { .row { flex-direction: column; @@ -54,13 +58,13 @@ } a { - color: white; + color: @white; text-decoration: underline; font-weight: bold; } p { - color: white; + color: @white; } } @@ -69,6 +73,7 @@ width: 80% !important; margin-top: 4rem !important; } + @media only screen and (max-width: @largestTabletScreen) { margin: 2rem !important; } @@ -107,7 +112,7 @@ padding-bottom: 2rem; &.tabs__item_active { - font-weight: 700; + font-weight: @extraBold; color: @linkColor; } } @@ -136,7 +141,7 @@ padding-bottom: 1rem; &.tabs__item_active { - font-weight: 700; + font-weight: @extraBold; color: @primaryColor; border-bottom: 1rem solid @primaryColor; } @@ -157,8 +162,8 @@ h2, h3 { font-size: 36px; color: @primaryColor; - font-weight: 700; - border-bottom: none!important; + font-weight: @extraBold; + border-bottom: none !important; &:before { display: none !important; @@ -167,7 +172,7 @@ h3 { p { color: @bodyColor; - font-weight: 300; + font-weight: @lightWeight; &.documentDescription { color: @fullBlack; @@ -188,9 +193,8 @@ p { .detailed-link-block-item-title { font-size: 28px; - font-weight: 500; margin-bottom: 1.5rem; - color: black; + color: @fullBlack; font-weight: bold; position: relative; } @@ -202,56 +206,58 @@ p { .detailed-link-block { button { max-width: 200px; - border-radius: 30px !important; + border-radius: @themeBorderRadius !important; line-height: 2 !important; text-align: center !important; border-width: 1px; - font-weight: 100; + font-weight: @lightWeight; } p { - color: #444; - font-size: 16px; + color: @black; + font-size: @contentFontSize; position: relative; } } .article-list-row { display: flex; - margin-bottom: 20px; - @media only screen and (max-width: 500px) { + margin-bottom: @extraMargin; + + @media only screen and (max-width: @500Breakpoint) { flex-wrap: wrap; - margin-bottom: 40px; + margin-bottom: @bigMargin; } .article-img { width: 200px; - border-radius: 20px; - margin-right: 25px; - @media only screen and (max-width: 500px) { + border-radius: @themeBorderRadius; + margin-right: @extraMargin; + + @media only screen and (max-width: @500Breakpoint) { width: 90%; } } .article-title { color: @linkColor; - font-weight: 500; - font-size: 20px; - margin-top: 10px; + font-weight: bold; + font-size: @titleFontSize; + margin-top: @normalMargin; margin-bottom: 0; } .article-date { font-size: 12px; - color: grey; - margin-bottom: 5px; - margin-top: 5px; + color: @bodyGrey; + margin-bottom: @smallMargin; + margin-top: @smallMargin; } .read-article { - border: 1px solid #33536B; + border: 1px solid @darkBlue; padding: 5px 30px; - border-radius: 20px; + border-radius: @themeBorderRadius; } .article-description { @@ -261,29 +267,29 @@ p { -webkit-line-clamp: 3; /* number of lines to show */ -webkit-box-orient: vertical; - margin-bottom: 20px; + margin-bottom: @extraMargin; } } .child-container { display: flex; justify-content: center; - border: 1px solid #33536B; - border-radius: 40px; - margin: 5px; + border: 1px solid @darkBlue; + border-radius: @themeBorderRadius; + margin: @smallMargin; .child-link { padding: 10px 25px; - color: #33536B; - font-size: 20px; - font-weight: 300 !important; + color: @darkBlue; + font-size: @titleFontSize; + font-weight: @lightWeight !important; text-decoration: none; } } .search-text { - margin: 10px !important; - font-size: 20px !important; + margin: @normalMargin !important; + font-size: @titleFontSize !important; } @@ -296,7 +302,7 @@ p { .footerWrapper { background-color: @primaryColor !important; - color: white; + color: @white; .unlist { margin: 0; @@ -306,7 +312,7 @@ p { } a { - color: white; + color: @white; text-decoration: underline; font-weight: bold; } @@ -314,40 +320,70 @@ p { .browse-area { + .header-bar { + background-color: @darkWhite; + height: 40px; + margin-bottom: @bigMargin; + display: flex; + align-items: center; + + .header-wrapper { + display: flex; + align-items: center; + width: 80%; + margin: auto; + } + + .bar-item { + font-size: @titleFontSize; + margin: 0 40px 0 0; + padding-bottom: 5px; + padding-top: 5px; + cursor: pointer; + } + + .selected { + color: @lightblue; + font-weight: bold; + border-bottom: solid; + } + } + + .browse-input { width: 50%; - margin-left: 20px; + margin-left: @extraMargin; height: 50px; - @media only screen and (max-width: 460px) { + @media only screen and (max-width: @500Breakpoint) { width: 80%; margin-left: 0; - margin-top: 20px; + margin-top: @extraMargin; } input { - background: #EDEDED !important; - border-radius: 30px !important; + background: @darkWhite !important; + border-radius: @themeBorderRadius !important; border: none !important; padding: 13.5px; - font-size: 16px; + font-size: @contentFontSize; } i { font-size: 30px; - color: #33536B; + color: @darkBlue; left: -15px !important; } } .view-button { - background: white; - border: 1px solid #333333; - border-radius: 30px; - margin-right: 20px; - padding: 10px 30px; - font-size: 13px; - color: #989898; + background: @white; + border: 1px solid @bodyGrey; + border-radius: @themeBorderRadius; + margin-right: @extraMargin; + padding: @buttonPadding; + font-size: @contentFontSize; + color: @lightGrey; cursor: pointer; outline: none; } @@ -355,12 +391,12 @@ p { .browse-text { margin: 0; align-self: center; - color: #B2B2B2 + color: @lightGrey; } .browse-button { - border-radius: 30px; - font-size: 15px; + border-radius: @themeBorderRadius; + font-size: @contentFontSize; font-weight: bold; cursor: pointer; border: none; @@ -368,34 +404,37 @@ p { } .advanced-red { - background-color: #D63D28; - color: white; + background-color: @darkOrange; + color: @white; height: 50px; - max-width: 300px; - padding: 10px 30px; + padding: @buttonPadding; + + @media only screen and (max-width: @500Breakpoint) { + width: 90%; + } } .red-selected { - background-color: #D63D28; - color: white; + background-color: @darkOrange; + color: @white; padding: 10px 15px; } .red { - background-color: white; - color: #D63D28; + background-color: @white; + color: @darkOrange; font-weight: normal; padding: 10px 15px; } .blue { - background-color: #33536B; - color: white; - padding: 10px 30px; + background-color: @darkBlue; + color: @white; + padding: @buttonPadding; - @media only screen and (max-width: 540px) { - width: 300px; - margin-top: 10px; + @media only screen and (max-width: @500Breakpoint) { + width: 90%; + margin-top: @normalMargin; height: 50px; } } @@ -405,10 +444,10 @@ p { display: flex; justify-content: space-between; - @media only screen and (max-width: 680px) { - width: 80%; + @media only screen and (max-width: 660px) { + width: 85%; flex-wrap: wrap; - margin-top: 30px; + margin-top: @extraMargin; justify-content: center; } } @@ -417,12 +456,12 @@ p { display: flex; justify-content: center; align-items: center; - margin-left: 15px; + margin-left: @mediumMargin; margin-right: 80px; - @media only screen and (max-width: 460px) { + @media only screen and (max-width: @500Breakpoint) { justify-content: space-between; - margin-bottom: 20px; + margin-bottom: @extraMargin; margin-left: 0; margin-right: 0; } @@ -439,20 +478,20 @@ p { top: 30px; right: 30px; padding: 10px; - background: white; + background: @white; border: none; - color: dodgerblue; + color: @blue; } .map-modal { padding: 15px 45px; - background-color: white; + background-color: @white; position: absolute; top: 20%; left: 50%; - border: 2px solid #33536B; + border: 2px solid @darkBlue; - @media only screen and (max-width: 1000px) { + @media only screen and (max-width: @computerBreakpoint) { left: 5%; } @@ -462,32 +501,32 @@ p { align-items: center; width: 400px; - @media only screen and (max-width: 540px) { + @media only screen and (max-width: @500Breakpoint) { width: 100%; } } .modal-title { - font-size: 20px; - margin-top: 15px; - margin-bottom: 15px; - color: #4296B2; - font-weight: 600; + font-size: @headlineFontSize; + margin-top: @mediumMargin; + margin-bottom: @mediumMargin; + color: @lightblue; + font-weight: @extraBold; } .modal-label { - font-size: 15px; - font-weight: 600; - margin-top: 15px; - margin-bottom: 5px; - color: #4296B2; + font-size: @titleFontSize; + font-weight: @extraBold; + margin-top: @mediumMargin; + margin-bottom: @smallMargin; + color: @lightblue; } } .search-map-menu { position: absolute; margin-bottom: 33px; - background: white; + background: @white; top: 0; left: 15%; height: 99.5%; @@ -495,52 +534,56 @@ p { padding: 10px 40px; .menu-title { - font-size: 20px; - margin-top: 15px; - margin-bottom: 15px; - color: #4296B2; - font-weight: 600; + font-size: @titleFontSize; + margin-top: @mediumMargin; + margin-bottom: @mediumMargin; + color: @lightblue; + font-weight: @extraBold; } .menu-label { - font-size: 15px; - font-weight: 600; - margin-top: 15px; - margin-bottom: 5px; - color: #4296B2; + font-size: @contentFontSize; + font-weight: @extraBold; + margin-top: @mediumMargin; + margin-bottom: @smallMargin; + color: @lightblue; } .quick-fact-card { - margin-top: 10px; - margin-bottom: 10px; + margin-top: @normalMargin; + margin-bottom: @normalMargin; } .menu-radio { - font-size: 14px; - font-weight: 200; + font-size: @contentFontSize; + font-weight: @lightWeight; min-height: 35px !important; label::after { - background-color: red !important; + background-color: @darkOrange !important; } } .card-content { - font-size: 13px; - font-weight: 200; - margin-top: 5px; - margin-bottom: 5px; + font-size: @contentFontSize; + font-weight: @lightWeight; + margin-top: @smallMargin; + margin-bottom: @smallMargin; } } + .browse-table { + margin-bottom: @bigMargin; + } + .table-head { display: flex; border-bottom: 1px solid grey; width: 65%; justify-content: space-between; - @media only screen and (max-width: 700px) { + @media only screen and (max-width: @computerBreakpoint) { width: 85%; } } @@ -550,64 +593,64 @@ p { width: 65%; justify-content: space-between; - @media only screen and (max-width: 700px) { + @media only screen and (max-width: @computerBreakpoint) { width: 85%; } } .table-title { - font-size: 15px; + font-size: @contentFontSize; font-weight: bold; - margin-right: 30px; + margin-right: @bigMargin; text-align: left; } .table-content { - font-size: 14px; - font-weight: 300; - margin-right: 30px; + font-size: @contentFontSize; + font-weight: @lightWeight; + margin-right: @bigMargin; text-align: left; } .dropdown-icon { - fill: red + fill: @darkOrange } .details-content { - font-size: 14px; + font-size: @contentFontSize; margin: 0; padding: 0; } .details-link { - font-size: 14px; + font-size: @contentFontSize; margin: 0; padding: 0; - color: #ED7669; - text-decoration: underline #ED7669; + color: @lighterOrange; + text-decoration: underline @lighterOrange; } .details-title { - font-size: 14px; + font-size: @contentFontSize; font-weight: bold; - @media only screen and (max-width: 1000px) { - margin-top: 10px; - margin-bottom: 5px; + @media only screen and (max-width: @computerBreakpoint) { + margin-top: @normalMargin; + margin-bottom: @smallMargin; } } .details-button { margin-top: 35px; - border-radius: 30px; - font-size: 15px; + border-radius: @themeBorderRadius; + font-size: @contentFontSize; font-weight: bold; cursor: pointer; border: none; outline: none; - background-color: #33536B; - color: white; + background-color: @darkBlue; + color: @white; padding: 15px 50px; flex-grow: unset !important; } diff --git a/theme/site/globals/site.variables b/theme/site/globals/site.variables index 03c5477b..3923de7d 100755 --- a/theme/site/globals/site.variables +++ b/theme/site/globals/site.variables @@ -14,13 +14,20 @@ /*------------------- Base Sizes --------------------*/ +@headlineFontSize: 24px; +@titleFontSize: 20px; +@contentFontSize: 15px; +@extraBold: 600; +@lightWeight: 200; /*------------------- Border Radius --------------------*/ +@themeBorderRadius: 30px; + /*------------------- Brand Colors @@ -61,6 +68,16 @@ Focused Input --------------------*/ +/*------------------- + Spacing +--------------------*/ +@smallMargin: 5px; +@normalMargin: 10px; +@mediumMargin: 15px; +@extraMargin: 20px; +@bigMargin: 30px; + +@buttonPadding: 10px 30px; /*------------------- Sizes @@ -131,6 +148,8 @@ @largeMonitorBreakpoint : 1200px; @widescreenMonitorBreakpoint : 1920px; +@500Breakpoint: 500px; + /*------------------- Site Colors --------------------*/ diff --git a/theme/themes/pastanaga/globals/site.overrides b/theme/themes/pastanaga/globals/site.overrides index 645ce8a9..a241b57e 100644 --- a/theme/themes/pastanaga/globals/site.overrides +++ b/theme/themes/pastanaga/globals/site.overrides @@ -3,321 +3,321 @@ *******************************/ -.footerWrapper { - background-color: @primaryColor !important; - color: white; - - .unlist { - margin: 0; - list-style-type: none; - text-decoration: underline; - font-weight: bold; - } - - a { - color: white; - text-decoration: underline; - font-weight: bold; - } -} - -.browse-area { - - .browse-input { - width: 50%; - margin-left: 20px; - height: 50px; - - @media only screen and (max-width: 460px) { - width: 80%; - margin-left: 0; - margin-top: 20px; - } - - input { - background: #EDEDED !important; - border-radius: 30px !important; - border: none !important; - padding: 13.5px; - font-size: 16px; - } - - i { - font-size: 30px; - color: #33536B; - left: -15px !important; - } - } - - .view-button { - background: white; - border: 1px solid #333333; - border-radius: 30px; - margin-right: 20px; - padding: 10px 30px; - font-size: 13px; - color: #989898; - cursor: pointer; - outline: none; - } - - .browse-text { - margin: 0; - align-self: center; - color: #B2B2B2 - } - - .browse-button { - border-radius: 30px; - font-size: 15px; - font-weight: bold; - cursor: pointer; - border: none; - outline: none; - } - - .advanced-red { - background-color: #D63D28; - color: white; - height: 50px; - max-width: 300px; - padding: 10px 30px; - } - - .red-selected { - background-color: #D63D28; - color: white; - padding: 10px 15px; - } - - .red { - background-color: white; - color: #D63D28; - font-weight: normal; - padding: 10px 15px; - } - - .blue { - background-color: #33536B; - color: white; - padding: 10px 30px; - - @media only screen and (max-width: 540px) { - width: 300px; - margin-top: 10px; - height: 50px; - } - } - - .spaced-row { - width: 50%; - display: flex; - justify-content: space-between; - - @media only screen and (max-width: 680px) { - width: 80%; - flex-wrap: wrap; - margin-top: 30px; - justify-content: center; - } - } - - .centered-selector-row { - display: flex; - justify-content: center; - align-items: center; - margin-left: 15px; - margin-right: 80px; - - @media only screen and (max-width: 460px) { - justify-content: space-between; - margin-bottom: 20px; - margin-left: 0; - margin-right: 0; - } - } - - .browse-content-area { - width: 100%; - position: relative; - margin-bottom: -33px; - } - - .map-modal-button { - position: absolute; - top: 30px; - right: 30px; - padding: 10px; - background: white; - border: none; - color: dodgerblue; - } - - .map-modal { - padding: 15px 45px; - background-color: white; - position: absolute; - top: 20%; - left: 50%; - border: 2px solid #33536B; - - @media only screen and (max-width: 1000px) { - left: 5%; - } - - .modal-header { - display: flex; - justify-content: space-between; - align-items: center; - width: 400px; - - @media only screen and (max-width: 540px) { - width: 100%; - } - } - - .modal-title { - font-size: 20px; - margin-top: 15px; - margin-bottom: 15px; - color: #4296B2; - font-weight: 600; - } - - .modal-label { - font-size: 15px; - font-weight: 600; - margin-top: 15px; - margin-bottom: 5px; - color: #4296B2; - } - } - - .search-map-menu { - position: absolute; - margin-bottom: 33px; - background: white; - top: 0; - left: 15%; - height: 99.5%; - width: 300px; - padding: 10px 40px; - - .menu-title { - font-size: 20px; - margin-top: 15px; - margin-bottom: 15px; - color: #4296B2; - font-weight: 600; - } - - .menu-label { - font-size: 15px; - font-weight: 600; - margin-top: 15px; - margin-bottom: 5px; - color: #4296B2; - } - - .quick-fact-card { - margin-top: 10px; - margin-bottom: 10px; - } - - .menu-radio { - font-size: 14px; - font-weight: 200; - min-height: 35px !important; - - label::after { - background-color: red !important; - } - } - - - .card-content { - font-size: 13px; - font-weight: 200; - margin-top: 5px; - margin-bottom: 5px; - } - } - - .table-head { - display: flex; - border-bottom: 1px solid grey; - width: 65%; - justify-content: space-between; - - @media only screen and (max-width: 700px) { - width: 85%; - } - } - - .table-row { - display: flex; - width: 65%; - justify-content: space-between; - - @media only screen and (max-width: 700px) { - width: 85%; - } - } - - .table-title { - font-size: 15px; - font-weight: bold; - margin-right: 30px; - text-align: left; - } - - .table-content { - font-size: 14px; - font-weight: 300; - margin-right: 30px; - text-align: left; - } - - .dropdown-icon { - fill: red - } - - .details-content { - font-size: 14px; - margin: 0; - padding: 0; - - } - - .details-link { - font-size: 14px; - margin: 0; - padding: 0; - color: #ED7669; - text-decoration: underline #ED7669; - } - - .details-title { - font-size: 14px; - font-weight: bold; - - @media only screen and (max-width: 1000px) { - margin-top: 10px; - margin-bottom: 5px; - } - } - - .details-button { - margin-top: 35px; - border-radius: 30px; - font-size: 15px; - font-weight: bold; - cursor: pointer; - border: none; - outline: none; - background-color: #33536B; - color: white; - padding: 15px 50px; - flex-grow: unset !important; - } -} \ No newline at end of file +// .footerWrapper { +// background-color: @primaryColor !important; +// color: white; + +// .unlist { +// margin: 0; +// list-style-type: none; +// text-decoration: underline; +// font-weight: bold; +// } + +// a { +// color: white; +// text-decoration: underline; +// font-weight: bold; +// } +// } + +// .browse-area { + +// .browse-input { +// width: 50%; +// margin-left: 20px; +// height: 50px; + +// @media only screen and (max-width: 460px) { +// width: 80%; +// margin-left: 0; +// margin-top: 20px; +// } + +// input { +// background: #EDEDED !important; +// border-radius: 30px !important; +// border: none !important; +// padding: 13.5px; +// font-size: 16px; +// } + +// i { +// font-size: 30px; +// color: #33536B; +// left: -15px !important; +// } +// } + +// .view-button { +// background: white; +// border: 1px solid #333333; +// border-radius: 30px; +// margin-right: 20px; +// padding: 10px 30px; +// font-size: 13px; +// color: #989898; +// cursor: pointer; +// outline: none; +// } + +// .browse-text { +// margin: 0; +// align-self: center; +// color: #B2B2B2 +// } + +// .browse-button { +// border-radius: 30px; +// font-size: 15px; +// font-weight: bold; +// cursor: pointer; +// border: none; +// outline: none; +// } + +// .advanced-red { +// background-color: #D63D28; +// color: white; +// height: 50px; +// max-width: 300px; +// padding: 10px 30px; +// } + +// .red-selected { +// background-color: #D63D28; +// color: white; +// padding: 10px 15px; +// } + +// .red { +// background-color: white; +// color: #D63D28; +// font-weight: normal; +// padding: 10px 15px; +// } + +// .blue { +// background-color: #33536B; +// color: white; +// padding: 10px 30px; + +// @media only screen and (max-width: 540px) { +// width: 300px; +// margin-top: 10px; +// height: 50px; +// } +// } + +// .spaced-row { +// width: 50%; +// display: flex; +// justify-content: space-between; + +// @media only screen and (max-width: 680px) { +// width: 80%; +// flex-wrap: wrap; +// margin-top: 30px; +// justify-content: center; +// } +// } + +// .centered-selector-row { +// display: flex; +// justify-content: center; +// align-items: center; +// margin-left: 15px; +// margin-right: 80px; + +// @media only screen and (max-width: 460px) { +// justify-content: space-between; +// margin-bottom: 20px; +// margin-left: 0; +// margin-right: 0; +// } +// } + +// .browse-content-area { +// width: 100%; +// position: relative; +// margin-bottom: -33px; +// } + +// .map-modal-button { +// position: absolute; +// top: 30px; +// right: 30px; +// padding: 10px; +// background: white; +// border: none; +// color: dodgerblue; +// } + +// .map-modal { +// padding: 15px 45px; +// background-color: white; +// position: absolute; +// top: 20%; +// left: 50%; +// border: 2px solid #33536B; + +// @media only screen and (max-width: 1000px) { +// left: 5%; +// } + +// .modal-header { +// display: flex; +// justify-content: space-between; +// align-items: center; +// width: 400px; + +// @media only screen and (max-width: 540px) { +// width: 100%; +// } +// } + +// .modal-title { +// font-size: 20px; +// margin-top: 15px; +// margin-bottom: 15px; +// color: #4296B2; +// font-weight: 600; +// } + +// .modal-label { +// font-size: 15px; +// font-weight: 600; +// margin-top: 15px; +// margin-bottom: 5px; +// color: #4296B2; +// } +// } + +// .search-map-menu { +// position: absolute; +// margin-bottom: 33px; +// background: white; +// top: 0; +// left: 15%; +// height: 99.5%; +// width: 300px; +// padding: 10px 40px; + +// .menu-title { +// font-size: 20px; +// margin-top: 15px; +// margin-bottom: 15px; +// color: #4296B2; +// font-weight: 600; +// } + +// .menu-label { +// font-size: 15px; +// font-weight: 600; +// margin-top: 15px; +// margin-bottom: 5px; +// color: #4296B2; +// } + +// .quick-fact-card { +// margin-top: 10px; +// margin-bottom: 10px; +// } + +// .menu-radio { +// font-size: 14px; +// font-weight: 200; +// min-height: 35px !important; + +// label::after { +// background-color: red !important; +// } +// } + + +// .card-content { +// font-size: 13px; +// font-weight: 200; +// margin-top: 5px; +// margin-bottom: 5px; +// } +// } + +// .table-head { +// display: flex; +// border-bottom: 1px solid grey; +// width: 65%; +// justify-content: space-between; + +// @media only screen and (max-width: 700px) { +// width: 85%; +// } +// } + +// .table-row { +// display: flex; +// width: 65%; +// justify-content: space-between; + +// @media only screen and (max-width: 700px) { +// width: 85%; +// } +// } + +// .table-title { +// font-size: 15px; +// font-weight: bold; +// margin-right: 30px; +// text-align: left; +// } + +// .table-content { +// font-size: 14px; +// font-weight: 300; +// margin-right: 30px; +// text-align: left; +// } + +// .dropdown-icon { +// fill: red +// } + +// .details-content { +// font-size: 14px; +// margin: 0; +// padding: 0; + +// } + +// .details-link { +// font-size: 14px; +// margin: 0; +// padding: 0; +// color: #ED7669; +// text-decoration: underline #ED7669; +// } + +// .details-title { +// font-size: 14px; +// font-weight: bold; + +// @media only screen and (max-width: 1000px) { +// margin-top: 10px; +// margin-bottom: 5px; +// } +// } + +// .details-button { +// margin-top: 35px; +// border-radius: 30px; +// font-size: 15px; +// font-weight: bold; +// cursor: pointer; +// border: none; +// outline: none; +// background-color: #33536B; +// color: white; +// padding: 15px 50px; +// flex-grow: unset !important; +// } +// } \ No newline at end of file