From b59ab3605ef0daaec33449de6efb38c223bcd8b3 Mon Sep 17 00:00:00 2001 From: MrTimscampi Date: Sat, 1 Feb 2020 18:56:19 +0100 Subject: [PATCH] Fix some rebasing issues --- package.json | 2 +- src/assets/css/librarybrowser.css | 128 +++++++++--------- src/components/alphapicker/style.css | 1 - .../emby-scroller/emby-scroller.css | 4 +- src/elements/emby-input/emby-input.css | 4 +- 5 files changed, 69 insertions(+), 70 deletions(-) diff --git a/package.json b/package.json index 02ae28eaa7..4392f12153 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "serve": "webpack-dev-server --config webpack.dev.js --open", "build": "webpack --config webpack.prod.js", "lint": "eslint \"src\"", - "stylelint": "stylelint src/**/*.css", + "stylelint": "stylelint \"src/**/*.css\"", "prepare": "webpack --config webpack.prod.js" } } diff --git a/src/assets/css/librarybrowser.css b/src/assets/css/librarybrowser.css index 662ac3bf6c..0210641029 100644 --- a/src/assets/css/librarybrowser.css +++ b/src/assets/css/librarybrowser.css @@ -449,9 +449,41 @@ bottom: 0.75em; } -.layout-mobile .detailPagePrimaryContainer { +.parentName { display: block; - position: relative; + margin-bottom: 0.5em; +} + +.mainDetailButtons { + display: flex; + -webkit-box-align: center; + -webkit-align-items: center; + align-items: center; + -webkit-flex-wrap: wrap; + flex-wrap: wrap; + margin: 1em 0; +} + +.detailButton, +.mainDetailButtons { + display: flex; + display: -webkit-box; + display: -webkit-flex; +} + +.itemName { + margin: 0.5em 0; +} + +.itemMiscInfo { + display: -webkit-box; + display: -webkit-flex; + display: flex; + -webkit-flex-wrap: wrap; + flex-wrap: wrap; + -webkit-box-align: center; + -webkit-align-items: center; + align-items: center; } .layout-mobile .parentName, @@ -463,14 +495,6 @@ justify-content: center; } -.layout-mobile .infoText { - white-space: normal; -} - -.layout-tv .detailPagePrimaryContainer { - position: relative; -} - .detailPagePrimaryContainer { display: flex; align-items: center; @@ -480,6 +504,15 @@ z-index: 2; } +.layout-mobile .detailPagePrimaryContainer { + display: block; + position: relative; +} + +.layout-tv .detailPagePrimaryContainer { + position: relative; +} + .detailSticky { background-color: #101010; } @@ -495,6 +528,10 @@ text-align: left; } +.layout-mobile .infoText { + white-space: normal; +} + .detailPageSecondaryContainer { margin: 1.25em 0; } @@ -562,9 +599,9 @@ -webkit-box-shadow: 0 0.0725em 0.29em 0 rgba(0, 0, 0, 0.37); } -@media all and (max-width:62.5em) { +@media all and (max-width: 62.5em) { .detailPageWrapperContainer { - position: relative + position: relative; } .btnPlaySimple { @@ -578,11 +615,6 @@ } } -.parentName { - display: block; - margin-bottom: 0.5em; -} - .btnSyncComplete { background: #673ab7 !important; } @@ -633,17 +665,6 @@ } } -.detailButton, -.mainDetailButtons { - display: flex; - display: -webkit-box; - display: -webkit-flex; -} - -.itemName { - margin: 0.5em 0; -} - .empty { margin: 0; } @@ -656,16 +677,6 @@ margin-top: 0; } -.mainDetailButtons { - display: flex; - -webkit-box-align: center; - -webkit-align-items: center; - align-items: center; - -webkit-flex-wrap: wrap; - flex-wrap: wrap; - margin: 1em 0; -} - .recordingFields button { margin-left: 0; margin-right: 0.5em; @@ -690,24 +701,24 @@ padding: 0.5em 0.7em !important; } -@media all and (min-width:29em) { +@media all and (min-width: 29em) { .detailButton { - padding-left: .75em !important; - padding-right: .75em !important + padding-left: 0.75em !important; + padding-right: 0.75em !important; } } -@media all and (min-width:32em) { +@media all and (min-width: 32em) { .detailButton { - padding-left: .8em !important; - padding-right: .8em !important + padding-left: 0.8em !important; + padding-right: 0.8em !important; } } -@media all and (min-width:35em) { +@media all and (min-width: 35em) { .detailButton { - padding-left: .85em !important; - padding-right: .85em !important + padding-left: 0.85em !important; + padding-right: 0.85em !important; } } @@ -740,7 +751,7 @@ } .detailButton-text { - margin-top: .7em; + margin-top: 0.7em; font-size: 80%; font-weight: 400; } @@ -751,13 +762,13 @@ } .detailButtonHideonMobile { - display: none !important + display: none !important; } } -@media all and (min-width:62.5em) { +@media all and (min-width: 62.5em) { .headerTop { - padding: 0.8em 0 + padding: 0.8em 0; } .headerTabs { @@ -774,7 +785,7 @@ } .personBackdrop { - display: none !important + display: none !important; } .mainDetailButtons { @@ -789,17 +800,6 @@ } } -.itemMiscInfo { - display: -webkit-box; - display: -webkit-flex; - display: flex; - -webkit-flex-wrap: wrap; - flex-wrap: wrap; - -webkit-box-align: center; - -webkit-align-items: center; - align-items: center; -} - @media all and (max-width: 31.25em) { .mobileDetails .itemMiscInfo { text-align: center; @@ -1000,7 +1000,7 @@ div:not(.sectionTitleContainer-cards) > .sectionTitle-cards { margin-bottom: -1em; } -@media all and (min-height:31.25em) { +@media all and (min-height: 31.25em) { .padded-right-withalphapicker { padding-right: 7.5%; } diff --git a/src/components/alphapicker/style.css b/src/components/alphapicker/style.css index 2f396d1fec..4e94c0f754 100644 --- a/src/components/alphapicker/style.css +++ b/src/components/alphapicker/style.css @@ -112,7 +112,6 @@ } @media all and (min-width: 62.5em) { - .alphaPicker-fixed-right { right: 1em; } diff --git a/src/components/emby-scroller/emby-scroller.css b/src/components/emby-scroller/emby-scroller.css index d2157f9355..d4d2c69c85 100644 --- a/src/components/emby-scroller/emby-scroller.css +++ b/src/components/emby-scroller/emby-scroller.css @@ -14,8 +14,8 @@ } .servers > .card > .cardBox { - margin-left: .6em; - margin-right: .6em; + margin-left: 0.6em; + margin-right: 0.6em; } .layout-tv .emby-scroller, diff --git a/src/elements/emby-input/emby-input.css b/src/elements/emby-input/emby-input.css index 683498455b..18ad37a87a 100644 --- a/src/elements/emby-input/emby-input.css +++ b/src/elements/emby-input/emby-input.css @@ -21,8 +21,8 @@ border: 0; } -.emby-input:required { - box-shadow: none; +.emby-input:required { + box-shadow: none; } .inputContainer {