From 0202d65e3a906b05064ecd0e71e6d68202e8d4f4 Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Mon, 6 Jun 2016 14:31:22 +0200
Subject: update to 47.0rc1
---
.../chrome/global/aboutReaderContent.css | 4 +-
.../chrome/global/aboutReaderControls.css | 56 +------
.../chrome/global/alerts/alert-common.css | 16 ++
.../chrome/global/in-content/common.css | 3 +-
arc-firefox-theme/chrome/global/narrate.css | 11 ++
arc-firefox-theme/chrome/global/narrate/arrow.svg | 3 +
arc-firefox-theme/chrome/global/narrate/back.svg | 15 ++
arc-firefox-theme/chrome/global/narrate/fast.svg | 3 +
.../chrome/global/narrate/forward.svg | 15 ++
.../chrome/global/narrate/narrate.svg | 3 +
arc-firefox-theme/chrome/global/narrate/slow.svg | 6 +
arc-firefox-theme/chrome/global/narrate/start.svg | 3 +
arc-firefox-theme/chrome/global/narrate/stop.svg | 3 +
.../chrome/global/narrateControls.css | 184 +++++++++++++++++++++
.../chrome/global/reader/RM-Add-24x24.svg | 7 -
.../chrome/global/reader/RM-Delete-24x24.svg | 7 -
.../chrome/global/reader/RM-Reading-List-24x24.svg | 12 --
17 files changed, 274 insertions(+), 77 deletions(-)
create mode 100644 arc-firefox-theme/chrome/global/narrate.css
create mode 100644 arc-firefox-theme/chrome/global/narrate/arrow.svg
create mode 100644 arc-firefox-theme/chrome/global/narrate/back.svg
create mode 100644 arc-firefox-theme/chrome/global/narrate/fast.svg
create mode 100644 arc-firefox-theme/chrome/global/narrate/forward.svg
create mode 100644 arc-firefox-theme/chrome/global/narrate/narrate.svg
create mode 100644 arc-firefox-theme/chrome/global/narrate/slow.svg
create mode 100644 arc-firefox-theme/chrome/global/narrate/start.svg
create mode 100644 arc-firefox-theme/chrome/global/narrate/stop.svg
create mode 100644 arc-firefox-theme/chrome/global/narrateControls.css
delete mode 100644 arc-firefox-theme/chrome/global/reader/RM-Add-24x24.svg
delete mode 100644 arc-firefox-theme/chrome/global/reader/RM-Delete-24x24.svg
delete mode 100644 arc-firefox-theme/chrome/global/reader/RM-Reading-List-24x24.svg
(limited to 'arc-firefox-theme/chrome/global')
diff --git a/arc-firefox-theme/chrome/global/aboutReaderContent.css b/arc-firefox-theme/chrome/global/aboutReaderContent.css
index 8412751..94972c5 100644
--- a/arc-firefox-theme/chrome/global/aboutReaderContent.css
+++ b/arc-firefox-theme/chrome/global/aboutReaderContent.css
@@ -55,7 +55,9 @@ ol,
li,
figure,
.wp-caption {
- margin: 0 0 30px 0;
+ margin: -10px -10px 20px -10px;
+ padding: 10px;
+ border-radius: 5px;
}
p > img:only-child,
diff --git a/arc-firefox-theme/chrome/global/aboutReaderControls.css b/arc-firefox-theme/chrome/global/aboutReaderControls.css
index 2af3bef..b640e3c 100644
--- a/arc-firefox-theme/chrome/global/aboutReaderControls.css
+++ b/arc-firefox-theme/chrome/global/aboutReaderControls.css
@@ -120,7 +120,7 @@
padding: 0;
}
-/*======= Font style popup =======*/
+/*======= Popup =======*/
.dropdown-popup {
min-width: 300px;
@@ -136,6 +136,10 @@
box-shadow: 0 1px 12px #666;
}
+.keep-open .dropdown-popup {
+ z-index: initial;
+}
+
.dropdown-popup > hr {
display: none;
}
@@ -154,6 +158,8 @@
display: block;
}
+/*======= Font style popup =======*/
+
#font-type-buttons,
#font-size-buttons,
#color-scheme-buttons {
@@ -274,38 +280,8 @@
background-position: center;
}
-.footer {
- height: 64px;
- background-color: #ebebeb;
- position: absolute;
- left: 0;
- width: 100%;
- text-align: center;
- padding: 12px 0;
- box-sizing: border-box;
- box-shadow: 0 3px 3px -3px rgba(0, 0, 0, 0.35) inset;
-}
-
-.remove-button {
- background-image: url("chrome://global/skin/reader/RM-Delete-24x24.svg");
- margin: 0 auto;
- border: 1px solid #c1c1c1;
- background-position: 10px 7px;
- padding-left: 42px;
- padding-right: 10px;
- border-radius: 2px;
- box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
- font-size: 18px;
-}
-
-
/*======= Toolbar icons =======*/
-/* Android-only controls */
-.share-button {
- display: none;
-}
-
.close-button {
background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg#close");
height: 68px;
@@ -330,21 +306,6 @@
background-image: url("chrome://global/skin/reader/RM-Type-Controls-24x24.svg");
}
-.toggle-button.on {
- background-image: url("chrome://global/skin/reader/RM-Delete-24x24.svg");
-}
-
-.toggle-button {
- background-image: url("chrome://global/skin/reader/RM-Add-24x24.svg");
-}
-
-.list-button {
- background-image: url("chrome://global/skin/reader/RM-Reading-List-24x24.svg");
-}
-.list-button.on {
- background-color: #d9d9d9;
-}
-
.minus-button {
background-image: url("chrome://global/skin/reader/RM-Minus-24x24.svg");
}
@@ -357,7 +318,4 @@
.toolbar {
display: none !important;
}
- .footer {
- display: none !important;
- }
}
diff --git a/arc-firefox-theme/chrome/global/alerts/alert-common.css b/arc-firefox-theme/chrome/global/alerts/alert-common.css
index 20d9e7b..a58388e 100644
--- a/arc-firefox-theme/chrome/global/alerts/alert-common.css
+++ b/arc-firefox-theme/chrome/global/alerts/alert-common.css
@@ -53,6 +53,22 @@
}
}
+#alertIcon {
+ margin-top: 6px;
+ margin-inline-start: 8px;
+ margin-inline-end: 0;
+ margin-bottom: 0;
+ width: 16px;
+ min-height: 16px;
+ max-height: 16px;
+}
+
+@media (resolution: 2dppx) {
+ #alertIcon {
+ image-rendering: -moz-crisp-edges;
+ }
+}
+
#alertImage {
width: 80px;
height: 80px;
diff --git a/arc-firefox-theme/chrome/global/in-content/common.css b/arc-firefox-theme/chrome/global/in-content/common.css
index c78132c..414a9c1 100644
--- a/arc-firefox-theme/chrome/global/in-content/common.css
+++ b/arc-firefox-theme/chrome/global/in-content/common.css
@@ -596,7 +596,8 @@ xul|*.radio-label-box {
background-color: var(--in-content-category-background-hover);
}
-*|*.category[selected] {
+*|*.category[selected],
+*|*.category.selected {
background-color: var(--in-content-category-background-active);
color: var(--in-content-category-text-selected);
-moz-padding-start: 11px; /* compensate the 4px border */
diff --git a/arc-firefox-theme/chrome/global/narrate.css b/arc-firefox-theme/chrome/global/narrate.css
new file mode 100644
index 0000000..3aa8a8a
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/narrate.css
@@ -0,0 +1,11 @@
+body.light .narrating {
+ background-color: #ffc;
+}
+
+body.sepia .narrating {
+ background-color: #e0d7c5;
+}
+
+body.dark .narrating {
+ background-color: #242424;
+}
diff --git a/arc-firefox-theme/chrome/global/narrate/arrow.svg b/arc-firefox-theme/chrome/global/narrate/arrow.svg
new file mode 100644
index 0000000..2fb2141
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/narrate/arrow.svg
@@ -0,0 +1,3 @@
+
diff --git a/arc-firefox-theme/chrome/global/narrate/back.svg b/arc-firefox-theme/chrome/global/narrate/back.svg
new file mode 100644
index 0000000..d29586e
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/narrate/back.svg
@@ -0,0 +1,15 @@
+
diff --git a/arc-firefox-theme/chrome/global/narrate/fast.svg b/arc-firefox-theme/chrome/global/narrate/fast.svg
new file mode 100644
index 0000000..cd25a6a
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/narrate/fast.svg
@@ -0,0 +1,3 @@
+
diff --git a/arc-firefox-theme/chrome/global/narrate/forward.svg b/arc-firefox-theme/chrome/global/narrate/forward.svg
new file mode 100644
index 0000000..53e64e9
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/narrate/forward.svg
@@ -0,0 +1,15 @@
+
diff --git a/arc-firefox-theme/chrome/global/narrate/narrate.svg b/arc-firefox-theme/chrome/global/narrate/narrate.svg
new file mode 100644
index 0000000..597b0a6
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/narrate/narrate.svg
@@ -0,0 +1,3 @@
+
diff --git a/arc-firefox-theme/chrome/global/narrate/slow.svg b/arc-firefox-theme/chrome/global/narrate/slow.svg
new file mode 100644
index 0000000..1892b66
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/narrate/slow.svg
@@ -0,0 +1,6 @@
+
diff --git a/arc-firefox-theme/chrome/global/narrate/start.svg b/arc-firefox-theme/chrome/global/narrate/start.svg
new file mode 100644
index 0000000..95fa713
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/narrate/start.svg
@@ -0,0 +1,3 @@
+
diff --git a/arc-firefox-theme/chrome/global/narrate/stop.svg b/arc-firefox-theme/chrome/global/narrate/stop.svg
new file mode 100644
index 0000000..c017c57
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/narrate/stop.svg
@@ -0,0 +1,3 @@
+
diff --git a/arc-firefox-theme/chrome/global/narrateControls.css b/arc-firefox-theme/chrome/global/narrateControls.css
new file mode 100644
index 0000000..dc24a4c
--- /dev/null
+++ b/arc-firefox-theme/chrome/global/narrateControls.css
@@ -0,0 +1,184 @@
+:scope {
+ --border-color: #e5e5e5;
+}
+
+#narrate-toggle {
+ background-image: url("chrome://global/skin/narrate/narrate.svg");
+}
+
+.dropdown-popup button {
+ background-color: transparent;
+}
+
+.dropdown-popup button:hover:not(:disabled) {
+ background-color: #eaeaea;
+}
+
+.narrate-row {
+ display: flex;
+ align-items: center;
+ min-height: 40px;
+ box-sizing: border-box;
+}
+
+.narrate-row:not(:first-child) {
+ border-top: 1px solid var(--border-color);
+}
+
+/* Control buttons */
+
+#narrate-control > button {
+ background-size: 24px 24px;
+ background-repeat: no-repeat;
+ background-position: center center;
+ height: 64px;
+ width: 100px;
+ border: none;
+ color: #666;
+ box-sizing: border-box;
+}
+
+#narrate-control > button:not(:first-child) {
+ border-left: 1px solid var(--border-color);
+}
+
+#narrate-skip-previous {
+ border-top-left-radius: 3px;
+ background-image: url("chrome://global/skin/narrate/back.svg#enabled");
+}
+
+#narrate-skip-next {
+ border-top-right-radius: 3px;
+ background-image: url("chrome://global/skin/narrate/forward.svg#enabled");
+}
+
+#narrate-skip-previous:disabled {
+ background-image: url("chrome://global/skin/narrate/back.svg#disabled");
+}
+
+#narrate-skip-next:disabled {
+ background-image: url("chrome://global/skin/narrate/forward.svg#disabled");
+}
+
+#narrate-start-stop {
+ background-image: url("chrome://global/skin/narrate/start.svg");
+}
+
+#narrate-start-stop.speaking {
+ background-image: url("chrome://global/skin/narrate/stop.svg");
+}
+
+/* Rate control */
+
+#narrate-rate::before, #narrate-rate::after {
+ content: '';
+ width: 48px;
+ height: 40px;
+ background-position: center;
+ background-repeat: no-repeat;
+ background-size: 24px auto;
+}
+
+#narrate-rate::before {
+ background-image: url("chrome://global/skin/narrate/slow.svg");
+}
+
+#narrate-rate::after {
+ background-image: url("chrome://global/skin/narrate/fast.svg");
+}
+
+#narrate-rate-input {
+ margin: 0 1px;
+ flex-grow: 1;
+}
+
+#narrate-rate-input::-moz-range-track {
+ background-color: #979797;
+ height: 2px;
+}
+
+#narrate-rate-input::-moz-range-progress {
+ background-color: #2EA3FF;
+ height: 2px;
+}
+
+#narrate-rate-input::-moz-range-thumb {
+ background-color: #808080;
+ height: 16px;
+ width: 16px;
+ border-radius: 8px;
+ border-width: 0;
+}
+
+#narrate-rate-input:active::-moz-range-thumb {
+ background-color: #2EA3FF;
+}
+
+/* Voice selection */
+
+.voiceselect {
+ width: 100%;
+}
+
+.voiceselect > button.select-toggle,
+.voiceselect > .options > button.option {
+ -moz-appearance: none;
+ border: none;
+ width: 100%;
+ min-height: 40px;
+}
+
+.voiceselect.open > button.select-toggle {
+ border-bottom: 1px solid var(--border-color);
+}
+
+.voiceselect > button.select-toggle::after {
+ content: '';
+ background-image: url("chrome://global/skin/narrate/arrow.svg");
+ background-position: center;
+ background-repeat: no-repeat;
+ background-size: 12px 12px;
+ display: inline-block;
+ width: 1.5em;
+ height: 1em;
+ vertical-align: middle;
+}
+
+.voiceselect > .options > button.option:not(:first-child) {
+ border-top: 1px solid var(--border-color);
+}
+
+.voiceselect > .options > button.option {
+ box-sizing: border-box;
+}
+
+.voiceselect > .options:not(.hovering) > button.option:focus {
+ background-color: #eaeaea;
+}
+
+.voiceselect > .options:not(.hovering) > button.option:hover:not(:focus) {
+ background-color: transparent;
+}
+
+.voiceselect > .options > button.option::-moz-focus-inner {
+ outline: none;
+ border: 0;
+}
+
+.voiceselect > .options {
+ display: none;
+ overflow-y: auto;
+}
+
+.voiceselect.open > .options {
+ display: block;
+}
+
+.current-voice {
+ color: #7f7f7f;
+}
+
+.voiceselect:not(.open) > button,
+.option:last-child {
+ border-radius: 0 0 3px 3px;
+}
diff --git a/arc-firefox-theme/chrome/global/reader/RM-Add-24x24.svg b/arc-firefox-theme/chrome/global/reader/RM-Add-24x24.svg
deleted file mode 100644
index 2071381..0000000
--- a/arc-firefox-theme/chrome/global/reader/RM-Add-24x24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
diff --git a/arc-firefox-theme/chrome/global/reader/RM-Delete-24x24.svg b/arc-firefox-theme/chrome/global/reader/RM-Delete-24x24.svg
deleted file mode 100644
index 0ed3983..0000000
--- a/arc-firefox-theme/chrome/global/reader/RM-Delete-24x24.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
diff --git a/arc-firefox-theme/chrome/global/reader/RM-Reading-List-24x24.svg b/arc-firefox-theme/chrome/global/reader/RM-Reading-List-24x24.svg
deleted file mode 100644
index b43a8b8..0000000
--- a/arc-firefox-theme/chrome/global/reader/RM-Reading-List-24x24.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
--
cgit v1.2.3