@internetstiftelsen/styleguide 2.21.15 → 2.21.18

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

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

package/dist/focusTrap.js

@@ -7,17 +7,13 @@ exports.default = focusTrap;
 
 var _focusTrap = require('focus-trap');
 
-var _focusTrap2 = _interopRequireDefault(_focusTrap);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function getContainer(element) {
 	return document.getElementById(element.getAttribute('data-a11y-toggle'));
 }
 
 function focusTrap(container) {
 	if (container && container.getAttribute('data-focus-trap') !== 'false' && !container.focusTrap) {
-		container.focusTrap = (0, _focusTrap2.default)('#' + container.id, { clickOutsideDeactivates: true });
+		container.focusTrap = (0, _focusTrap.createFocusTrap)('#' + container.id, { clickOutsideDeactivates: true });
 		container.setAttribute('data-focus-trap', 'true');
 	}
 }

package/dist/organisms/mega-menu/mega-menu.js

@@ -2,10 +2,6 @@
 
 var _focusTrap = require('focus-trap');
 
-var _focusTrap2 = _interopRequireDefault(_focusTrap);
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * Collect the needed elements.
  */
@@ -19,7 +15,7 @@ var isIE11 = !!window.MSInputMethodContext && !!document.documentMode;
 var focusTrap = null;
 
 if (megaMenu) {
-	focusTrap = (0, _focusTrap2.default)(megaMenu);
+	focusTrap = (0, _focusTrap.createFocusTrap)(megaMenu);
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@internetstiftelsen/styleguide",
-	"version": "2.21.15",
+	"version": "2.21.18",
 	"main": "dist/components.js",
 	"ports": {
 		"fractal": "3000"
@@ -70,7 +70,7 @@
 		"@tiptap/extension-link": "^2.0.0-beta.25",
 		"@tiptap/starter-kit": "^2.0.0-beta.133",
 		"a11y-toggle": "^2.1.0",
-		"focus-trap": "^4.0.2",
+		"focus-trap": "^6.7.3",
 		"glider-js": "^1.7.7",
 		"lodash.template": "^4.5.0",
 		"lodash.throttle": "^4.1.1",

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

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

package/src/configurations/typography/typography.hbs

@@ -70,7 +70,7 @@
 		<div class="grid-18 grid-md-14">
 			<ul class="checklist">
 				<li>Lorem ipsum dolor sit amet</li>
-				<li>Sed nisl justo, <a href="#">pharetra non scelerisque</a></li>
+				<li>Sed nisl justo, pharetra non scelerisque</li>
 				<li> Vestibulum ullamcorper</li>
 				<li>
 					Nam vitae mauris blandit

package/src/focusTrap.js

@@ -1,4 +1,4 @@
-import createFocusTrap from 'focus-trap';
+import { createFocusTrap } from 'focus-trap';
 
 function getContainer(element) {
 	return document.getElementById(element.getAttribute('data-a11y-toggle'));

package/src/molecules/glider/_glider.scss

@@ -132,18 +132,21 @@
 					position: relative;
 
 					&::after {
-						content: '';
-						padding: rhythm(1);
+						content: 'Förstora bilden';
+						color: $color-snow;
+						padding: rhythm(1) rhythm(2) rhythm(1) rhythm(4);
 						display: block;
 						position: absolute;
 						top: 0;
 						left: 0;
-						border-radius: $border-radius;
-						width: $icon-size-large * 1.4;
+						border-top-left-radius: $border-radius;
+						border-bottom-right-radius: $border-radius;
+						width: auto;
+						line-height: 1;
 						height: $icon-size-large * 1.4;
 						background-color: rgba($color-cyberspace, 0.8);
 						background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' id='icon-search' viewbox='0 0 32 32' width='32' height='32' fill='%23ffffff'%3E%3Cpath d='M24,21.8l8,8L29.9,32l-8-8c-5.9,4.6-14.3,3.6-19-2.2S-0.7,7.6,5.1,2.9S19.3-0.7,24,5.1C27.9,10,27.9,16.9,24,21.8L24,21.8z M13.4,23.9c5.8,0,10.5-4.7,10.5-10.5S19.2,3,13.4,3S3,7.7,3,13.4S7.7,23.9,13.4,23.9z'/%3E%3C/svg%3E");
-						background-position: center center;
+						background-position: rhythm(1) center;
 						background-size: $icon-size-medium $icon-size-medium;
 						background-repeat: no-repeat;
 
@@ -181,9 +184,13 @@
 						}
 
 						figcaption {
+							max-width: rem(612px);
+							text-align: center;
 							color: $color-snow;
-							padding-left: rhythm(1);
-							padding-right: rhythm(1);
+							padding-left: rhythm(2);
+							padding-right: rhythm(2);
+							margin-bottom: 0 !important;
+							padding-bottom: 0 !important;
 						}
 					}
 				}

package/src/organisms/mega-menu/mega-menu.js

@@ -1,4 +1,4 @@
-import createFocusTrap from 'focus-trap';
+import { createFocusTrap } from 'focus-trap';
 /**
  * Collect the needed elements.
  */