diff --git a/.stylelintrc b/.stylelintrc new file mode 100644 index 0000000000000000000000000000000000000000..af74ffac3b23667346f76b0d548160dad800fc1a --- /dev/null +++ b/.stylelintrc @@ -0,0 +1,7 @@ +{ + "extends": + "stylelint-config-standard" + , + "rules": { + } +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index f4e7f0cad87ea439ad78a0c229e6e655be98b350..d9cac1599d5f58bebfa5815ec2189764a453a001 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "webapp", - "version": "2.1.0", + "version": "2.1.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -10131,6 +10131,21 @@ "schema-utils": "^1.0.0" } }, + "stylelint-config-recommended": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-2.2.0.tgz", + "integrity": "sha512-bZ+d4RiNEfmoR74KZtCKmsABdBJr4iXRiCso+6LtMJPw5rd/KnxUWTxht7TbafrTJK1YRjNgnN0iVZaJfc3xJA==", + "dev": true + }, + "stylelint-config-standard": { + "version": "18.3.0", + "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-18.3.0.tgz", + "integrity": "sha512-Tdc/TFeddjjy64LvjPau9SsfVRexmTFqUhnMBrzz07J4p2dVQtmpncRF/o8yZn8ugA3Ut43E6o1GtjX80TFytw==", + "dev": true, + "requires": { + "stylelint-config-recommended": "^2.2.0" + } + }, "stylus": { "version": "0.54.5", "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz", diff --git a/package.json b/package.json index 070d935e75fca25dbc57ccca756d09cb9e009a1d..67390b6ce24de61c6500c4ae38f18c61ebac5553 100644 --- a/package.json +++ b/package.json @@ -76,6 +76,8 @@ "protractor": "^5.4.1", "rxjs-tslint": "^0.1.6", "sass-recursive-map-merge": "^1.0.1", + "stylelint-config-recommended": "^2.2.0", + "stylelint-config-standard": "^18.3.0", "ts-node": "~4.1.0", "tslint": "^5.12.1", "tslint-config-airbnb": "^5.11.1", diff --git a/src/scss/ghost-style.scss b/src/scss/ghost-style.scss index 8c920510d385976a623b623acd69468786d86a16..3b556c427fca0f61a2696a518a0a63849baf55ba 100644 --- a/src/scss/ghost-style.scss +++ b/src/scss/ghost-style.scss @@ -47,7 +47,7 @@ margin: 0; li::before { - font-family: "Open sans"; + font-family: "Open sans", sans-serif; content: "• "; color: $tomato-color; font-size: 1.25rem; @@ -56,7 +56,7 @@ li { padding-left: 1em; - text-indent: -.7em; + text-indent: -0.7em; } // Set iframe height and width if not already defined in the inline style diff --git a/src/scss/init_bulma.scss b/src/scss/init_bulma.scss index 26c6c2850375c18d24737ab987e3d5c4ed8bec88..4c104f89cf448e33bf45566af84985d78fe58db8 100644 --- a/src/scss/init_bulma.scss +++ b/src/scss/init_bulma.scss @@ -37,4 +37,4 @@ $input-color: $brand-color; @import "../../node_modules/bulma/sass/elements/_all"; @import "../../node_modules/bulma/sass/components/_all"; @import "../../node_modules/bulma/sass/grid/_all"; -@import "../../node_modules/bulma/sass/layout/_all"; \ No newline at end of file +@import "../../node_modules/bulma/sass/layout/_all"; diff --git a/src/scss/variables.scss b/src/scss/variables.scss index 69624acbe9b7deee927de144e1e8a46a3e50abd4..02d97ad72fa5d6174ac95b2eb921b51ee9c0eb1a 100644 --- a/src/scss/variables.scss +++ b/src/scss/variables.scss @@ -1,13 +1,12 @@ - // COLORS -$tomato-color: #F72F2F; // Tomato +$tomato-color: #f72f2f; // Tomato $brand-color: #333744; $grey-dark-color: #515151; $grey-light-color: #818080; -$grey-background-color: #F2F2F2; -$grey-super-light-color: #B4B4B4; -$link-color: #1D92FF; +$grey-background-color: #f2f2f2; +$grey-super-light-color: #b4b4b4; +$link-color: #1d92ff; // Add a serif family $family-sans-serif: 'Titillium Web', sans-serif; @@ -40,4 +39,4 @@ $background-link-hover-color: #191c27; $header-bar-height: 70px; // Container -$container-mobile-width: 320px; \ No newline at end of file +$container-mobile-width: 320px; diff --git a/src/styles.scss b/src/styles.scss index 48072570bca534c834f4724ea3b9e3ef7f93a5fd..2d13bd639b818d51d451ba18defb413ae68c6e6b 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -2,14 +2,11 @@ @import '../node_modules/mapbox-gl/dist/mapbox-gl.css'; @import '~scss/init_bulma.scss'; - @import '../node_modules/bulma-slider/dist/css/bulma-slider.sass'; @import '../node_modules/bulma-checkradio/dist/css/bulma-checkradio.sass'; @import '../node_modules/bulma-tooltip/dist/css/bulma-tooltip.sass'; - @import '../node_modules/hamburgers/_sass/hamburgers/hamburgers.scss'; - html, body { height: 100%; @@ -66,15 +63,6 @@ h5, margin-bottom: $size-4; } -.Apploader .logo { - color: white; - - span { - color: $tomato-color; - font-size: unset; - } -} - // Hamburger .hamburger-inner::before { width: 15px; @@ -86,7 +74,6 @@ h5, } } - .navbar { font-size: $size-6; } @@ -137,7 +124,7 @@ a:not(.button).link-2 { } a:not(.button).link-without-decoration, -.dropdown a { +.dropdown a { /* stylelint-disable-line */ color: $brand-color; text-decoration: none; @@ -146,7 +133,6 @@ a:not(.button).link-without-decoration, } } - .active-link { color: $tomato-color; } @@ -191,44 +177,6 @@ a:not(.button).link-without-decoration, } } -.categories-icons { - &.active { - rect { - fill: orange; - } - - path { - fill: orange; - } - - .cls-2 { - fill: orange; - stroke-width: 0.5px !important; - } - } - - // stroke-width: 1px !important; - .cls-1 { - stroke-width: 0.5px !important; - fill: none; - // stroke:orange; - } - - svg { - overflow: visible; - width: 1.25rem; - height: 1.25rem; - - path { - fill: none; - } - - rect { - fill: none; - } - } -} - .btn-blue-text { background: transparent; border-radius: 2px;