Merge branch 'main' of github.com:metmuseum/marble into security-1-24-22

metmuseum · Jan 24, 2022 · 1f98ffc · 1f98ffc
2 parents f59d7f4 + 1080432
commit 1f98ffc
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/dist/marble.css b/dist/marble.css
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@metmuseum/marble",
-	"version": "0.13.4",
+	"version": "0.13.6",
 	"description": "The Design System of The Metropolitan Museum Of Art",
 	"main": "./src/index.mjs",
 	"style": "./dist/marble.css",

diff --git a/src/base/mixins/_mixins.scss b/src/base/mixins/_mixins.scss
@@ -3,10 +3,12 @@
 @import "typography";
 @import "buttons";
 
+/* stylelint-disable */
 @mixin line-clamp($lines) {
 	-webkit-box-orient: vertical;
-	display: box;
+	display: -webkit-box;
 	-webkit-line-clamp: $lines;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
+/* stylelint-enable */
diff --git a/src/components/audio-player/audio-player.stories.js b/src/components/audio-player/audio-player.stories.js
@@ -116,7 +116,7 @@ const audioPlayerMarkUp = ({model, options}) => html`
 						src="${playlistTrack.image.small}"
 					/>
 					<div class="audio-player__playlist-track-title">${playlistTrack.title}</div>
-					<div></div>
+					<!-- <div> track length goes here if we have it </div> -->
 					</li>`;}).join("")}` : ""}</ol> <!-- no whitespace! :empty needs to work to hide it -->
 
 		<div class="audio-player__transcript-section audio-player__transcript-section--transcript-${!!model?.track?.transcript?.length} js-audio-player__transcript-section">