@internetstiftelsen/styleguide 2.21.8 → 2.21.12

package/dist/atoms/textarea/rich-text.js

@@ -137,7 +137,7 @@ function createToolbar(el, editor) {
 function getHTML(editor) {
 	var html = editor.getHTML();
 
-	return html.replace(/<li><p>/g, '<li>').replace(/<\/p><\/li>/g, '</li>');
+	return html;
 }
 
 function setupTextArea(el) {
@@ -158,6 +158,7 @@ function setupTextArea(el) {
 		},
 		onUpdate: function onUpdate(props) {
 			var html = getHTML(props.editor);
+			console.log(html);
 			el.value = html;
 			onChange(html);
 		}

package/dist/molecules/modal/modal.js

@@ -218,7 +218,7 @@ function display() {
  * Dispatch the next modal in queue.
  */
 function dispatch() {
-	if (active || !queue.length) {
+	if (!modal || active || !queue.length) {
 		return;
 	}
 
@@ -298,6 +298,10 @@ function createModal() {
 	document.body.appendChild(modal);
 
 	modalClose.addEventListener('click', close);
+
+	setTimeout(function () {
+		dispatch();
+	}, 1);
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@internetstiftelsen/styleguide",
-	"version": "2.21.8",
+	"version": "2.21.12",
 	"main": "dist/components.js",
 	"ports": {
 		"fractal": "3000"

package/src/atoms/textarea/rich-text.js

@@ -131,9 +131,7 @@ function createToolbar(el, editor) {
 function getHTML(editor) {
 	const html = editor.getHTML();
 
-	return html
-		.replace(/<li><p>/g, '<li>')
-		.replace(/<\/p><\/li>/g, '</li>');
+	return html;
 }
 
 export function setupTextArea(el, onChange = () => {}) {
@@ -155,6 +153,7 @@ export function setupTextArea(el, onChange = () => {}) {
 		},
 		onUpdate(props) {
 			const html = getHTML(props.editor);
+			console.log(html);
 			el.value = html;
 			onChange(html);
 		},

package/src/molecules/modal/modal.js

@@ -195,7 +195,7 @@ function display() {
  * Dispatch the next modal in queue.
  */
 function dispatch() {
-	if (active || !queue.length) {
+	if (!modal || active || !queue.length) {
 		return;
 	}
 
@@ -286,6 +286,10 @@ function createModal() {
 	document.body.appendChild(modal);
 
 	modalClose.addEventListener('click', close);
+
+	setTimeout(() => {
+		dispatch();
+	}, 1);
 }
 
 /**

package/src/organisms/footer/_footer.scss

@@ -51,7 +51,7 @@ $footer-font-size: 18px; // To ensure all footers on all sites have the same fon
 		-moz-osx-font-smoothing: grayscale;
 
 		@include e(freetext) {
-			padding: rhythm(4) rhythm(3);
+			padding: rhythm(3) rhythm(3) rhythm(4) rhythm(3);
 			border-bottom: 1px solid $color-black;
 
 			@include bp-up(xl) {
@@ -89,9 +89,12 @@ $footer-font-size: 18px; // To ensure all footers on all sites have the same fon
 		}
 
 		@include e(contact) {
-			border-left: 1px solid $color-black;
 			font-size: 80%;
 
+			@include bp-up(lg) {
+				border-left: 1px solid $color-black;
+			}
+
 			@include e(address) {
 				font-size: inherit;
 
@@ -112,9 +115,25 @@ $footer-font-size: 18px; // To ensure all footers on all sites have the same fon
 
 			@include e(row-first) {
 				border-bottom: 1px solid $color-black;
+				overflow: hidden;
+
+				@include bp-up(lg) {
+					height: 70%;
+				}
+
+				@include bp-up(xl) {
+					height: 50%;
+				}
 			}
 
 			@include e(row-second) {
+				@include bp-up(lg) {
+					height: 30%;
+				}
+
+				@include bp-up(xl) {
+					height: 50%;
+				}
 			}
 		}
 
@@ -130,20 +149,20 @@ $footer-font-size: 18px; // To ensure all footers on all sites have the same fon
 			@include bp-up(xl) {
 				border-right: 1px solid $color-black;
 				border-bottom: 0;
-				padding: rhythm(3) rhythm(3) rhythm(3) rhythm(6);
+				padding: rhythm(4) rhythm(3) rhythm(3) rhythm(6);
 			}
 		}
 
 		@include e(address2) {
-			padding: rhythm(3) 0 rhythm(3) rhythm(3);
+			padding: rhythm(3);
 
 			@include bp-up(xl) {
 				padding-left: rhythm(6);
+				padding-top: rhythm(4);
 			}
 		}
 
 		@include e(ISO) {
-			border-right: 1px solid $color-black;
 			border-bottom: 1px solid $color-black;
 			padding: rhythm(3);
 			display: flex;
@@ -154,7 +173,7 @@ $footer-font-size: 18px; // To ensure all footers on all sites have the same fon
 			}
 
 			@include bp-up(xl) {
-				padding: rhythm(3) rhythm(3) rhythm(3) rhythm(6);
+				padding: rhythm(3) rhythm(3) rhythm(4) rhythm(6);
 			}
 		}
 
@@ -163,8 +182,13 @@ $footer-font-size: 18px; // To ensure all footers on all sites have the same fon
 			display: flex;
 			align-items: center;
 
+			@include bp-up(md) {
+				border-left: 1px solid $color-black;
+			}
+
 			@include bp-up(xl) {
 				padding-left: rhythm(6);
+				padding-bottom: rhythm(4);
 			}
 		}
 	}

package/src/organisms/footer/footer.config.js

@@ -4,8 +4,8 @@ module.exports = {
 	context: {
 		id: '',
 		footer_text: '<p class="o-footer__paragraph"><a href="https://internetstiftelsen.se">Internetstiftelsen</a> verkar för ett internet som bidrar positivt till människan och samhället. Vi är en oberoende organisation som säkerställer en stark och säker infrastruktur för internet i Sverige. Vårt mål är att alla ska våga och kunna använda internet. Vi finns i Sverige och ansvarar för den svenska toppdomänen .se och driften av toppdomänen .nu.</p>',
-		contact_1: '<ul class="u-list-clean o-footer__contact__address"><li class="o-footer__contact__address__li">Internetstiftelsen</li><li class="o-footer__contact__address__li">Hammarby Kaj 10D</li><li class="o-footer__contact__address__li">Box 92073</li><li class="o-footer__contact__address__li">120 07 Stockholm</li></ul>',
-		contact_2: '<ul class="u-list-clean o-footer__contact__address"><li class="o-footer__contact__address__li">E-post: <a class="o-footer__link" href="mailto:info@internetstiftelsen.se">info@internetstiftelsen.se</a></li><li class="o-footer__contact__address__li">Telefon: <a class="o-footer__link" href="tel:084523500">08-452 35 00</a></li><li class="o-footer__contact__address__li">Organisationsnummer: 802405-0190</li></ul>',
+		contact_1: '<ul class="u-list-clean o-footer__info__contact__address"><li class="o-footer__info__contact__address__li">Internetstiftelsen</li><li class="o-footer__info__contact__address__li">Hammarby Kaj 10D</li><li class="o-footer__info__contact__address__li">Box 92073</li><li class="o-footer__info__contact__address__li">120 07 Stockholm</li></ul>',
+		contact_2: '<ul class="u-list-clean o-footer__info__contact__address"><li class="o-footer__info__contact__address__li">E-post: <a class="o-footer__link" href="mailto:info@internetstiftelsen.se">info@internetstiftelsen.se</a></li><li class="o-footer__info__contact__address__li">Telefon: <a class="o-footer__link" href="tel:084523500">08-452 35 00</a></li><li class="o-footer__info__contact__address__li">Organisationsnummer: 802405-0190</li></ul>',
 		ISO_link: 'https://internetstiftelsen.se/docs/Certifikat_27001_UKAS_sv.pdf',
 		ISO_image: 'https://internetstiftelsen.se/app/themes/internetstiftelsen/images/ISO_27001_2013_black_TM.svg',
 		ISO_text: 'Certifierade enligt ISO/IEC<br>27001:2013',