Skip to content
Snippets Groups Projects
Commit 685d28cd authored by jan.bednarik's avatar jan.bednarik
Browse files

Merge branch 'feat/updated-versions-and-image-size-safelist' into 'master'

Update versions & fix vulnerabilities, whitelist Maják image sizing classes

See merge request !6
parents daab568d 85b2edde
No related branches found
No related tags found
1 merge request!6Update versions & fix vulnerabilities, whitelist Maják image sizing classes
Pipeline #14774 passed
Showing
with 5126 additions and 8559 deletions
Source diff could not be displayed: it is too large. Options to address this: view the blob.
{ {
"name": "edition-node-gulp", "name": "edition-node-gulp",
"description": "The gulp wrapper around patternlab-node core, providing tasks to interact with the core library and move supporting frontend assets.", "description": "The gulp wrapper around patternlab-node core, providing tasks to interact with the core library and move supporting frontend assets.",
"version": "2.15.0", "version": "2.16.0",
"dependencies": { "dependencies": {
"@fullcalendar/core": "^6.1.5", "@fullcalendar/core": "^6.1.5",
"@fullcalendar/daygrid": "^6.1.5", "@fullcalendar/daygrid": "^6.1.5",
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
"color": "^3.1.2", "color": "^3.1.2",
"gulp-add-src": "^1.0.0", "gulp-add-src": "^1.0.0",
"gulp-concat": "^2.6.1", "gulp-concat": "^2.6.1",
"gulp-postcss": "^8.0.0", "gulp-postcss": "^9.0.0",
"gulp-rename": "^2.0.0", "gulp-rename": "^2.0.0",
"lodash": "^4.17.15", "lodash": "^4.17.15",
"postcss-assets": "^5.0.0", "postcss-assets": "^5.0.0",
...@@ -76,8 +76,8 @@ ...@@ -76,8 +76,8 @@
"rollup-plugin-terser": "^6.1.0", "rollup-plugin-terser": "^6.1.0",
"rollup-plugin-vue": "^5.1.9", "rollup-plugin-vue": "^5.1.9",
"tailwind-css-variables": "^2.0.3", "tailwind-css-variables": "^2.0.3",
"tailwindcss": "^1.4.6", "tailwindcss": "^3.3.3",
"tailwindcss-typography": "^3.1.0", "@tailwindcss/typography": "^0.5.10",
"vinyl-buffer": "^1.0.1", "vinyl-buffer": "^1.0.1",
"vinyl-source-stream": "^2.0.0", "vinyl-source-stream": "^2.0.0",
"vue-template-compiler": "^2.7.14" "vue-template-compiler": "^2.7.14"
......
...@@ -4,27 +4,27 @@ ...@@ -4,27 +4,27 @@
"title": "Nullizzle shizznit velizzle, hizzle, suscipit own yo', gravida vizzle, arcu.", "title": "Nullizzle shizznit velizzle, hizzle, suscipit own yo', gravida vizzle, arcu.",
"img": { "img": {
"avatar": { "avatar": {
"src": "http://placeimg.com/100/100/people", "src": "https://picsum.photos/100",
"alt": "Avatar" "alt": "Avatar"
}, },
"square": { "square": {
"src": "http://placeimg.com/300/300/nature", "src": "https://picsum.photos/300",
"alt": "Square" "alt": "Square"
}, },
"rectangle": { "rectangle": {
"src": "http://placeimg.com/400/300/tech", "src": "https://picsum.photos/400/300",
"alt": "Rectangle" "alt": "Rectangle"
}, },
"landscape-4x3": { "landscape-4x3": {
"src": "http://placeimg.com/400/300/tech", "src": "https://picsum.photos/400/300",
"alt": "4x3 Image" "alt": "4x3 Image"
}, },
"landscape-16x9": { "landscape-16x9": {
"src": "http://placeimg.com/640/360/tech", "src": "https://picsum.photos/640/360",
"alt": "16x9 Image" "alt": "16x9 Image"
}, },
"landscape-16x9-fullhd": { "landscape-16x9-fullhd": {
"src": "https://loremflickr.com/1920/1080", "src": "https://picsum.photos/1920/1080",
"alt": "16x9 Image Full HD" "alt": "16x9 Image Full HD"
} }
}, },
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
} }
} }
@responsive {
.avatar--2xs { .avatar--2xs {
@apply w-8; @apply w-8;
} }
...@@ -31,7 +30,6 @@ ...@@ -31,7 +30,6 @@
.avatar--3xl { .avatar--3xl {
@apply w-56; @apply w-56;
} }
}
.avatar--bordered { .avatar--bordered {
img { img {
......
@responsive {
.card { .card {
@apply elevation-2; @apply elevation-2;
} }
...@@ -6,7 +5,6 @@ ...@@ -6,7 +5,6 @@
.card__body { .card__body {
@apply p-8; @apply p-8;
} }
}
.card--hoveractive { .card--hoveractive {
@apply transition duration-200; @apply transition duration-200;
......
...@@ -9,11 +9,7 @@ ...@@ -9,11 +9,7 @@
&.contact-line--responsive { &.contact-line--responsive {
i { i {
@apply hidden; @apply hidden lg:inline-block;
@screen lg {
@apply inline-block;
}
} }
} }
} }
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
} }
@responsive {
/* Removes default container padding from the element. */ /* Removes default container padding from the element. */
/* @note: needs to be kept in sync with tailwind configuration */ /* @note: needs to be kept in sync with tailwind configuration */
.container-padding--zero { .container-padding--zero {
...@@ -27,4 +26,3 @@ ...@@ -27,4 +26,3 @@
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
} }
}
.text-input-addon { .text-input-addon {
@apply flex items-center bg-grey-125 text-grey-300 font-normal py-3 px-4 text-lg whitespace-no-wrap border border-grey-200 transition duration-200; @apply flex items-center bg-grey-125 text-grey-300 font-normal py-3 px-4 text-lg whitespace-nowrap border border-grey-200 transition duration-200;
} }
.text-input { .text-input {
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
} }
@responsive {
.head-alt-xl, .head-alt-xl,
.content-block .head-alt-xl { .content-block .head-alt-xl {
@apply text-7xl font-alt font-normal; @apply text-7xl font-alt font-normal;
...@@ -133,5 +132,3 @@ ...@@ -133,5 +132,3 @@
.content-block .head-allcaps-heavy-4xs { .content-block .head-allcaps-heavy-4xs {
@apply text-sm font-condensed font-bold uppercase leading-tight; @apply text-sm font-condensed font-bold uppercase leading-tight;
} }
}
hr:not(.hr--unstyled) { hr:not(.hr--unstyled) {
@apply border-t border-grey-100 my-4; @apply border-t border-grey-100 my-4 md:my-8;
@screen md {
@apply my-8;
}
&.hr--big { &.hr--big {
@apply my-8; @apply my-8 md:my-16;
@screen md {
@apply my-16;
}
} }
&.hr--condensed { &.hr--condensed {
@apply my-2; @apply my-2 md:my-4;
@screen md {
@apply my-4;
}
} }
} }
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
.unordered-list--dense, .unordered-list--dense,
.content-block ul { .content-block ul {
@apply row-gap-0; @apply gap-y-0;
} }
.unordered-list--linked, .unordered-list--linked,
......
.super-button { .super-button {
@apply inline-flex font-alt text-4xl py-8 px-4 transition duration-200; @apply inline-flex font-alt text-4xl py-8 px-4 transition duration-200 md:px-6;
&:hover { &:hover {
@apply no-underline; @apply no-underline;
} }
@screen md {
@apply px-6;
}
} }
.super-button__body { .super-button__body {
......
@responsive {
.text-shadow-xs { .text-shadow-xs {
text-shadow: 1px 1px rgba(0, 0, 0, 0.2); text-shadow: 1px 1px rgba(0, 0, 0, 0.2);
} }
...@@ -14,4 +13,3 @@ ...@@ -14,4 +13,3 @@
.text-shadow-lg { .text-shadow-lg {
text-shadow: 1px 1px .5rem rgba(0, 0, 0, 0.8); text-shadow: 1px 1px .5rem rgba(0, 0, 0, 0.8);
} }
}
...@@ -25,18 +25,11 @@ ...@@ -25,18 +25,11 @@
} }
.article-card-sharing { .article-card-sharing {
@apply mb-4 ; @apply mb-4 lg:transition lg:duration-200 lg:opacity-0 lg:pointer-events-auto;
@screen lg {
/* Turn on pointer events to make sharer clickable */
@apply transition duration-200 opacity-0 pointer-events-auto;
}
} }
.article-card:hover .article-card-sharing { .article-card:hover .article-card-sharing {
@screen lg { @apply lg:opacity-100;
@apply opacity-100;
}
} }
.article-card-meta { .article-card-meta {
......
.banner { .banner {
@apply px-4 py-8 flex flex-wrap flex-col; @apply px-4 py-8 flex flex-wrap flex-col lg:px-8;
@screen lg {
@apply px-8;
}
} }
.banner__icon { .banner__icon {
......
...@@ -14,11 +14,7 @@ ...@@ -14,11 +14,7 @@
@apply h-full border-r border-grey-125 p-2 flex justify-center items-start; @apply h-full border-r border-grey-125 p-2 flex justify-center items-start;
&:first-child { &:first-child {
@apply border-l; @apply border-l xl:border-l-0;
@screen xl {
@apply border-l-0;
}
} }
&.calendar-table-row__col--norborder { &.calendar-table-row__col--norborder {
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
@apply text-sm bg-grey-50 flex border-t border-b border-grey-125 leading-10; @apply text-sm bg-grey-50 flex border-t border-b border-grey-125 leading-10;
> div { > div {
@apply px-4 flex items-center; @apply px-4 flex items-center md:justify-center;
&:not(:first-child) { &:not(:first-child) {
@apply border-l border-grey-125; @apply border-l border-grey-125;
...@@ -48,8 +48,6 @@ ...@@ -48,8 +48,6 @@
} }
@screen md { @screen md {
@apply justify-center;
&:first-child { &:first-child {
@apply w-auto text-left; @apply w-auto text-left;
} }
...@@ -66,12 +64,9 @@ ...@@ -66,12 +64,9 @@
} }
.candidate-card__social { .candidate-card__social {
@apply p-4; @apply p-4 md:text-center;
grid-area: social;
@screen md { grid-area: social;
@apply text-center;
}
} }
@screen sm { @screen sm {
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
} }
.candidate-table-row__affiliation { .candidate-table-row__affiliation {
@apply flex items-center justify-start whitespace-no-wrap py-1 pl-6 pr-4; @apply flex items-center justify-start whitespace-nowrap py-1 pl-6 pr-4;
grid-area: affiliation; grid-area: affiliation;
} }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
py-2 px-3 py-2 px-3
text-xs text-xs
font-bold leading-none tracking-normal font-bold leading-none tracking-normal
whitespace-no-wrap; whitespace-nowrap;
} }
.chip--condensed { .chip--condensed {
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
} }
@responsive {
.form-field__wrapper--row-items { .form-field__wrapper--row-items {
@apply flex-row; @apply flex-row;
...@@ -42,7 +41,6 @@ ...@@ -42,7 +41,6 @@
@apply ml-0 mt-4; @apply ml-0 mt-4;
} }
} }
}
.form-field__error, .form-field__error,
.form-field__help-text { .form-field__help-text {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment