From f2c105e4202f3e42e19c2b1923cf330779291c17 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 20 Apr 2017 01:23:12 +0200 Subject: update to 53.0 --- arc-firefox-theme/chrome/global/about.css | 1 + arc-firefox-theme/chrome/global/aboutReader.css | 13 - .../chrome/global/aboutReaderContent.css | 1 + .../chrome/global/aboutReaderControls.css | 11 +- arc-firefox-theme/chrome/global/autocomplete.css | 1 + .../chrome/global/datetimeinputpickers.css | 342 ++++++++++++ arc-firefox-theme/chrome/global/datetimepopup.css | 11 + arc-firefox-theme/chrome/global/filters.svg | 17 + arc-firefox-theme/chrome/global/findBar.css | 12 +- arc-firefox-theme/chrome/global/global.css | 14 + .../chrome/global/icons/calendar-arrows.svg | 13 + .../chrome/global/icons/find-arrows.svg | 25 +- .../chrome/global/icons/menubutton-dropmarker.svg | 8 + .../chrome/global/icons/spinner-arrows.svg | 13 + .../chrome/global/in-content/common.css | 2 +- .../chrome/global/in-content/info-pages.css | 1 + .../chrome/global/media/TopLevelVideoDocument.css | 2 +- .../chrome/global/media/closeCaptionButton.png | Bin 583 -> 0 bytes .../chrome/global/media/closeCaptionButton@2x.png | Bin 1335 -> 0 bytes .../chrome/global/media/closedCaptionButton.svg | 55 ++ arc-firefox-theme/chrome/global/media/error.png | Bin 433 -> 20345 bytes .../chrome/global/media/fullscreenButton.png | Bin 733 -> 0 bytes .../chrome/global/media/fullscreenButton.svg | 47 ++ .../chrome/global/media/fullscreenButton@2x.png | Bin 1759 -> 0 bytes .../chrome/global/media/muteButton.png | Bin 619 -> 0 bytes .../chrome/global/media/muteButton.svg | 56 ++ .../chrome/global/media/muteButton@2x.png | Bin 1185 -> 0 bytes arc-firefox-theme/chrome/global/media/noAudio.png | Bin 930 -> 0 bytes .../chrome/global/media/noAudio@2x.png | Bin 1756 -> 0 bytes .../chrome/global/media/pauseButton.png | Bin 269 -> 0 bytes .../chrome/global/media/pauseButton.svg | 36 ++ .../chrome/global/media/pauseButton@2x.png | Bin 434 -> 0 bytes .../chrome/global/media/playButton.png | Bin 448 -> 0 bytes .../chrome/global/media/playButton.svg | 37 ++ .../chrome/global/media/playButton@2x.png | Bin 831 -> 0 bytes .../chrome/global/media/scrubberThumb.png | Bin 562 -> 0 bytes .../chrome/global/media/scrubberThumb@2x.png | Bin 1354 -> 0 bytes .../chrome/global/media/scrubberThumbWide.png | Bin 563 -> 0 bytes .../chrome/global/media/scrubberThumbWide@2x.png | Bin 1396 -> 0 bytes .../chrome/global/media/unmuteButton.png | Bin 324 -> 0 bytes .../chrome/global/media/unmuteButton@2x.png | Bin 542 -> 0 bytes .../chrome/global/media/videocontrols.css | 578 +++++++++++---------- .../chrome/global/media/volume-empty.png | Bin 295 -> 0 bytes .../chrome/global/media/volume-empty@2x.png | Bin 268 -> 0 bytes .../chrome/global/media/volume-full.png | Bin 297 -> 0 bytes .../chrome/global/media/volume-full@2x.png | Bin 267 -> 0 bytes arc-firefox-theme/chrome/global/menu.css | 7 +- arc-firefox-theme/chrome/global/narrate.css | 2 +- arc-firefox-theme/chrome/global/notification.css | 125 ++++- .../global/reader/RM-Type-Controls-Arrow.svg | 16 +- arc-firefox-theme/chrome/global/timepicker.css | 153 ------ 51 files changed, 1130 insertions(+), 469 deletions(-) create mode 100644 arc-firefox-theme/chrome/global/datetimeinputpickers.css create mode 100644 arc-firefox-theme/chrome/global/datetimepopup.css create mode 100644 arc-firefox-theme/chrome/global/filters.svg create mode 100644 arc-firefox-theme/chrome/global/icons/calendar-arrows.svg create mode 100644 arc-firefox-theme/chrome/global/icons/menubutton-dropmarker.svg create mode 100644 arc-firefox-theme/chrome/global/icons/spinner-arrows.svg delete mode 100644 arc-firefox-theme/chrome/global/media/closeCaptionButton.png delete mode 100644 arc-firefox-theme/chrome/global/media/closeCaptionButton@2x.png create mode 100644 arc-firefox-theme/chrome/global/media/closedCaptionButton.svg delete mode 100644 arc-firefox-theme/chrome/global/media/fullscreenButton.png create mode 100644 arc-firefox-theme/chrome/global/media/fullscreenButton.svg delete mode 100644 arc-firefox-theme/chrome/global/media/fullscreenButton@2x.png delete mode 100644 arc-firefox-theme/chrome/global/media/muteButton.png create mode 100644 arc-firefox-theme/chrome/global/media/muteButton.svg delete mode 100644 arc-firefox-theme/chrome/global/media/muteButton@2x.png delete mode 100644 arc-firefox-theme/chrome/global/media/noAudio.png delete mode 100644 arc-firefox-theme/chrome/global/media/noAudio@2x.png delete mode 100644 arc-firefox-theme/chrome/global/media/pauseButton.png create mode 100644 arc-firefox-theme/chrome/global/media/pauseButton.svg delete mode 100644 arc-firefox-theme/chrome/global/media/pauseButton@2x.png delete mode 100644 arc-firefox-theme/chrome/global/media/playButton.png create mode 100644 arc-firefox-theme/chrome/global/media/playButton.svg delete mode 100644 arc-firefox-theme/chrome/global/media/playButton@2x.png delete mode 100644 arc-firefox-theme/chrome/global/media/scrubberThumb.png delete mode 100644 arc-firefox-theme/chrome/global/media/scrubberThumb@2x.png delete mode 100644 arc-firefox-theme/chrome/global/media/scrubberThumbWide.png delete mode 100644 arc-firefox-theme/chrome/global/media/scrubberThumbWide@2x.png delete mode 100644 arc-firefox-theme/chrome/global/media/unmuteButton.png delete mode 100644 arc-firefox-theme/chrome/global/media/unmuteButton@2x.png delete mode 100644 arc-firefox-theme/chrome/global/media/volume-empty.png delete mode 100644 arc-firefox-theme/chrome/global/media/volume-empty@2x.png delete mode 100644 arc-firefox-theme/chrome/global/media/volume-full.png delete mode 100644 arc-firefox-theme/chrome/global/media/volume-full@2x.png delete mode 100644 arc-firefox-theme/chrome/global/timepicker.css (limited to 'arc-firefox-theme/chrome/global') diff --git a/arc-firefox-theme/chrome/global/about.css b/arc-firefox-theme/chrome/global/about.css index 25f5299..de37ccd 100644 --- a/arc-firefox-theme/chrome/global/about.css +++ b/arc-firefox-theme/chrome/global/about.css @@ -39,6 +39,7 @@ img { font-weight: bold; color: #909090; margin: -24px 0 9px 17px; + text-align: left; /* Override direction alignment on RTL to make sure that the version will fit well on the background. bug 1325232 */ } ul { diff --git a/arc-firefox-theme/chrome/global/aboutReader.css b/arc-firefox-theme/chrome/global/aboutReader.css index 49436de..36945de 100644 --- a/arc-firefox-theme/chrome/global/aboutReader.css +++ b/arc-firefox-theme/chrome/global/aboutReader.css @@ -6,19 +6,6 @@ body { padding: 64px 51px; } -@media print { - #container { - max-width: 100% !important; - font-size: 14px !important; - font-family: Georgia, "Times New Roman", serif !important; - } - - body { - padding-top: 0px; - padding-bottom: 0px; - } -} - body.loaded { transition: color 0.4s, background-color 0.4s; } diff --git a/arc-firefox-theme/chrome/global/aboutReaderContent.css b/arc-firefox-theme/chrome/global/aboutReaderContent.css index 633391d..f69c17b 100644 --- a/arc-firefox-theme/chrome/global/aboutReaderContent.css +++ b/arc-firefox-theme/chrome/global/aboutReaderContent.css @@ -55,6 +55,7 @@ figure, .wp-caption { margin: 0 0 10px 0 !important; + padding: 0 !important; } } diff --git a/arc-firefox-theme/chrome/global/aboutReaderControls.css b/arc-firefox-theme/chrome/global/aboutReaderControls.css index a624901..1acd81e 100644 --- a/arc-firefox-theme/chrome/global/aboutReaderControls.css +++ b/arc-firefox-theme/chrome/global/aboutReaderControls.css @@ -63,11 +63,16 @@ .header > .credits { font-size: 0.9em; line-height: 1.48em; - margin: 0 0 30px 0; + margin: 0 0 10px 0; padding: 0; font-style: italic; } +.header > .meta-data { + font-size: 0.65em; + margin: 0 0 15px 0; +} + /*======= Controls toolbar =======*/ .toolbar { @@ -134,7 +139,7 @@ border-radius: 4px; border: 1px solid #b5b5b5; border-bottom-width: 0; - box-shadow: 0 1px 12px #666; + box-shadow: 0 1px 3px #c1c1c1; } .keep-open .dropdown-popup { @@ -153,7 +158,7 @@ position: absolute; top: 30px; /* offset arrow from top of popup */ left: -16px; - width: 24px; + width: 16px; height: 24px; background-image: url("chrome://global/skin/reader/RM-Type-Controls-Arrow.svg"); display: block; diff --git a/arc-firefox-theme/chrome/global/autocomplete.css b/arc-firefox-theme/chrome/global/autocomplete.css index 0b4536c..6b31eed 100644 --- a/arc-firefox-theme/chrome/global/autocomplete.css +++ b/arc-firefox-theme/chrome/global/autocomplete.css @@ -105,6 +105,7 @@ treechildren.autocomplete-treebody::-moz-tree-cell-text(selected) { } .autocomplete-richlistitem[selected] { + background-color: Highlight; color: HighlightText; } diff --git a/arc-firefox-theme/chrome/global/datetimeinputpickers.css b/arc-firefox-theme/chrome/global/datetimeinputpickers.css new file mode 100644 index 0000000..bed7be5 --- /dev/null +++ b/arc-firefox-theme/chrome/global/datetimeinputpickers.css @@ -0,0 +1,342 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +:root { + --font-size-default: 1.1rem; + --spinner-width: 3rem; + --spinner-margin-top-bottom: 0.4rem; + --spinner-item-height: 2.4rem; + --spinner-item-margin-bottom: 0.1rem; + --spinner-button-height: 1.2rem; + --colon-width: 2rem; + --day-period-spacing-width: 1rem; + --calendar-width: 23.1rem; + --date-picker-item-height: 2.4rem; + + --border: 0.1rem solid #D6D6D6; + --border-radius: 0.3rem; + --border-active-color: #B1B1B1; + + --font-color: #191919; + --fill-color: #EBEBEB; + + --selected-font-color: #FFFFFF; + --selected-fill-color: #0996F8; + + --button-font-color: #858585; + --button-font-color-hover: #4D4D4D; + --button-font-color-active: #191919; + --button-fill-color-active: #D4D4D4; + + --weekday-font-color: #6C6C6C; + --weekday-outside-font-color: #6C6C6C; + --weekend-font-color: #DA4E44; + --weekend-outside-font-color: #FF988F; + + --disabled-opacity: 0.2; +} + +html { + font-size: 10px; +} + +body { + margin: 0; + color: var(--font-color); + font: message-box; + font-size: var(--font-size-default); +} + +button { + -moz-appearance: none; + background: none; + border: none; +} + +.nav { + display: flex; + width: var(--calendar-width); + height: 2.4rem; + margin-bottom: 0.8rem; + justify-content: space-between; +} + +.nav > button { + width: 3rem; + height: var(--date-picker-item-height); + filter: url("chrome://global/skin/filters.svg#fill"); + fill: var(--button-font-color); +} + +.nav > button:hover { + fill: var(--button-font-color-hover); +} + +.nav > button.active { + fill: var(--button-font-color-active); +} + +.nav > button.left { + background: url("chrome://global/skin/icons/calendar-arrows.svg#left") no-repeat 50% 50%; +} + +.nav > button.right { + background: url("chrome://global/skin/icons/calendar-arrows.svg#right") no-repeat 50% 50%; +} + +.month-year-container { + position: absolute; + display: flex; + justify-content: center; + align-items: center; + top: 0; + left: 3rem; + width: 17.1rem; + height: var(--date-picker-item-height); + z-index: 10; +} + +button.month-year { + font-size: 1.3rem; + border: var(--border); + border-radius: 0.3rem; + padding: 0.2rem 2.6rem 0.2rem 1.2rem; +} + +button.month-year:hover { + background: var(--fill-color); +} + +button.month-year.active { + border-color: var(--border-active-color); + background: var(--button-fill-color-active); +} + +button.month-year::after { + position: absolute; + content: ""; + width: 2.6rem; + height: 1.6rem; + background: url("chrome://global/skin/icons/spinner-arrows.svg#down") no-repeat 50% 50%; + filter: url("chrome://global/skin/filters.svg#fill"); + fill: var(--button-font-color); +} + +button.month-year.active::after { + background: url("chrome://global/skin/icons/spinner-arrows.svg#up") no-repeat 50% 50%; +} + +.month-year-view { + position: absolute; + z-index: 5; + padding-top: 3.2rem; + top: 0; + left: 0; + bottom: 0; + width: var(--calendar-width); + background: window; + opacity: 1; + transition: opacity 0.15s; +} + +.month-year-view.hidden { + visibility: hidden; + opacity: 0; +} + +.month-year-view > .spinner-container { + width: 5.5rem; + margin: 0 0.5rem; +} + +.month-year-view .spinner { + transform: scaleY(1); + transform-origin: top; + transition: transform 0.15s; +} + +.month-year-view.hidden .spinner { + transform: scaleY(0); + transition: none; +} + +.month-year-view .spinner > div { + transform: scaleY(1); + transition: transform 0.15s; +} + +.month-year-view.hidden .spinner > div { + transform: scaleY(2.5); + transition: none; +} + +.calendar-container { + cursor: default; + display: flex; + flex-direction: column; + width: var(--calendar-width); +} + +.week-header { + display: flex; +} + +.week-header > div { + color: var(--weekday-font-color); +} + +.week-header > div.weekend { + color: var(--weekend-font-color); +} + +.days-viewport { + height: 15rem; + overflow: hidden; + position: relative; +} + +.days-view { + position: absolute; + display: flex; + flex-wrap: wrap; + flex-direction: row; +} + +.week-header > div, +.days-view > div { + align-items: center; + display: flex; + height: var(--date-picker-item-height); + margin: 0.05rem 0.15rem; + position: relative; + justify-content: center; + width: 3rem; +} + +.days-view > div.outside { + color: var(--weekday-outside-font-color); +} + +.days-view > div.weekend { + color: var(--weekend-font-color); +} + +.days-view > div.weekend.outside { + color: var(--weekend-outside-font-color); +} + +#time-picker, +.month-year-view { + display: flex; + flex-direction: row; + justify-content: center; +} + +.spinner-container { + display: flex; + flex-direction: column; + width: var(--spinner-width); +} + +.spinner-container > button { + height: var(--spinner-button-height); + filter: url("chrome://global/skin/filters.svg#fill"); + fill: var(--button-font-color); +} + +.spinner-container > button:hover { + fill: var(--button-font-color-hover); +} + +.spinner-container > button.active { + fill: var(--button-font-color-active); +} + +.spinner-container > button.up { + background: url("chrome://global/skin/icons/spinner-arrows.svg#up") no-repeat 50% 50%; +} + +.spinner-container > button.down { + background: url("chrome://global/skin/icons/spinner-arrows.svg#down") no-repeat 50% 50%; +} + +.spinner-container.hide-buttons > button { + visibility: hidden; +} + +.spinner-container > .spinner { + position: relative; + width: 100%; + margin: var(--spinner-margin-top-bottom) 0; + cursor: default; + overflow-y: scroll; + scroll-snap-type: mandatory; + scroll-snap-points-y: repeat(100%); +} + +.spinner-container > .spinner > div { + box-sizing: border-box; + position: relative; + text-align: center; + padding: calc((var(--spinner-item-height) - var(--font-size-default)) / 2) 0; + margin-bottom: var(--spinner-item-margin-bottom); + height: var(--spinner-item-height); + -moz-user-select: none; + scroll-snap-coordinate: 0 0; +} + +.spinner-container > .spinner > div:hover::before, +.calendar-container .days-view > div:hover::before { + background: var(--fill-color); + border: var(--border); + border-radius: var(--border-radius); + content: ""; + position: absolute; + top: 0%; + bottom: 0%; + left: 0%; + right: 0%; + z-index: -10; +} + +.spinner-container > .spinner:not(.scrolling) > div.selection, +.calendar-container .days-view > div.selection { + color: var(--selected-font-color); +} + +.spinner-container > .spinner > div.selection::before, +.calendar-container .days-view > div.selection::before { + background: var(--selected-fill-color); + border: none; + border-radius: var(--border-radius); + content: ""; + position: absolute; + top: 0%; + bottom: 0%; + left: 0%; + right: 0%; + z-index: -10; +} + +.spinner-container > .spinner > div.disabled::before, +.spinner-container > .spinner.scrolling > div.selection::before, +.spinner-container > .spinner.scrolling > div:hover::before { + display: none; +} + +.spinner-container > .spinner > div.disabled { + opacity: var(--disabled-opacity); +} + +.colon { + display: flex; + justify-content: center; + align-items: center; + width: var(--colon-width); + margin-bottom: 0.3rem; +} + +.spacer { + width: var(--day-period-spacing-width); +} \ No newline at end of file diff --git a/arc-firefox-theme/chrome/global/datetimepopup.css b/arc-firefox-theme/chrome/global/datetimepopup.css new file mode 100644 index 0000000..52f6fc7 --- /dev/null +++ b/arc-firefox-theme/chrome/global/datetimepopup.css @@ -0,0 +1,11 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +panel[type="arrow"][side="top"], +panel[type="arrow"][side="bottom"] { + margin-left: 0; + margin-right: 0; +} diff --git a/arc-firefox-theme/chrome/global/filters.svg b/arc-firefox-theme/chrome/global/filters.svg new file mode 100644 index 0000000..2d0f219 --- /dev/null +++ b/arc-firefox-theme/chrome/global/filters.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + diff --git a/arc-firefox-theme/chrome/global/findBar.css b/arc-firefox-theme/chrome/global/findBar.css index f049114..9bf610b 100644 --- a/arc-firefox-theme/chrome/global/findBar.css +++ b/arc-firefox-theme/chrome/global/findBar.css @@ -105,12 +105,20 @@ findbar[noanim] { } .findbar-find-previous { - list-style-image: url(chrome://global/skin/icons/find-arrows.svg#glyph-find-previous); + list-style-image: url(chrome://global/skin/icons/find-arrows.svg#previous); border-inline-end-width: 0; } .findbar-find-next { - list-style-image: url(chrome://global/skin/icons/find-arrows.svg#glyph-find-next); + list-style-image: url(chrome://global/skin/icons/find-arrows.svg#next); +} + +.findbar-find-previous[disabled] { + list-style-image: url(chrome://global/skin/icons/find-arrows.svg#previous-disabled); +} + +.findbar-find-next[disabled] { + list-style-image: url(chrome://global/skin/icons/find-arrows.svg#next-disabled); } .findbar-find-previous > .toolbarbutton-icon, diff --git a/arc-firefox-theme/chrome/global/global.css b/arc-firefox-theme/chrome/global/global.css index 1f9e7e4..d78a911 100644 --- a/arc-firefox-theme/chrome/global/global.css +++ b/arc-firefox-theme/chrome/global/global.css @@ -292,6 +292,20 @@ popupnotificationcontent { margin-top: .5em; } +.popup-notification-panel > .panel-arrowcontainer > .panel-arrowcontent { + /* In order to display the action buttons near the edge of the arrow panel we + * have to reset its default padding and specify the padding in the individual + * "popupnotification" elements instead. To keep the rounded borders of the + * panel, we also have to ensure the contents are clipped to the border box + * by hiding the overflow, and we have to override the "display" property so + * that the height of the contents is computed correctly in that case. */ + padding: 0; + overflow: hidden; + display: flex; + /* Make multiple popupnotifications stack vertically. */ + flex-direction: column; +} + /* :::::: autoscroll popup ::::: */ .autoscroller { diff --git a/arc-firefox-theme/chrome/global/icons/calendar-arrows.svg b/arc-firefox-theme/chrome/global/icons/calendar-arrows.svg new file mode 100644 index 0000000..858676f --- /dev/null +++ b/arc-firefox-theme/chrome/global/icons/calendar-arrows.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/arc-firefox-theme/chrome/global/icons/find-arrows.svg b/arc-firefox-theme/chrome/global/icons/find-arrows.svg index 608c0a7..d6c59c7 100644 --- a/arc-firefox-theme/chrome/global/icons/find-arrows.svg +++ b/arc-firefox-theme/chrome/global/icons/find-arrows.svg @@ -2,15 +2,26 @@ - + - - + + + + + + + + diff --git a/arc-firefox-theme/chrome/global/icons/menubutton-dropmarker.svg b/arc-firefox-theme/chrome/global/icons/menubutton-dropmarker.svg new file mode 100644 index 0000000..76af113 --- /dev/null +++ b/arc-firefox-theme/chrome/global/icons/menubutton-dropmarker.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/arc-firefox-theme/chrome/global/icons/spinner-arrows.svg b/arc-firefox-theme/chrome/global/icons/spinner-arrows.svg new file mode 100644 index 0000000..a8ba72d --- /dev/null +++ b/arc-firefox-theme/chrome/global/icons/spinner-arrows.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/arc-firefox-theme/chrome/global/in-content/common.css b/arc-firefox-theme/chrome/global/in-content/common.css index 05c91b4..2f1bfac 100644 --- a/arc-firefox-theme/chrome/global/in-content/common.css +++ b/arc-firefox-theme/chrome/global/in-content/common.css @@ -109,7 +109,7 @@ xul|groupbox { font-size: 1.25rem; } -xul|groupbox xul|label:not(.menu-accel):not(.menu-text):not(.indent), +xul|groupbox xul|label:not(.menu-accel):not(.menu-text):not(.indent):not(.learnMore), xul|groupbox xul|description { /* !important needed to override toolkit !important rule */ margin-inline-start: 0 !important; diff --git a/arc-firefox-theme/chrome/global/in-content/info-pages.css b/arc-firefox-theme/chrome/global/in-content/info-pages.css index b75b06a..3de0ce5 100644 --- a/arc-firefox-theme/chrome/global/in-content/info-pages.css +++ b/arc-firefox-theme/chrome/global/in-content/info-pages.css @@ -37,6 +37,7 @@ body { font-size: 2.5em; } +.title:-moz-locale-dir(rtl), .title:dir(rtl) { background-position: right 0; } diff --git a/arc-firefox-theme/chrome/global/media/TopLevelVideoDocument.css b/arc-firefox-theme/chrome/global/media/TopLevelVideoDocument.css index 760cdcd..2d857ce 100644 --- a/arc-firefox-theme/chrome/global/media/TopLevelVideoDocument.css +++ b/arc-firefox-theme/chrome/global/media/TopLevelVideoDocument.css @@ -8,5 +8,5 @@ body { } video { - box-shadow: 0 0 15px #000; + box-shadow: 0 0 5px rgba(0,0,0,0.6); } diff --git a/arc-firefox-theme/chrome/global/media/closeCaptionButton.png b/arc-firefox-theme/chrome/global/media/closeCaptionButton.png deleted file mode 100644 index 469310f..0000000 Binary files a/arc-firefox-theme/chrome/global/media/closeCaptionButton.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/closeCaptionButton@2x.png b/arc-firefox-theme/chrome/global/media/closeCaptionButton@2x.png deleted file mode 100644 index 0335078..0000000 Binary files a/arc-firefox-theme/chrome/global/media/closeCaptionButton@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/closedCaptionButton.svg b/arc-firefox-theme/chrome/global/media/closedCaptionButton.svg new file mode 100644 index 0000000..0c55071 --- /dev/null +++ b/arc-firefox-theme/chrome/global/media/closedCaptionButton.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/arc-firefox-theme/chrome/global/media/error.png b/arc-firefox-theme/chrome/global/media/error.png index 58e3728..362a293 100644 Binary files a/arc-firefox-theme/chrome/global/media/error.png and b/arc-firefox-theme/chrome/global/media/error.png differ diff --git a/arc-firefox-theme/chrome/global/media/fullscreenButton.png b/arc-firefox-theme/chrome/global/media/fullscreenButton.png deleted file mode 100644 index ffbc3d5..0000000 Binary files a/arc-firefox-theme/chrome/global/media/fullscreenButton.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/fullscreenButton.svg b/arc-firefox-theme/chrome/global/media/fullscreenButton.svg new file mode 100644 index 0000000..0bf3ec2 --- /dev/null +++ b/arc-firefox-theme/chrome/global/media/fullscreenButton.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/arc-firefox-theme/chrome/global/media/fullscreenButton@2x.png b/arc-firefox-theme/chrome/global/media/fullscreenButton@2x.png deleted file mode 100644 index b09ebbd..0000000 Binary files a/arc-firefox-theme/chrome/global/media/fullscreenButton@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/muteButton.png b/arc-firefox-theme/chrome/global/media/muteButton.png deleted file mode 100644 index 8944807..0000000 Binary files a/arc-firefox-theme/chrome/global/media/muteButton.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/muteButton.svg b/arc-firefox-theme/chrome/global/media/muteButton.svg new file mode 100644 index 0000000..779957c --- /dev/null +++ b/arc-firefox-theme/chrome/global/media/muteButton.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/arc-firefox-theme/chrome/global/media/muteButton@2x.png b/arc-firefox-theme/chrome/global/media/muteButton@2x.png deleted file mode 100644 index b2cd21c..0000000 Binary files a/arc-firefox-theme/chrome/global/media/muteButton@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/noAudio.png b/arc-firefox-theme/chrome/global/media/noAudio.png deleted file mode 100644 index 3db8c97..0000000 Binary files a/arc-firefox-theme/chrome/global/media/noAudio.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/noAudio@2x.png b/arc-firefox-theme/chrome/global/media/noAudio@2x.png deleted file mode 100644 index 7de728b..0000000 Binary files a/arc-firefox-theme/chrome/global/media/noAudio@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/pauseButton.png b/arc-firefox-theme/chrome/global/media/pauseButton.png deleted file mode 100644 index 944098c..0000000 Binary files a/arc-firefox-theme/chrome/global/media/pauseButton.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/pauseButton.svg b/arc-firefox-theme/chrome/global/media/pauseButton.svg new file mode 100644 index 0000000..8d56b96 --- /dev/null +++ b/arc-firefox-theme/chrome/global/media/pauseButton.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + diff --git a/arc-firefox-theme/chrome/global/media/pauseButton@2x.png b/arc-firefox-theme/chrome/global/media/pauseButton@2x.png deleted file mode 100644 index df22919..0000000 Binary files a/arc-firefox-theme/chrome/global/media/pauseButton@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/playButton.png b/arc-firefox-theme/chrome/global/media/playButton.png deleted file mode 100644 index 11e2731..0000000 Binary files a/arc-firefox-theme/chrome/global/media/playButton.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/playButton.svg b/arc-firefox-theme/chrome/global/media/playButton.svg new file mode 100644 index 0000000..dc20c61 --- /dev/null +++ b/arc-firefox-theme/chrome/global/media/playButton.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + diff --git a/arc-firefox-theme/chrome/global/media/playButton@2x.png b/arc-firefox-theme/chrome/global/media/playButton@2x.png deleted file mode 100644 index fb20075..0000000 Binary files a/arc-firefox-theme/chrome/global/media/playButton@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/scrubberThumb.png b/arc-firefox-theme/chrome/global/media/scrubberThumb.png deleted file mode 100644 index f159627..0000000 Binary files a/arc-firefox-theme/chrome/global/media/scrubberThumb.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/scrubberThumb@2x.png b/arc-firefox-theme/chrome/global/media/scrubberThumb@2x.png deleted file mode 100644 index f8790f4..0000000 Binary files a/arc-firefox-theme/chrome/global/media/scrubberThumb@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/scrubberThumbWide.png b/arc-firefox-theme/chrome/global/media/scrubberThumbWide.png deleted file mode 100644 index 96d2ed7..0000000 Binary files a/arc-firefox-theme/chrome/global/media/scrubberThumbWide.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/scrubberThumbWide@2x.png b/arc-firefox-theme/chrome/global/media/scrubberThumbWide@2x.png deleted file mode 100644 index 52c9d72..0000000 Binary files a/arc-firefox-theme/chrome/global/media/scrubberThumbWide@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/unmuteButton.png b/arc-firefox-theme/chrome/global/media/unmuteButton.png deleted file mode 100644 index 5b76e2f..0000000 Binary files a/arc-firefox-theme/chrome/global/media/unmuteButton.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/unmuteButton@2x.png b/arc-firefox-theme/chrome/global/media/unmuteButton@2x.png deleted file mode 100644 index 86f2185..0000000 Binary files a/arc-firefox-theme/chrome/global/media/unmuteButton@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/videocontrols.css b/arc-firefox-theme/chrome/global/media/videocontrols.css index 6907620..03a050e 100644 --- a/arc-firefox-theme/chrome/global/media/videocontrols.css +++ b/arc-firefox-theme/chrome/global/media/videocontrols.css @@ -2,271 +2,369 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -@namespace html url("http://www.w3.org/1999/xhtml"); +@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +@namespace url("http://www.w3.org/1999/xhtml"); + +video > xul|videocontrols, +audio > xul|videocontrols { + writing-mode: horizontal-tb; + width: 100%; + height: 100%; + display: inline-block; +} + +.controlsContainer [hidden="true"], +.controlBar[hidden] { + display: none; +} + +.controlBar[size="hidden"] { + display: none; +} + +.controlsSpacer[hideCursor] { + cursor: none; +} + +.controlsContainer, +.progressContainer { + position: relative; + height: 100%; +} + +.stackItem { + position: absolute; + left: 0; + bottom: 0; + width: 100%; + height: 100%; +} + +.statusOverlay { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + background-color: rgb(80,80,80); +} + +.controlsOverlay { + display: flex; + flex-direction: column; + justify-content: center; + position: relative; +} + +.controlsSpacerStack { + display: flex; + flex-direction: column; + flex-grow: 1; + justify-content: center; + align-items: center; +} + +.controlsSpacer { + background-color: rgba(255,255,255,.4); +} .controlBar { - height: 28px; - background-color: rgba(35,31,32,.74); + position: relative; + display: flex; + justify-content: center; + align-items: center; + overflow: hidden; + height: 40px; + padding: 0 9px; + background-color: rgba(26,26,26,.8); } .playButton, .muteButton, .closedCaptionButton, .fullscreenButton { + height: 100%; + min-height: 30px; + min-width: 30px; + padding: 6px; + border: 0; + margin: 0; background-color: transparent; background-repeat: no-repeat; background-position: center; - -moz-appearance: none; /* Remove the native button appearance and styling */ - margin: 0; - padding: 0; - min-height: 28px; - min-width: 28px; - border: none; - opacity: 0.7; + background-origin: content-box; + background-clip: content-box; } -.playButton:hover, -.muteButton:hover, -.closedCaptionButton:hover, -.fullscreenButton:hover { - opacity: 1; +.playButton { + background-image: url(chrome://global/skin/media/pauseButton.svg#pause); } - -.playButton:hover:active, -.muteButton:hover:active, -.closedCaptionButton:hover:active, -.fullscreenButton:hover:active { - opacity: 0.4; +.playButton:hover { + background-image: url(chrome://global/skin/media/pauseButton.svg#pause-hover); } - -.playButton { - background-image: url(chrome://global/skin/media/pauseButton.png); - margin-right: -22px; /* 1/2 of scrubber thumb width, for overhang. */ - position: relative; /* Trick to work around negative margin interfering with clicking on the button. */ +.playButton:hover:active { + background-image: url(chrome://global/skin/media/pauseButton.svg#pause-active); } - .playButton[paused] { - background-image: url(chrome://global/skin/media/playButton.png); + background-image: url(chrome://global/skin/media/playButton.svg#play); +} +.playButton[paused]:hover { + background-image: url(chrome://global/skin/media/playButton.svg#play-hover); +} +.playButton[paused]:hover:active { + background-image: url(chrome://global/skin/media/playButton.svg#play-active); } .muteButton { - background-image: url(chrome://global/skin/media/muteButton.png); - min-width: 33px; + background-image: url(chrome://global/skin/media/muteButton.svg#unmute); +} +.muteButton:hover { + background-image: url(chrome://global/skin/media/muteButton.svg#unmute-hover); +} +.muteButton:hover:active { + background-image: url(chrome://global/skin/media/muteButton.svg#unmute-active); } .muteButton[muted] { - background-image: url(chrome://global/skin/media/unmuteButton.png); + background-image: url(chrome://global/skin/media/muteButton.svg#mute); } - -.muteButton[noAudio] { - background-image: url(chrome://global/skin/media/noAudio.png); +.muteButton[muted]:hover { + background-image: url(chrome://global/skin/media/muteButton.svg#mute-hover); +} +.muteButton[muted]:hover:active { + background-image: url(chrome://global/skin/media/muteButton.svg#mute-active); +} +.muteButton[noAudio], +.muteButton[noAudio]:hover, +.muteButton[noAudio]:hover:active { + background-image: url(chrome://global/skin/media/muteButton.svg#noaudio); } - .muteButton[noAudio] + .volumeStack { display: none; } .closedCaptionButton { - background-image: url(chrome://global/skin/media/closeCaptionButton.png); - background-position: 4px; + background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-off); +} +.closedCaptionButton:hover { + background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-off-hover); +} +.closedCaptionButton:hover:active { + background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-off-active); } - .closedCaptionButton[enabled] { - opacity: 1; + background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc); } - -.closedCaptionButton[hidden] { - display: none; +.closedCaptionButton[enabled]:hover { + background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-hover); +} +.closedCaptionButton[enabled]:hover:active { + background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-active); } .fullscreenButton { - background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 16, 16, 0); + background-image: url(chrome://global/skin/media/fullscreenButton.svg#fullscreen); +} +.fullscreenButton:hover { + background-image: url(chrome://global/skin/media/fullscreenButton.svg#fullscreen-hover); +} +.fullscreenButton:hover:active { + background-image: url(chrome://global/skin/media/fullscreenButton.svg#fullscreen-active); } - .fullscreenButton[fullscreened] { - background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 32, 16, 16); + background-image: url(chrome://global/skin/media/fullscreenButton.svg#unfullscreen); +} +.fullscreenButton[fullscreened]:hover { + background-image: url(chrome://global/skin/media/fullscreenButton.svg#unfullscreen-hover); +} +.fullscreenButton[fullscreened]:hover:active { + background-image: url(chrome://global/skin/media/fullscreenButton.svg#unfullscreen-active); } -.volumeControl { - width: 32px; - opacity: 0; +.controlBarSpacer { + flex-grow: 1; } -.volumeBackground, -.volumeForeground { - background-repeat: no-repeat; - background-position: center; - width: 32px; +.volumeControl::-moz-range-thumb, +.scrubber::-moz-range-thumb { + height: 13px; + width: 13px; + border: none; + border-radius: 50%; + background-color: #ffffff; + filter: drop-shadow(0px 0px 2px rgba(0,0,0,0.65)); } -.volumeBackground { - background-image: url(chrome://global/skin/media/volume-empty.png); +.volumeControl::-moz-focus-outer, +.scrubber::-moz-focus-outer { + border: 0; } -.volumeForeground { - background-image: url(chrome://global/skin/media/volume-full.png); - background-clip: content-box; +.progressBackgroundBar { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; } -.textTrackList { - display: -moz-box; - -moz-appearance: none; - -moz-box-pack: end; - -moz-box-align: end; - padding: 0; +.progressStack { + position: relative; + width: 100%; + height: 5px; } -.textTrackList[hidden] { - display: none; +.scrubberStack { + min-width: 48px; + flex-basis: 48px; + flex-grow: 2; + flex-shrink: 0; + margin: 0 9px; } -.textTrackList > html|*.textTrackItem { - -moz-appearance: none; - -moz-box-align: start; - text-align: start; - overflow: hidden; +.volumeStack { + max-width: 60px; + min-width: 48px; + flex-grow: 1; + flex-shrink: 0; + margin-right: 6px; + margin-left: 4px; +} + +.bufferBar, +.progressBar, +.scrubber, +.volumeBackground, +.volumeControl { + bottom: 0; + left: 0; + position: absolute; + width: 100%; + height: 100%; + padding: 0; + border: 0; + border-radius: 2.5px; margin: 0; - padding: 2px 10px; - -moz-margin-end: 10px; - border: none; - color: rgba(255,255,255,.5); - background-color: rgba(35,31,32,.74); - white-space: nowrap; + background: none; + background-color: transparent; } -.textTrackList > html|*.textTrackItem[on] { - color: white; - background-color: black; +.bufferBar, +.volumeBackground { + background-color: rgba(0,0,0,0.7); } -.textTrackList > html|*.textTrackItem:hover { - background-color: rgba(0,0,0,.55); +.bufferBar::-moz-progress-bar, +.progressBar::-moz-progress-bar, +.volumeBackground::-moz-meter-bar { + height: 100%; + padding: 0; + margin: 0; + border: 0; + border-radius: 2.5px; + background: none; } -.controlBar[fullscreen-unavailable] { - /* This value is duplicated in the videocontrols.xml adjustControlSize function. */ - padding-inline-end: 8px; +.scrubber:hover::-moz-range-thumb, +.volumeControl:hover::-moz-range-thumb { + background-color: #48a0f7; } -.volumeControl .scale-thumb { - min-width: 0; - opacity: 0; +.scrubber:active::-moz-range-thumb, +.volumeControl:active::-moz-range-thumb { + background-color: #2d89e6; } -.durationBox { - -moz-box-pack: center; +.scrubber::-moz-range-track, +.scrubber::-moz-range-progress { + background-color: transparent; } -.durationLabel { - margin-left: -22px; /* 1/2 of scrubber thumb width, for overhang. */ - padding-left: 8px; /* don't bump into the scrubber bar */ - color: rgba(255,255,255,.75); - font: message-box; - font-size: 11px; +.volumeControl::-moz-range-progress, +.volumeControl::-moz-range-track { + height: 5px; + border-radius: 2.5px; } -.durationLabel { - padding-top: 0; /* center vertically with scrubber bar */ +.volumeControl::-moz-range-progress { + background-color: #ffffff; } -.positionLabel { - display: none; +.volumeControl::-moz-range-track { + background-color: rgba(0,0,0,0.7); } -.backgroundBar { - /* margin top/bottom: make bar 8px tall (control height = 28, minus 2 * 10 margin) */ - /* margin left/right: 1/2 of scrubber thumb width, for overhang. */ - margin: 10px 22px; - background-color: rgba(255,255,255,.5); + +.bufferBar::-moz-progress-bar { + background-color: rgba(255,255,255,0.3); border-radius: 2.5px; } -.bufferBar, -.progressBar { - /* margin top/bottom: make bar 8px tall (control height = 28, minus 2 * 10 margin) */ - /* margin left/right: 1/2 of scrubber thumb width, for overhang. */ - margin: 10px 22px; - -moz-appearance: none; - border: none; - background-color: transparent; - min-width: 0; - min-height: 0; -} - -/* .progress-bar is an element inside the implementation. */ -.bufferBar .progress-bar { - /* - * Note that this is drawn on top of the .backgroundBar. So although this - * has the same background-color specified, the semitransparent - * compositing gives it a different visual appearance. - */ - background-color: rgba(255,255,255,.5); - border-radius: 2.5px; - -moz-appearance: none; +.progressBar::-moz-progress-bar { + background-color: #00b6f0; } -.progressBar .progress-bar { - background-color: white; +.textTrackList { + position: absolute; + right: 5px; + bottom: 45px; + max-width: 80%; + border: 1px solid #000000; border-radius: 2.5px; - -moz-appearance: none; + padding: 5px 0; + vertical-align: middle; + font-size: 12px; + background-color: #000000; + opacity: 0.7; } -/* .scale-slider is an element inside the implementation. */ -.scrubber .scale-slider, -.volumeControl .scale-slider { - /* Hide the default horizontal bar. */ - -moz-appearance: none; - background: none; +.textTrackList > .textTrackItem { + display: block; + width: 100%; + height: 30px; + padding: 2px 10px; + border: none; margin: 0; + white-space: nowrap; + overflow: hidden; + text-align: left; + text-overflow: ellipsis; + color: #ffffff; + background-color: transparent; } -.scrubber .scale-slider { - /* abs(margin-top) + margin-bottom + bar height == timeThumb height */ - margin-top: -10px; - margin-bottom: 10px; -} -/* .scale-thumb is an element inside the implementation. */ -.scrubber .scale-thumb, -.volumeControl .scale-thumb { - /* Override the default thumb appearance with a custom image. */ - -moz-appearance: none; - background: transparent; - border: none; +.textTrackList > .textTrackItem:hover { + background-color: #444444; } -.timeThumb { - background: url(chrome://global/skin/media/scrubberThumb.png) no-repeat center; - min-width: 45px; - min-height: 28px; - -moz-box-pack: center; +.textTrackList > .textTrackItem[on] { + color: #48a0f7; } -.timeThumb[showhours="true"] { - background-image: url(chrome://global/skin/media/scrubberThumbWide.png); +.positionLabel, +.durationLabel { + display: none; } -.timeLabel { - color: rgba(255,255,255,.75); +.positionDurationBox { + text-align: center; + padding-inline-start: 1px; + padding-inline-end: 9px; + white-space: nowrap; font: message-box; - font-size: 10px; - text-shadow: rgba(0,0,0,.3) 0 1px; - padding-top: 7px; + font-size: 13px; + font-size-adjust: 0.55; + color: #ffffff; } -.timeLabel { - padding-top: 5px; /* center vertically with scrubber bar */ -} -.statusOverlay { - -moz-box-align: center; - -moz-box-pack: center; - background-color: rgba(0,0,0,.55); +.duration { + display: inline-block; + white-space: pre; + color: #929292; } .statusIcon { - margin-bottom: 28px; /* same height as .controlBar, to keep icon centered above it */ width: 36px; height: 36px; + margin-bottom: 20px; } .statusIcon[type="throbber"] { @@ -278,61 +376,55 @@ } .statusIcon[type="error"] { + min-width: 70px; + min-height: 60px; background: url(chrome://global/skin/media/error.png) no-repeat center; + background-size: contain; } /* Overlay Play button */ .clickToPlay { - width: 64px; - height: 64px; - -moz-box-pack: center; - -moz-box-align: center; - opacity: 0.7; - background-image: url(chrome://global/skin/media/clicktoplay-bgtexture.png), - url(chrome://global/skin/media/videoClickToPlayButton.svg); - background-repeat: repeat, no-repeat; - background-position: center, center; - background-size: auto, 64px 64px; - background-color: hsla(0,0%,10%,.5); + min-width: 48px; + min-height: 48px; + border-radius: 50%; + background-image: url(chrome://global/skin/media/playButton.svg#play); + background-repeat: no-repeat; + background-position: 54% 50%; + background-size: 40% 40%; + background-color: #1a1a1a; + opacity: 0.8; + position: relative; + top: 20px; } + +.controlsSpacerStack:hover > .clickToPlay, .clickToPlay:hover { - opacity: 1; + opacity: 0.55; } -/* Statistics formatting */ -html|*.statsDiv { - position: relative; +.controlsSpacerStack:hover > .clickToPlay[fadeout] { + opacity: 0; } -html|td { - height: 1em; - max-height: 1em; - padding: 0 2px; -} -html|table { - font-family: Helvetica, Arial, sans-serif; - font-size: 11px; - color: white; - text-shadow: - -1px -1px 0 #000, - 1px -1px 0 #000, - -1px 1px 0 #000, - 1px 1px 0 #000; - min-width: 100%; - background: rgba(68,68,68,.7); - table-layout: fixed; - border-collapse: collapse; - position: absolute; + +.controlBar[fullscreen-unavailable] .fullscreenButton { + display: none; } /* CSS Transitions */ .clickToPlay { - transition-property: opacity, background-size; + transition-property: transform, opacity; transition-duration: 400ms, 400ms; } + +.controlsSpacer[fadeout] { + opacity: 0; +} + .clickToPlay[fadeout] { - background-size: auto, 192px 192px; + transform: scale(3); opacity: 0; } + .clickToPlay[fadeout][immediate] { transition-property: opacity, background-size; transition-duration: 0s, 0s; @@ -348,10 +440,6 @@ html|table { transition-property: opacity, margin-top; transition-duration: 200ms, 200ms; } -.volumeStack[fadeout] { - opacity: 0; - margin-top: 0; -} .statusOverlay:not([immediate]) { transition-property: opacity; transition-duration: 300ms; @@ -363,66 +451,22 @@ html|table { /* Error description formatting */ .errorLabel { - font-family: Helvetica, Arial, sans-serif; - font-size: 11px; - color: #bbb; - text-shadow: - -1px -1px 0 #000, - 1px -1px 0 #000, - -1px 1px 0 #000, - 1px 1px 0 #000; padding: 0 10px; text-align: center; + font: message-box; + font-size: 14px; + color: #ffffff; +} + +.errorLabel { + display: none; } -@media (min-resolution: 2dppx) { - .playButton { - background-image: url(chrome://global/skin/media/pauseButton@2x.png); - background-size: 28px 28px; - } - .playButton[paused] { - background-image: url(chrome://global/skin/media/playButton@2x.png); - background-size: 28px 28px; - } - .volumeBackground { - background-image: url(chrome://global/skin/media/volume-empty@2x.png); - background-size: 32px 16px; - } - .volumeForeground { - background-image: url(chrome://global/skin/media/volume-full@2x.png); - background-size: 32px 16px; - } - .muteButton { - background-image: url(chrome://global/skin/media/muteButton@2x.png); - background-size: 33px 28px; - } - .muteButton[muted] { - background-image: url(chrome://global/skin/media/unmuteButton@2x.png); - background-size: 33px 28px; - } - .muteButton[noAudio] { - background-image: url(chrome://global/skin/media/noAudio@2x.png); - background-size: 33px 28px; - } - .closedCaptionButton { - background-image: url(chrome://global/skin/media/closeCaptionButton@2x.png); - background-position: 4px; - background-size: 28px 28px; - } - .fullscreenButton { - background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton@2x.png"), 0, 32, 32, 0); - background-size: 16px 16px; - } - .fullscreenButton[fullscreened] { - background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton@2x.png"), 0, 64, 32, 32); - background-size: 16px 16px; - } - .timeThumb { - background-image: url(chrome://global/skin/media/scrubberThumb@2x.png); - background-size: 33px 28px; - } - .timeThumb[showhours="true"] { - background-image: url(chrome://global/skin/media/scrubberThumbWide@2x.png); - background-size: 45px 28px; - } +[error="errorAborted"] > [anonid="errorAborted"], +[error="errorNetwork"] > [anonid="errorNetwork"], +[error="errorDecode"] > [anonid="errorDecode"], +[error="errorSrcNotSupported"] > [anonid="errorSrcNotSupported"], +[error="errorNoSource"] > [anonid="errorNoSource"], +[error="errorGeneric"] > [anonid="errorGeneric"] { + display: inline; } diff --git a/arc-firefox-theme/chrome/global/media/volume-empty.png b/arc-firefox-theme/chrome/global/media/volume-empty.png deleted file mode 100644 index 589abfb..0000000 Binary files a/arc-firefox-theme/chrome/global/media/volume-empty.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/volume-empty@2x.png b/arc-firefox-theme/chrome/global/media/volume-empty@2x.png deleted file mode 100644 index ca494e8..0000000 Binary files a/arc-firefox-theme/chrome/global/media/volume-empty@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/volume-full.png b/arc-firefox-theme/chrome/global/media/volume-full.png deleted file mode 100644 index 4398a56..0000000 Binary files a/arc-firefox-theme/chrome/global/media/volume-full.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/volume-full@2x.png b/arc-firefox-theme/chrome/global/media/volume-full@2x.png deleted file mode 100644 index 5bf63c7..0000000 Binary files a/arc-firefox-theme/chrome/global/media/volume-full@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/menu.css b/arc-firefox-theme/chrome/global/menu.css index 06e3b21..386d911 100644 --- a/arc-firefox-theme/chrome/global/menu.css +++ b/arc-firefox-theme/chrome/global/menu.css @@ -12,8 +12,7 @@ menu, menuitem, -menucaption, -.splitmenu-menuitem { +menucaption { -moz-appearance: menuitem; -moz-box-align: center; max-width: 42em; @@ -28,15 +27,13 @@ menuitem[default="true"] { } menu[_moz-menuactive="true"], -menuitem[_moz-menuactive="true"], -.splitmenu-menuitem[_moz-menuactive="true"] { +menuitem[_moz-menuactive="true"] { color: -moz-menuhovertext; background-color: -moz-menuhover; } menu[disabled="true"], menuitem[disabled="true"], -.splitmenu-menuitem[disabled="true"], menucaption[disabled="true"] { color: GrayText; } diff --git a/arc-firefox-theme/chrome/global/narrate.css b/arc-firefox-theme/chrome/global/narrate.css index 8a44e78..4514eff 100644 --- a/arc-firefox-theme/chrome/global/narrate.css +++ b/arc-firefox-theme/chrome/global/narrate.css @@ -22,7 +22,7 @@ body.dark .narrating { z-index: -1; border-bottom-style: solid; border-bottom-width: 7px; - transition: left 0.1s ease; + transition: left 0.1s ease, width 0.1s ease; } .narrating > .narrate-word-highlight { diff --git a/arc-firefox-theme/chrome/global/notification.css b/arc-firefox-theme/chrome/global/notification.css index 2e57051..a9e3ea8 100644 --- a/arc-firefox-theme/chrome/global/notification.css +++ b/arc-firefox-theme/chrome/global/notification.css @@ -73,10 +73,27 @@ notification[type="critical"] { padding-right: 11px; } -/* Popup notification */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +.popup-notification-body-container { + padding: var(--arrowpanel-padding); +} + +.popup-notification-icon { + width: 32px; + height: 32px; + margin-inline-end: var(--arrowpanel-padding); +} .popup-notification-body { - max-width: 25em; + width: 25em; +} + +.popup-notification-closebutton { + margin-inline-end: -8px; + margin-top: -8px; } .popup-notification-origin:not([value]), @@ -93,14 +110,106 @@ notification[type="critical"] { } .popup-notification-button-container { - margin-top: 17px; + background-color: var(--arrowpanel-dimmed); + display: flex; } -.popup-notification-closebutton { - margin-inline-end: -10px; - margin-top: -6px; +.popup-notification-button-container > toolbarseparator { + -moz-appearance: none; + border: 0; + border-left: 1px solid var(--panel-separator-color); + margin: 7px 0 7px; + min-width: 0; +} + +.popup-notification-button-container:hover > toolbarseparator { + margin: 0; +} + +.popup-notification-button { + flex: 1; + -moz-appearance: none; + background-color: transparent; + color: inherit; + margin: 0; + padding: 0; + min-width: 0; + min-height: 41px; + border: none; + border-top: 1px solid var(--panel-separator-color); +} + +.popup-notification-button:hover:not([disabled]) { + background-color: var(--arrowpanel-dimmed); +} + +.popup-notification-button:hover:active:not([disabled]) { + background-color: var(--arrowpanel-dimmed-further); + box-shadow: 0 1px 0 hsla(210,4%,10%,.05) inset; +} + +.popup-notification-button[disabled] { + background-color: var(--arrowpanel-dimmed-further); + color: graytext; + /* the !important is to override the button[disabled] settings in + * windows/linux button.css */ + -moz-border-top-colors: var(--panel-separator-color) !important; +} + +.popup-notification-button[default] { + flex: 0 50%; +} + +.popup-notification-button[default]:not([disabled]) { + background-color: #0996f8; + color: white; +} + +.popup-notification-button[default]:hover:not([disabled]) { + background-color: #0675d3; +} + +.popup-notification-button[default]:hover:active:not([disabled]) { + background-color: #0568ba; +} + +.popup-notification-button[anonid="secondarybutton"][hidden="true"] ~ .popup-notification-button[default] { + flex: 1; +} + +.popup-notification-button > .button-box { + padding: 0; + margin: 0; + /* prevent double border on windows when focused */ + border: none; +} + +.popup-notification-dropmarker { + flex: none; + padding: 0 15px; +} + +.popup-notification-dropmarker > .button-box > hbox { + display: none; +} + +.popup-notification-dropmarker > .button-box > .button-menu-dropmarker { + /* This is to override the linux !important */ + -moz-appearance: none !important; + display: -moz-box; + padding: 0; + margin: 0; +} + +.popup-notification-dropmarker > .button-box > .button-menu-dropmarker > .dropmarker-icon { + width: 16px; + height: 16px; + list-style-image: url(chrome://global/skin/icons/menubutton-dropmarker.svg); + filter: url(chrome://global/skin/filters.svg#fill); + fill: currentColor; } -.popup-notification-menubutton > .button-menubutton-button[disabled] { - opacity: 0.5; +.popup-notification-button:-moz-focusring { + outline: 1px -moz-dialogtext dotted; + outline-offset: -5px; } diff --git a/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-Arrow.svg b/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-Arrow.svg index 837392f..9c66311 100644 --- a/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-Arrow.svg +++ b/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-Arrow.svg @@ -1,8 +1,8 @@ - - - - - - + + + + + + diff --git a/arc-firefox-theme/chrome/global/timepicker.css b/arc-firefox-theme/chrome/global/timepicker.css deleted file mode 100644 index e8d081b..0000000 --- a/arc-firefox-theme/chrome/global/timepicker.css +++ /dev/null @@ -1,153 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -:root { - --font-size-default: 1.1rem; - --spinner-width: 3rem; - --spinner-margin-top-bottom: 0.4rem; - --spinner-item-height: 2.4rem; - --spinner-item-margin-bottom: 0.1rem; - --spinner-button-height: 1.2rem; - --colon-width: 2rem; - --day-period-spacing-width: 1rem; - - --border: 0.1rem solid #D6D6D6; - --border-radius: 0.3rem; - - --font-color: #191919; - --fill-color: #EBEBEB; - - --selected-font-color: #FFFFFF; - --selected-fill-color: #0996F8; - - --button-font-color: #858585; - --button-font-color-hover: #4D4D4D; - --button-font-color-active: #191919; - - --disabled-opacity: 0.2; -} - -html { - font-size: 10px; -} - -body { - margin: 0; - color: var(--font-color); - font-size: var(--font-size-default); -} - -#time-picker { - display: flex; - flex-direction: row; - justify-content: space-around; -} - -.spinner-container { - font-family: sans-serif; - display: flex; - flex-direction: column; - width: var(--spinner-width); -} - -.spinner-container > button { - -moz-appearance: none; - border: none; - background: none; - background-color: var(--button-font-color); - height: var(--spinner-button-height); -} - -.spinner-container > button:hover { - background-color: var(--button-font-color-hover); -} - -.spinner-container > button.active { - background-color: var(--button-font-color-active); -} - -.spinner-container > button.up { - mask: url("chrome://global/skin/icons/find-arrows.svg#glyph-find-previous") no-repeat 50% 50%; -} - -.spinner-container > button.down { - mask: url("chrome://global/skin/icons/find-arrows.svg#glyph-find-next") no-repeat 50% 50%; -} - -.spinner-container.hide-buttons > button { - visibility: hidden; -} - -.spinner-container > .spinner { - position: relative; - width: 100%; - margin: var(--spinner-margin-top-bottom) 0; - cursor: default; - overflow-y: scroll; - scroll-snap-type: mandatory; - scroll-snap-points-y: repeat(100%); -} - -.spinner-container > .spinner > div { - box-sizing: border-box; - position: relative; - text-align: center; - padding: calc((var(--spinner-item-height) - var(--font-size-default)) / 2) 0; - margin-bottom: var(--spinner-item-margin-bottom); - height: var(--spinner-item-height); - -moz-user-select: none; - scroll-snap-coordinate: 0 0; -} - -.spinner-container > .spinner > div:hover::before { - background: var(--fill-color); - border: var(--border); - border-radius: var(--border-radius); - content: ""; - position: absolute; - top: 0%; - bottom: 0%; - left: 0%; - right: 0%; - z-index: -10; -} - -.spinner-container > .spinner:not(.scrolling) > div.selection { - color: var(--selected-font-color); -} - -.spinner-container > .spinner > div.selection::before { - background: var(--selected-fill-color); - border: none; - border-radius: var(--border-radius); - content: ""; - position: absolute; - top: 0%; - bottom: 0%; - left: 0%; - right: 0%; - z-index: -10; -} - -.spinner-container > .spinner > div.disabled::before, -.spinner-container > .spinner.scrolling > div.selection::before, -.spinner-container > .spinner.scrolling > div:hover::before { - display: none; -} - -.spinner-container > .spinner > div.disabled { - opacity: var(--disabled-opacity); -} - -.colon { - display: flex; - justify-content: center; - align-items: center; - width: var(--colon-width); - margin-bottom: 0.3rem; -} - -.spacer { - width: var(--day-period-spacing-width); -} \ No newline at end of file -- cgit v1.2.3