mozilla
/
foundation.mozilla.org
зеркало из https://github.com/MozillaFoundation/foundation.mozilla.org.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

prettier for css/scss (#2807) 

* prettier for css/scss
This commit is contained in:
Pomax 2019-03-14 11:11:35 -07:00 коммит произвёл GitHub
Родитель 52dfefd1b0
Коммит 9e6e52de44
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
38 изменённых файлов: 261 добавлений и 180 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
.stylelintrc
Просмотреть файл

@ -1,9 +1,7 @@
{ {
"extends": "stylelint-config-standard", "plugins": ["stylelint-prettier"],
"rules": { "rules": {
"at-rule-no-unknown": null, "prettier/prettier": true,
"font-family-no-missing-generic-family-keyword": null,
"no-descending-specificity": null,
"color-hex-length": "long" "color-hex-length": "long"
} }
} }

8
network-api/networkapi/wagtail_l10n_customization/static/css/language_toggles.css
Просмотреть файл

@ -1,5 +1,5 @@
form .l10n-hidden { form .l10n-hidden {
display: none; display: none;
} }
div.locale-picker { div.locale-picker {
@ -14,7 +14,7 @@ form > div.locale-picker {
wagtail's header has a 2em margin-bottom, wagtail's header has a 2em margin-bottom,
and so we correct that for the 1.5em and so we correct that for the 1.5em
margin-bottom used in the normal definition margin-bottom used in the normal definition
for the div.locale-picker, above */; for the div.locale-picker, above */
margin-top: calc(1.5em - 2em); margin-top: calc(1.5em - 2em);
margin-bottom: 1em; margin-bottom: 1em;
} }
@ -41,8 +41,8 @@ div.locale-picker ul.locales li.locale button.locale-toggle {
font-weight: 700; font-weight: 700;
font-size: 1.2em; font-size: 1.2em;
text-decoration: none; text-decoration: none;
color: #fff; color: #ffffff;
padding: .25em; padding: 0.25em;
max-height: 2em; max-height: 2em;
} }

49
network-api/networkapi/wagtailcustomization/static/wagtailadmin/css/layouts/404-additionals.css
Просмотреть файл

@ -1,39 +1,40 @@
.wagtail-logo-container__desktop { .wagtail-logo-container__desktop {
float: none!important; float: none !important;
width: auto!important; width: auto !important;
height: auto!important; height: auto !important;
} }
@media screen and (max-width: $breakpoint-desktop-small) { // 900px @media screen and (max-width: $breakpoint-desktop-small) {
.wagtail-logo-container__desktop { // 900px
display: none; .wagtail-logo-container__desktop {
} display: none;
}
} }
.page404__text-container { .page404__text-container {
float: none; float: none;
width: auto; width: auto;
height: auto; height: auto;
text-align: left; text-align: left;
font-size: 90%; font-size: 90%;
margin-left: 3rem; margin-left: 3rem;
} }
.page404__text-container .page404__header { .page404__text-container .page404__header {
text-transform: none; text-transform: none;
} }
.page404__text-container p { .page404__text-container p {
white-space: nowrap; white-space: nowrap;
} }
@media screen and (max-width: $breakpoint-mobile) {
// 800px
.page404__text-container {
width: 400px;
}
@media screen and (max-width: $breakpoint-mobile) { // 800px .page404__header {
.page404__text-container { font-size: 5em;
width: 400px; }
} }
.page404__header {
font-size: 5em;
}
}

55
package-lock.json сгенерированный
Просмотреть файл

@ -4920,7 +4920,7 @@
}, },
"events": { "events": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "http://registry.npmjs.org/events/-/events-3.0.0.tgz", "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
"integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==" "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA=="
}, },
"evp_bytestokey": { "evp_bytestokey": {
@ -5627,7 +5627,8 @@
}, },
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true "bundled": true,
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
@ -5645,11 +5646,13 @@
}, },
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true "bundled": true,
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
@ -5662,15 +5665,18 @@
}, },
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true "bundled": true,
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true "bundled": true,
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true "bundled": true,
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
@ -5773,7 +5779,8 @@
}, },
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true "bundled": true,
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
@ -5783,6 +5790,7 @@
"is-fullwidth-code-point": { "is-fullwidth-code-point": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
@ -5795,17 +5803,20 @@
"minimatch": { "minimatch": {
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
}, },
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true "bundled": true,
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
@ -5822,6 +5833,7 @@
"mkdirp": { "mkdirp": {
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
@ -5894,7 +5906,8 @@
}, },
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true "bundled": true,
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
@ -5904,6 +5917,7 @@
"once": { "once": {
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
@ -5979,7 +5993,8 @@
}, },
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true "bundled": true,
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
@ -6009,6 +6024,7 @@
"string-width": { "string-width": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
@ -6026,6 +6042,7 @@
"strip-ansi": { "strip-ansi": {
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
@ -6064,11 +6081,13 @@
}, },
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true "bundled": true,
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"bundled": true "bundled": true,
"optional": true
} }
} }
}, },
@ -11754,7 +11773,7 @@
}, },
"stream-browserify": { "stream-browserify": {
"version": "2.0.2", "version": "2.0.2",
"resolved": "http://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz", "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
"integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
"requires": { "requires": {
"inherits": "~2.0.1", "inherits": "~2.0.1",
@ -12040,7 +12059,7 @@
}, },
"globby": { "globby": {
"version": "9.0.0", "version": "9.0.0",
"resolved": "http://registry.npmjs.org/globby/-/globby-9.0.0.tgz", "resolved": "https://registry.npmjs.org/globby/-/globby-9.0.0.tgz",
"integrity": "sha512-q0qiO/p1w/yJ0hk8V9x1UXlgsXUxlGd0AHUOXZVXBO6aznDtpx7M8D1kBrCAItoPm+4l8r6ATXV1JpjY2SBQOw==", "integrity": "sha512-q0qiO/p1w/yJ0hk8V9x1UXlgsXUxlGd0AHUOXZVXBO6aznDtpx7M8D1kBrCAItoPm+4l8r6ATXV1JpjY2SBQOw==",
"requires": { "requires": {
"array-union": "^1.0.2", "array-union": "^1.0.2",
@ -12279,6 +12298,14 @@
"stylelint-config-recommended": "^2.1.0" "stylelint-config-recommended": "^2.1.0"
} }
}, },
"stylelint-prettier": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/stylelint-prettier/-/stylelint-prettier-1.0.6.tgz",
"integrity": "sha512-XKlTyJHJYiyXs9JXRMt2FQxMJoBSjz4I6+4+/R3o8/ePof19v9naC4d0zsMKUJ88by81+qHfqXBLfmAalu46cg==",
"requires": {
"prettier-linter-helpers": "^1.0.0"
}
},
"sugarss": { "sugarss": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz", "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz",

2
package.json
Просмотреть файл

@ -29,6 +29,7 @@
"test:procfile": "node test/test-procfile.js", "test:procfile": "node test/test-procfile.js",
"test:eslint": "eslint --config ./.eslintrc.json \"source/js/**/*.js\" \"source/js/**/*.jsx\" webpack.config.js", "test:eslint": "eslint --config ./.eslintrc.json \"source/js/**/*.js\" \"source/js/**/*.jsx\" webpack.config.js",
"test:scss": "stylelint \"source/sass/**/*.scss\" \"source/js/**/*.scss\" --syntax scss", "test:scss": "stylelint \"source/sass/**/*.scss\" \"source/js/**/*.scss\" --syntax scss",
"test:css": "stylelint \"network-api/networkapi/{,!(frontend)/**/}*.css\" --syntax scss",
"test": "run-s test:** build", "test": "run-s test:** build",
"watch:images": "chokidar \"source/images/**/*\" -c \"npm run build:images\"", "watch:images": "chokidar \"source/images/**/*\" -c \"npm run build:images\"",
"watch:js": "chokidar \"source/js/**/*.js\" \"source/js/**/*.jsx\" -c \"npm run build:js-uncompressed\"", "watch:js": "chokidar \"source/js/**/*.js\" \"source/js/**/*.jsx\" -c \"npm run build:js-uncompressed\"",
@ -76,6 +77,7 @@
"snyk": "^1.136.1", "snyk": "^1.136.1",
"stylelint": "^9.10.1", "stylelint": "^9.10.1",
"stylelint-config-standard": "^18.2.0", "stylelint-config-standard": "^18.2.0",
"stylelint-prettier": "^1.0.6",
"svgo": "^1.2.0", "svgo": "^1.2.0",
"webpack": "^4.29.6", "webpack": "^4.29.6",
"webpack-cli": "^3.2.3", "webpack-cli": "^3.2.3",

4
source/js/buyers-guide/components/creep-vote/creep-vote.scss
Просмотреть файл

@ -91,7 +91,9 @@ $btn-shadow-width: 3px;
width: 100%; width: 100%;
} }
input { display: none; } input {
display: none;
}
label:first-of-type span { label:first-of-type span {
border-radius: $radio-button-radius 0 0 $radio-button-radius; border-radius: $radio-button-radius 0 0 $radio-button-radius;

5
source/js/buyers-guide/components/creepometer/creepometer.scss
Просмотреть файл

@ -2,7 +2,8 @@
margin-top: 70px; margin-top: 70px;
.slider { .slider {
background: url("/_images/buyers-guide/gradient-bar.svg") no-repeat 0 center / contain; background: url("/_images/buyers-guide/gradient-bar.svg") no-repeat 0 center /
contain;
position: relative; position: relative;
height: 100px; height: 100px;
cursor: pointer; cursor: pointer;
@ -51,7 +52,7 @@
background: transparent; background: transparent;
&::after { &::after {
content: ' '; content: " ";
background: white; background: white;
border-radius: 20px; border-radius: 20px;
box-shadow: 2px 2px 3px grey; box-shadow: 2px 2px 3px grey;

11
source/js/buyers-guide/components/filter/filter.scss
Просмотреть файл

@ -146,7 +146,8 @@
margin: 10px; margin: 10px;
&.selected { &.selected {
box-shadow: 0 0 0 6px $option-color, 0 0 0 9px white, 0 0 0 10px $option-color; box-shadow: 0 0 0 6px $option-color, 0 0 0 9px white,
0 0 0 10px $option-color;
background: $option-color; background: $option-color;
} }
@ -157,7 +158,7 @@
box-shadow: 0 0 0 10px $option-color; box-shadow: 0 0 0 10px $option-color;
&::after { &::after {
content: ' '; content: " ";
display: block; display: block;
width: 22px; width: 22px;
height: 22px; height: 22px;
@ -181,16 +182,16 @@
background-size: 16px; background-size: 16px;
} }
&[data-label=Both] { &[data-label="Both"] {
text-indent: 0.7em; text-indent: 0.7em;
} }
&[data-label=Likely] { &[data-label="Likely"] {
background-image: url(/_images/buyers-guide/icon-thumb-up.svg); background-image: url(/_images/buyers-guide/icon-thumb-up.svg);
background-position: 12px 4px; background-position: 12px 4px;
} }
&[data-label='Not likely'] { &[data-label="Not likely"] {
background-image: url(/_images/buyers-guide/icon-thumb-down.svg); background-image: url(/_images/buyers-guide/icon-thumb-down.svg);
background-position: 12px 7px; background-position: 12px 7px;
} }

2
source/js/buyers-guide/components/likelyhood-chart/likelyhood-chart.scss
Просмотреть файл

@ -38,7 +38,7 @@
} }
th::before { th::before {
content: ''; content: "";
display: block; display: block;
height: 1em; height: 1em;
margin: 0 0.5em; margin: 0 0.5em;

2
source/js/buyers-guide/components/social-share/social-share.scss
Просмотреть файл

@ -19,7 +19,7 @@
flex-wrap: wrap; flex-wrap: wrap;
width: calc(50% - #{$margin-x}); width: calc(50% - #{$margin-x});
&:nth-child(2n+1) { &:nth-child(2n + 1) {
margin-right: $margin-x * 2; margin-right: $margin-x * 2;
} }
} }

11
source/js/components/join/join.scss
Просмотреть файл

@ -1,6 +1,9 @@
.join-us { .join-us {
background: background: linear-gradient(
linear-gradient(to right, rgba(61, 254, 253, 1) 0%, rgba(183, 212, 63, 1) 100%), to right,
rgba(61, 254, 253, 1) 0%,
rgba(183, 212, 63, 1) 100%
),
url(../_images/hero-image-crop@2x.jpg) center -60px / auto 666px no-repeat, url(../_images/hero-image-crop@2x.jpg) center -60px / auto 666px no-repeat,
url(../_images/bg-repeat-crop@2x.jpg) center -60px / 2px 666px repeat-x; url(../_images/bg-repeat-crop@2x.jpg) center -60px / 2px 666px repeat-x;
background-blend-mode: overlay, normal, normal; background-blend-mode: overlay, normal, normal;
@ -120,7 +123,9 @@
display: block; display: block;
} }
.join-heading { display: none; } .join-heading {
display: none;
}
@media (min-width: $bp-md) { @media (min-width: $bp-md) {
.join-btn { .join-btn {

4
source/js/components/multipage-nav-mobile/multipage-nav-mobile.scss
Просмотреть файл

@ -6,12 +6,12 @@
width: 100%; width: 100%;
border: 0; border: 0;
outline: 0; outline: 0;
padding: 0 0 5px; // so the 5px yellow underline will show on both mobile and desktop padding: 0 0 5px; // so the 5px yellow underline will show on both mobile and desktop
margin-bottom: -5px; // negative bottom margin to offet the bottom padding we are adding margin-bottom: -5px; // negative bottom margin to offet the bottom padding we are adding
.control { .control {
display: inline-block; display: inline-block;
background: url('../_images/chevron.svg') no-repeat; background: url("../_images/chevron.svg") no-repeat;
background-size: contain; background-size: contain;
background-position: center right; background-position: center right;
width: 15px; width: 15px;

10
source/js/components/people/people.scss
Просмотреть файл

@ -34,7 +34,7 @@
width: 12px; width: 12px;
height: 12px; height: 12px;
display: block; display: block;
content: ''; content: "";
margin-right: 5px; margin-right: 5px;
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
@ -43,13 +43,13 @@
.meta-block-item-role { .meta-block-item-role {
&::before { &::before {
background-image: url('/_images/glyphs/mozilla-icon.svg'); background-image: url("/_images/glyphs/mozilla-icon.svg");
} }
} }
.meta-block-item-location { .meta-block-item-location {
&::before { &::before {
background-image: url('/_images/glyphs/map-marker-icon.svg'); background-image: url("/_images/glyphs/map-marker-icon.svg");
} }
} }
} }
@ -66,14 +66,14 @@
} }
.issue-link:not(:last-child)::after { .issue-link:not(:last-child)::after {
content: ', '; content: ", ";
} }
.person-quote { .person-quote {
z-index: 1; z-index: 1;
&::before { &::before {
content: '\201C'; content: "\201C";
font-size: 15em; font-size: 15em;
color: $gray-05; color: $gray-05;
z-index: -1; z-index: -1;

2
source/js/components/petition/petition.scss
Просмотреть файл

@ -1,4 +1,4 @@
@import 'donation-modal.scss'; @import "donation-modal.scss";
#cta-anchor { #cta-anchor {
margin-top: -80px; margin-top: -80px;

4
source/js/donate-modal/donate-modal.scss
Просмотреть файл

@ -1,4 +1,4 @@
@import '../../../node_modules/bootstrap/scss/_variables'; @import "../../../node_modules/bootstrap/scss/_variables";
.donate-modal { .donate-modal {
position: fixed; position: fixed;
@ -54,7 +54,7 @@
&::before, &::before,
&::after { &::after {
position: absolute; position: absolute;
content: ' '; content: " ";
height: $height; height: $height;
width: 2px; width: 2px;
background-color: white; background-color: white;

2
source/sass/buttons.scss
Просмотреть файл

@ -24,7 +24,7 @@
background: $dark-yellow; background: $dark-yellow;
&::after { &::after {
content: ''; content: "";
position: absolute; position: absolute;
top: 0; top: 0;
bottom: -10px; bottom: -10px;

61
source/sass/buyers-guide/bg-main.scss
Просмотреть файл

@ -5,10 +5,10 @@ html {
// Bootstrap // Bootstrap
@import '../../../node_modules/mofo-bootstrap/dest/css/mofo-bootstrap'; @import "../../../node_modules/mofo-bootstrap/dest/css/mofo-bootstrap";
@import '../../../node_modules/mofo-bootstrap/src/scss/custom/_colors'; @import "../../../node_modules/mofo-bootstrap/src/scss/custom/_colors";
@import '../../../node_modules/bootstrap/scss/_variables'; @import "../../../node_modules/bootstrap/scss/_variables";
@import '../../../node_modules/bootstrap/scss/mixins'; @import "../../../node_modules/bootstrap/scss/mixins";
// Breakpoints (imported from Bootstrap) // Breakpoints (imported from Bootstrap)
@ -20,10 +20,10 @@ $bp-xl: #{map-get($grid-breakpoints, xl)}; // >= 1200px
//Site-wide //Site-wide
@import '../colors'; @import "../colors";
@import './colors'; // Buyer's Guide specific colors @import "./colors"; // Buyer's Guide specific colors
@import '../mixins'; @import "../mixins";
@import './mixins'; // Buyer's Guide specific mixins @import "./mixins"; // Buyer's Guide specific mixins
// includes // includes
@import "./includes/draft-product"; @import "./includes/draft-product";
@ -31,31 +31,31 @@ $bp-xl: #{map-get($grid-breakpoints, xl)}; // >= 1200px
// React Components // React Components
@import '../../js/buyers-guide/components/creepometer/creepometer'; @import "../../js/buyers-guide/components/creepometer/creepometer";
@import '../../js/buyers-guide/components/creep-vote/creep-vote'; @import "../../js/buyers-guide/components/creep-vote/creep-vote";
@import '../../js/buyers-guide/components/primary-nav/primary-nav'; @import "../../js/buyers-guide/components/primary-nav/primary-nav";
@import '../../js/buyers-guide/components/creepiness-chart/creepiness-chart'; @import "../../js/buyers-guide/components/creepiness-chart/creepiness-chart";
@import '../../js/buyers-guide/components/likelyhood-chart/likelyhood-chart'; @import "../../js/buyers-guide/components/likelyhood-chart/likelyhood-chart";
@import '../../js/buyers-guide/components/filter/filter'; @import "../../js/buyers-guide/components/filter/filter";
@import '../../js/buyers-guide/components/social-share/social-share'; @import "../../js/buyers-guide/components/social-share/social-share";
// Special react component // Special react component
@import '../../js/donate-modal/donate-modal'; @import "../../js/donate-modal/donate-modal";
// Non-React Components // Non-React Components
@import './components/future-non-react-component'; @import "./components/future-non-react-component";
@import '../components/nav'; @import "../components/nav";
@import '../components/multipage-nav'; @import "../components/multipage-nav";
// Misc // Misc
@import '../resets'; @import "../resets";
@import '../type'; @import "../type";
@import '../buttons'; @import "../buttons";
@import '../global'; @import "../global";
@import '../utilities'; @import "../utilities";
// Type overrides // Type overrides
@ -65,7 +65,7 @@ $bp-xl: #{map-get($grid-breakpoints, xl)}; // >= 1200px
// Header // Header
@import './components/header.scss'; @import "./components/header.scss";
// Utilities // Utilities
@ -82,7 +82,8 @@ img.thumb-border {
border: 16px solid #f4f4f4; border: 16px solid #f4f4f4;
} }
.adult-content { // products which contain adult content .adult-content {
// products which contain adult content
img.product-thumbnail { img.product-thumbnail {
filter: blur(15px); filter: blur(15px);
@ -96,10 +97,10 @@ img.thumb-border {
@import "./creep-face-emoji"; @import "./creep-face-emoji";
// View specific // View specific
@import './views/homepage'; @import "./views/homepage";
@import './views/product'; @import "./views/product";
@import './views/about'; @import "./views/about";
@import './views/category'; @import "./views/category";
// Force Buyer's Guide links to use the old blues until // Force Buyer's Guide links to use the old blues until
// we tackle this cleanup ticket https://github.com/mozilla/foundation.mozilla.org/issues/2665 // we tackle this cleanup ticket https://github.com/mozilla/foundation.mozilla.org/issues/2665

3
source/sass/buyers-guide/components/header.scss
Просмотреть файл

@ -42,7 +42,8 @@ $category-nav-border-bottom-thickness: 4px;
top: 0; top: 0;
left: 0; left: 0;
content: ""; content: "";
background: url('/_images/buyers-guide/icon-heart.svg') no-repeat center calc(50% + 2px) / contain; background: url("/_images/buyers-guide/icon-heart.svg") no-repeat center
calc(50% + 2px) / contain;
width: $icon-width; width: $icon-width;
height: 100%; height: 100%;
} }

4
source/sass/buyers-guide/includes/draft-product.scss
Просмотреть файл

@ -1,10 +1,10 @@
// product draft rules // product draft rules
.draft-product::before { .draft-product::before {
content: 'This is a draft.'; content: "This is a draft.";
color: #ffa7a7; color: #ffa7a7;
font-weight: bold; font-weight: bold;
font-size: 120%; font-size: 120%;
font-family: 'Zilla Slab'; font-family: "Zilla Slab";
z-index: 1; z-index: 1;
position: absolute; position: absolute;
top: 0; top: 0;

18
source/sass/buyers-guide/mixins.scss
Просмотреть файл

@ -1,4 +1,11 @@
@mixin seal-of-approval($offset-top, $offset-left, $width, $height, $width-desktop: null, $height-desktop: null) { @mixin seal-of-approval(
$offset-top,
$offset-left,
$width,
$height,
$width-desktop: null,
$height-desktop: null
) {
position: absolute; position: absolute;
top: $offset-top; top: $offset-top;
left: $offset-left; left: $offset-left;
@ -14,7 +21,14 @@
} }
} }
@mixin adult-content-badge($offset-top, $offset-right, $width, $height, $width-desktop: null, $height-desktop: null) { @mixin adult-content-badge(
$offset-top,
$offset-right,
$width,
$height,
$width-desktop: null,
$height-desktop: null
) {
position: absolute; position: absolute;
top: $offset-top; top: $offset-top;
right: $offset-right; right: $offset-right;

4
source/sass/buyers-guide/views/about.scss
Просмотреть файл

@ -34,7 +34,7 @@
a second click closes it. a second click closes it.
*/ */
#pni-about .criteria-accordion { #pni-about .criteria-accordion {
input[type=checkbox].accordion-helper { input[type="checkbox"].accordion-helper {
display: block; display: block;
height: 0; height: 0;
@ -90,7 +90,7 @@
} }
h2::after { h2::after {
content: ' '; content: " ";
display: block; display: block;
position: absolute; position: absolute;
right: 0; right: 0;

9
source/sass/buyers-guide/views/category.scss
Просмотреть файл

@ -11,7 +11,14 @@
} }
.adult-content-badge { .adult-content-badge {
@include adult-content-badge($padding-y, $padding-x, 33px, 28px, 55px, 46px); @include adult-content-badge(
$padding-y,
$padding-x,
33px,
28px,
55px,
46px
);
} }
.category-image-container { .category-image-container {

10
source/sass/buyers-guide/views/homepage.scss
Просмотреть файл

@ -1,6 +1,7 @@
#pni-home { #pni-home {
.page-header { .page-header {
background: url(/_images/buyers-guide/home-banner.jpg) center center / cover no-repeat; background: url(/_images/buyers-guide/home-banner.jpg) center center / cover
no-repeat;
height: 200px; height: 200px;
@media (min-width: $bp-md) { @media (min-width: $bp-md) {
@ -123,7 +124,12 @@
@media (min-width: $bp-xl) { @media (min-width: $bp-xl) {
// on extra large screen we want project-list-section's width to match // on extra large screen we want project-list-section's width to match
// Bootstrap's .container's width // Bootstrap's .container's width
width: calc(#{map-get($container-max-widths, xl)} - #{map-get($grid-gutter-widths, xl)}); width: calc(
#{map-get($container-max-widths, xl)} - #{map-get(
$grid-gutter-widths,
xl
)}
);
max-width: 100%; max-width: 100%;
margin: 0 auto; margin: 0 auto;
} }

7
source/sass/buyers-guide/views/product.scss
Просмотреть файл

@ -8,7 +8,7 @@ $product-detail-padding-x: (
position: relative; position: relative;
&.draft-product::before { &.draft-product::before {
content: 'This product is in draft and only visible to CMS-authorised users.'; content: "This product is in draft and only visible to CMS-authorised users.";
} }
.seal-of-approval { .seal-of-approval {
@ -211,7 +211,7 @@ $product-detail-padding-x: (
.dotted-section { .dotted-section {
&::before { &::before {
display: block; display: block;
content: ' '; /* :before and :after won't work without content... =( */ content: " "; /* :before and :after won't work without content... =( */
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
@ -313,7 +313,8 @@ $product-detail-padding-x: (
position: absolute; position: absolute;
left: 0; left: 0;
content: ""; content: "";
background: url('/_images/buyers-guide/icon-info-pink.svg') no-repeat 50% 50%/contain; background: url("/_images/buyers-guide/icon-info-pink.svg") no-repeat 50%
50% / contain;
width: 16px; width: 16px;
height: 100%; height: 100%;
} }

8
source/sass/components/multipage-nav.scss
Просмотреть файл

@ -32,18 +32,18 @@
} }
.multipage-login-restricted::after { .multipage-login-restricted::after {
content: '🙈'; content: "🙈";
} }
.multipage-groups-restricted::after { .multipage-groups-restricted::after {
content: '👥'; content: "👥";
} }
.multipage-password-restricted::after { .multipage-password-restricted::after {
content: '🔒'; content: "🔒";
} }
.multipage-draft::after { .multipage-draft::after {
content: '🐣'; content: "🐣";
} }
} }

2
source/sass/components/nav.scss
Просмотреть файл

@ -24,6 +24,6 @@
} }
@at-root .vertical-nav #{&} { @at-root .vertical-nav #{&} {
@include scaleText(17px, 17px*1.6); @include scaleText(17px, 17px * 1.6);
} }
} }

7
source/sass/components/primary-nav.scss
Просмотреть файл

@ -68,7 +68,12 @@
transition: border-color 0.25s ease; transition: border-color 0.25s ease;
@mixin padding-bottom($bp: sm) { @mixin padding-bottom($bp: sm) {
padding-bottom: calc(#{map-get($menu-container-padding, $bp)} + #{map-get($primary-nav-link-padding, $bp)} - #{$border-thickness} / 2); padding-bottom: calc(
#{map-get($menu-container-padding, $bp)} + #{map-get(
$primary-nav-link-padding,
$bp
)} - #{$border-thickness} / 2
);
} }
@media (min-width: $bp-sm) { @media (min-width: $bp-sm) {

4
source/sass/glyphs.scss
Просмотреть файл

@ -4,7 +4,7 @@
width: $width; width: $width;
height: $height; height: $height;
margin-right: 20px; margin-right: 20px;
background: url(../_images/glyphs/#{$id}.svg) no-repeat 0 0/contain; background: url(../_images/glyphs/#{$id}.svg) no-repeat 0 0 / contain;
@media screen and (min-width: $bp-lg) { @media screen and (min-width: $bp-lg) {
margin-right: 10px; margin-right: 10px;
@ -14,7 +14,7 @@
@mixin hoverGlyph($id) { @mixin hoverGlyph($id) {
&:hover::before, &:hover::before,
&:focus::before { &:focus::before {
background: url(../_images/glyphs/#{$id}.svg) no-repeat 0 0/contain; background: url(../_images/glyphs/#{$id}.svg) no-repeat 0 0 / contain;
} }
} }

86
source/sass/main.scss
Просмотреть файл

@ -1,9 +1,9 @@
// Bootstrap // Bootstrap
@import '../../node_modules/mofo-bootstrap/dest/css/mofo-bootstrap'; @import "../../node_modules/mofo-bootstrap/dest/css/mofo-bootstrap";
@import '../../node_modules/mofo-bootstrap/src/scss/custom/_colors'; @import "../../node_modules/mofo-bootstrap/src/scss/custom/_colors";
@import '../../node_modules/bootstrap/scss/_variables'; @import "../../node_modules/bootstrap/scss/_variables";
@import '../../node_modules/bootstrap/scss/mixins'; @import "../../node_modules/bootstrap/scss/mixins";
// Breakpoints (imported from Bootstrap) // Breakpoints (imported from Bootstrap)
@ -14,60 +14,60 @@ $bp-lg: #{map-get($grid-breakpoints, lg)}; // >= 992px
$bp-xl: #{map-get($grid-breakpoints, xl)}; // >= 1200px $bp-xl: #{map-get($grid-breakpoints, xl)}; // >= 1200px
//Site-wide //Site-wide
@import './glyphs'; @import "./glyphs";
@import './colors'; @import "./colors";
@import './mixins'; @import "./mixins";
// React Components // React Components
@import '../js/components/highlights/highlights'; @import "../js/components/highlights/highlights";
@import '../js/components/people/people'; @import "../js/components/people/people";
@import '../js/components/join/join'; @import "../js/components/join/join";
@import '../js/components/loading-indicator/loading-indicator'; @import "../js/components/loading-indicator/loading-indicator";
@import '../js/components/member-notice/member-notice'; @import "../js/components/member-notice/member-notice";
@import '../js/components/multipage-nav-mobile/multipage-nav-mobile'; @import "../js/components/multipage-nav-mobile/multipage-nav-mobile";
@import '../js/components/pulse-project-list/pulse-project-list'; @import "../js/components/pulse-project-list/pulse-project-list";
@import '../js/components/fellow-list/fellow-list'; @import "../js/components/fellow-list/fellow-list";
@import '../js/components/petition/petition'; @import "../js/components/petition/petition";
// Special react component // Special react component
@import '../js/donate-modal/donate-modal'; @import "../js/donate-modal/donate-modal";
// Non-React Components // Non-React Components
@import './components/hr-emphasis'; @import "./components/hr-emphasis";
@import './components/feature-quote'; @import "./components/feature-quote";
@import './components/nav'; @import "./components/nav";
@import './components/primary-nav'; @import "./components/primary-nav";
@import './components/multipage-nav'; @import "./components/multipage-nav";
@import './components/commitment'; @import "./components/commitment";
@import './components/card'; @import "./components/card";
@import './components/airtable-block'; @import "./components/airtable-block";
@import './components/img-txt-mini'; @import "./components/img-txt-mini";
// Misc // Misc
@import './resets'; @import "./resets";
@import './type'; @import "./type";
@import './buttons'; @import "./buttons";
@import './global'; @import "./global";
@import './utilities'; @import "./utilities";
@import './cms'; @import "./cms";
@import './share-progress'; @import "./share-progress";
@import './wagtail'; @import "./wagtail";
// View specific // View specific
@import './views/home'; @import "./views/home";
@import './views/programs'; @import "./views/programs";
@import './views/about'; @import "./views/about";
@import './views/contact'; @import "./views/contact";
@import './views/projects'; @import "./views/projects";
@import './views/initiatives'; @import "./views/initiatives";
@import './views/participate'; @import "./views/participate";
@import './views/fellowships/shared'; @import "./views/fellowships/shared";
@import './views/style-guide'; @import "./views/style-guide";
// Bootstrap or mofo-bootstrap overrides // Bootstrap or mofo-bootstrap overrides

7
source/sass/mixins.scss
Просмотреть файл

@ -1,4 +1,9 @@
@mixin scaleText($base-font-size, $base-line-height: null, $large-font-size: null, $large-line-height: null) { @mixin scaleText(
$base-font-size,
$base-line-height: null,
$large-font-size: null,
$large-line-height: null
) {
font-size: $base-font-size; font-size: $base-font-size;
@if ($base-line-height) { @if ($base-line-height) {

5
source/sass/type.scss
Просмотреть файл

@ -33,7 +33,8 @@ a {
color: $dark-blue; color: $dark-blue;
font-weight: 700; font-weight: 700;
@include hover-focus-active { // Bootstrap / mofo-style overrides @include hover-focus-active {
// Bootstrap / mofo-style overrides
color: $dark-blue; color: $dark-blue;
text-decoration: underline; text-decoration: underline;
} }
@ -43,7 +44,7 @@ a {
} }
} }
@mixin black-box-white-text($padding:0.1em) { @mixin black-box-white-text($padding: 0.1em) {
background: $black; background: $black;
color: $white; color: $white;
display: inline; display: inline;

2
source/sass/utilities.scss
Просмотреть файл

@ -1,4 +1,4 @@
@import '../../node_modules/bootstrap/scss/_variables'; @import "../../node_modules/bootstrap/scss/_variables";
// default for vertical margins ($spacer = 1rem = 16px) // default for vertical margins ($spacer = 1rem = 16px)
.my-default { .my-default {

3
source/sass/views/contact.scss
Просмотреть файл

@ -1,4 +1,5 @@
.hear-from-you-line-art { .hear-from-you-line-art {
background: url(../_images/line-art/love-to-hear-from-you.svg) no-repeat center 0; background: url(../_images/line-art/love-to-hear-from-you.svg) no-repeat
center 0;
min-height: 9rem; min-height: 9rem;
} }

10
source/sass/views/fellowships/people.scss
Просмотреть файл

@ -34,7 +34,7 @@
width: 12px; width: 12px;
height: 12px; height: 12px;
display: block; display: block;
content: ''; content: "";
margin-right: 5px; margin-right: 5px;
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
@ -43,13 +43,13 @@
.meta-block-item-role { .meta-block-item-role {
&::before { &::before {
background-image: url('/_images/glyphs/mozilla-icon.svg'); background-image: url("/_images/glyphs/mozilla-icon.svg");
} }
} }
.meta-block-item-location { .meta-block-item-location {
&::before { &::before {
background-image: url('/_images/glyphs/map-marker-icon.svg'); background-image: url("/_images/glyphs/map-marker-icon.svg");
} }
} }
} }
@ -66,14 +66,14 @@
} }
.issue-link:not(:last-child)::after { .issue-link:not(:last-child)::after {
content: ', '; content: ", ";
} }
.person-quote { .person-quote {
z-index: 1; z-index: 1;
&::before { &::before {
content: '\201C'; content: "\201C";
font-size: 15em; font-size: 15em;
color: $subtle-gray; color: $subtle-gray;
z-index: -1; z-index: -1;

6
source/sass/views/fellowships/shared.scss
Просмотреть файл

@ -63,11 +63,13 @@
} }
.hear-from-funder-line-art { .hear-from-funder-line-art {
background: url(../_images/fellowships/svg/funders-fellowship-optim.svg) no-repeat center 0; background: url(../_images/fellowships/svg/funders-fellowship-optim.svg)
no-repeat center 0;
min-height: 9rem; min-height: 9rem;
} }
.hear-from-host-org-line-art { .hear-from-host-org-line-art {
background: url(../_images/fellowships/svg/host-orgs-fellowship-optim.svg) no-repeat center 0; background: url(../_images/fellowships/svg/host-orgs-fellowship-optim.svg)
no-repeat center 0;
min-height: 9rem; min-height: 9rem;
} }

2
source/sass/wagtail.scss
Просмотреть файл

@ -83,4 +83,4 @@ body div.wagtail-draft-warning {
text-transform: uppercase; text-transform: uppercase;
} }
@import './wagtail/blocks'; @import "./wagtail/blocks";

2
source/sass/wagtail/blocks.scss
Просмотреть файл

@ -1,3 +1,3 @@
.cms { .cms {
@import './profiles'; @import "./profiles";
} }

4
source/sass/wagtail/profiles.scss
Просмотреть файл

@ -74,11 +74,11 @@
width: 12px; width: 12px;
height: 12px; height: 12px;
display: block; display: block;
content: ''; content: "";
margin-right: 5px; margin-right: 5px;
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
background-image: url('/_images/glyphs/map-marker-icon.svg'); background-image: url("/_images/glyphs/map-marker-icon.svg");
} }
} }
} }