From ded2e0a6111ac1e08e363b5b8de933db90561adb Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 18 Dec 2015 21:44:55 +0100 Subject: update to 44.0b1 --- .../chrome/global/alerts/alert-common.css | 136 +++++++++++++++++++++ arc-firefox-theme/chrome/global/alerts/alert.css | 44 +------ .../chrome/global/alerts/notification-48.png | Bin 2517 -> 0 bytes arc-firefox-theme/chrome/global/findBar.css | 5 + .../chrome/global/icons/loading-inverted.png | Bin 0 -> 7402 bytes .../chrome/global/icons/loading-inverted@2x.png | Bin 0 -> 16131 bytes .../chrome/global/in-content/common.css | 29 +++-- arc-firefox-theme/chrome/global/notification.css | 1 - arc-firefox-theme/chrome/global/toolbarbutton.css | 1 + 9 files changed, 164 insertions(+), 52 deletions(-) create mode 100644 arc-firefox-theme/chrome/global/alerts/alert-common.css delete mode 100644 arc-firefox-theme/chrome/global/alerts/notification-48.png create mode 100644 arc-firefox-theme/chrome/global/icons/loading-inverted.png create mode 100644 arc-firefox-theme/chrome/global/icons/loading-inverted@2x.png (limited to 'arc-firefox-theme/chrome/global') diff --git a/arc-firefox-theme/chrome/global/alerts/alert-common.css b/arc-firefox-theme/chrome/global/alerts/alert-common.css new file mode 100644 index 0000000..af7fd0c --- /dev/null +++ b/arc-firefox-theme/chrome/global/alerts/alert-common.css @@ -0,0 +1,136 @@ +/* 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/. */ + +/* ===== alert.css ===================================================== + == Shared styles specific to the alerts dialog. + ======================================================================= */ + +@import url("chrome://global/skin/"); + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +#alertBox[hasBodyText] > #alertTextBox, +#alertBox[hasOrigin] > #alertTitleBox { + border-bottom: 1px solid ThreeDShadow; +} + +#alertBox[animate] { + animation-timing-function: cubic-bezier(.12,1.23,.48,1.09); +} + +#alertBox[animate][clicked] { + animation-duration: .6s; + animation-name: alert-clicked-animation; +} + +/* This is used if the close button is clicked + before the animation has finished. */ +#alertBox[animate][closing] { + animation-duration: .6s; + animation-name: alert-closing-animation; +} + +@keyframes alert-animation { + from { + opacity: 0; + } + 5% { + opacity: 1; + } + 95% { + opacity: 1; + } + to { + opacity: 0; + } +} + +@keyframes alert-clicked-animation { + to { + opacity: 0; + } +} + +@keyframes alert-closing-animation { + to { + opacity: 0; + } +} + +#alertImage { + width: 64px; +} + +.alertTextBox { + padding-top: 8px; + padding-inline-start: 8px; + /* The text box width is increased to make up for the lack of image when one + is not provided. 319px is the text box width when a picture is present, + 255px, plus the width of the image, 64px. */ + width: 319px; +} + +#alertBox[hasImage] > box > #alertTextBox { + width: 255px; +} + +#alertTextLabel { + padding-inline-end: 8px; +} + +.alertTitle { + -moz-box-flex: 1; + font-weight: bold; + padding: 6px 8px; + width: 255px; +} + +#alertFooter { + -moz-box-align: end; + padding-bottom: 2px; +} + +#alertSourceLabel { + -moz-box-flex: 1; + font-size: 83.334%; + color: GrayText; +} + +#alertSettings { + -moz-appearance: none; + background-color: transparent; + border-width: 0; + border-radius: 20px; + min-width: 0; + list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities"); + margin-inline-end: 0; + margin-bottom: 0; +} + +#alertSettings > .button-box { + padding: 0; +} + +#alertSettings:hover, +#alertSettings[open] { + list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities-inverted"); +} + +#alertSettings:hover { + background-color: rgb(128,128,128); +} + +#alertSettings[open], +#alertSettings:hover:active { + background-color: rgb(102,102,102); +} + +#alertSettings[focusedViaMouse]:-moz-focusring > .button-box { + border-color: transparent; +} + +#alertSettings > .button-box > .button-menu-dropmarker, +#alertSettings > .button-box > .box-inherit > .button-text { + display: none; +} diff --git a/arc-firefox-theme/chrome/global/alerts/alert.css b/arc-firefox-theme/chrome/global/alerts/alert.css index 38d504e..7d09f02 100644 --- a/arc-firefox-theme/chrome/global/alerts/alert.css +++ b/arc-firefox-theme/chrome/global/alerts/alert.css @@ -6,7 +6,7 @@ == Styles specific to the alerts dialog. ======================================================================= */ -@import url("chrome://global/skin/"); +@import url("chrome://global/skin/alerts/alert-common.css"); @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); @@ -15,48 +15,6 @@ background-color: -moz-Dialog; } -.alertImageBox { - padding: 8px 0; - width: 64px; - background-image: linear-gradient(rgba(255,255,255,0.7), rgba(255,255,255,0.6)); - -moz-border-end: 1px solid rgba(0,0,0,.1); -} - -.alertTextBox { - padding: 8px; - -moz-padding-start: 16px; - width: 255px; -} - -.alertTextBox, -.alertCloseBox { - background-image: linear-gradient(rgba(255,255,255,0.2), rgba(255,255,255,0.1)); -} - -#alertNotification[clickable="true"]:hover .alertTextBox, -#alertNotification[clickable="true"]:hover .alertCloseBox { - background-image: linear-gradient(rgba(255,255,255,0.4), rgba(255,255,255,0.3)); -} - -.alertTitle { - font-weight: bold; - font-size: 110%; -} - -#alertImage { - max-width: 48px; - max-height: 48px; - list-style-image: url(chrome://global/skin/alerts/notification-48.png); -} - -#alertNotification[clickable="true"] { - cursor: pointer; -} - -label { - cursor: inherit; -} - .alertCloseButton { -moz-appearance: none; height: 16px; diff --git a/arc-firefox-theme/chrome/global/alerts/notification-48.png b/arc-firefox-theme/chrome/global/alerts/notification-48.png deleted file mode 100644 index 23ab5a0..0000000 Binary files a/arc-firefox-theme/chrome/global/alerts/notification-48.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/findBar.css b/arc-firefox-theme/chrome/global/findBar.css index cb4729a..e70d929 100644 --- a/arc-firefox-theme/chrome/global/findBar.css +++ b/arc-firefox-theme/chrome/global/findBar.css @@ -22,6 +22,11 @@ findbar[hidden] { transition-delay: 0s, 0s, 150ms; } +findbar[noanim] { + transition-duration: 0s !important; + transition-delay: 0s !important; +} + .findbar-container { -moz-padding-start: 8px; padding-top: 4px; diff --git a/arc-firefox-theme/chrome/global/icons/loading-inverted.png b/arc-firefox-theme/chrome/global/icons/loading-inverted.png new file mode 100644 index 0000000..8831a80 Binary files /dev/null and b/arc-firefox-theme/chrome/global/icons/loading-inverted.png differ diff --git a/arc-firefox-theme/chrome/global/icons/loading-inverted@2x.png b/arc-firefox-theme/chrome/global/icons/loading-inverted@2x.png new file mode 100644 index 0000000..b25b445 Binary files /dev/null and b/arc-firefox-theme/chrome/global/icons/loading-inverted@2x.png differ diff --git a/arc-firefox-theme/chrome/global/in-content/common.css b/arc-firefox-theme/chrome/global/in-content/common.css index 5814b1e..575cc32 100644 --- a/arc-firefox-theme/chrome/global/in-content/common.css +++ b/arc-firefox-theme/chrome/global/in-content/common.css @@ -42,7 +42,7 @@ --in-content-help-button-background-active: #eaba00; } -html|body, +html|html, xul|page, xul|window { font: message-box; @@ -405,13 +405,11 @@ xul|button[type="menu"] > xul|menupopup xul|menuseparator { /* textboxes */ -*|textbox { +html|input[type="text"], +html|textarea, +xul|textbox { -moz-appearance: none; - height: 30px; color: var(--in-content-text-color); - line-height: 20px; - padding-right: 10px; - padding-left: 10px; border: 1px solid var(--in-content-box-border-color); -moz-border-top-colors: none !important; -moz-border-right-colors: none !important; @@ -421,12 +419,27 @@ xul|button[type="menu"] > xul|menupopup xul|menuseparator { background-color: var(--in-content-box-background); } -html|textbox:focus, +xul|textbox { + min-height: 30px; + padding-right: 10px; + padding-left: 10px; +} + +html|input[type="text"], +html|textarea { + font-family: inherit; + font-size: inherit; + padding: 5px 10px; +} + +html|input[type="text"]:focus, +html|textarea:focus, xul|textbox[focused] { border-color: var(--in-content-border-focus); } -html|textbox:disabled, +html|input[type="text"]:disabled, +html|textarea:disabled, xul|textbox[disabled="true"] { opacity: 0.5; } diff --git a/arc-firefox-theme/chrome/global/notification.css b/arc-firefox-theme/chrome/global/notification.css index f525710..ffa0607 100644 --- a/arc-firefox-theme/chrome/global/notification.css +++ b/arc-firefox-theme/chrome/global/notification.css @@ -6,7 +6,6 @@ notification { color: -moz-gtk-info-bar-text; - background-color: InfoBackground; -moz-appearance: -moz-gtk-info-bar; text-shadow: none; } diff --git a/arc-firefox-theme/chrome/global/toolbarbutton.css b/arc-firefox-theme/chrome/global/toolbarbutton.css index a62e173..ffaf672 100644 --- a/arc-firefox-theme/chrome/global/toolbarbutton.css +++ b/arc-firefox-theme/chrome/global/toolbarbutton.css @@ -122,6 +122,7 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active { margin: -6px 0 0 !important; -moz-margin-end: -8px !important; min-width: 14px; + max-width: 28px; line-height: 10px; text-align: center; -moz-stack-sizing: ignore; -- cgit v1.2.3 From 95aff996e5d12f1af298d465ef3cd043207fa960 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 22 Jan 2016 14:43:16 +0100 Subject: update to 44.0rc1 --- .../chrome/global/alerts/alert-common.css | 37 +++++++++++++--------- 1 file changed, 22 insertions(+), 15 deletions(-) (limited to 'arc-firefox-theme/chrome/global') diff --git a/arc-firefox-theme/chrome/global/alerts/alert-common.css b/arc-firefox-theme/chrome/global/alerts/alert-common.css index af7fd0c..20d9e7b 100644 --- a/arc-firefox-theme/chrome/global/alerts/alert-common.css +++ b/arc-firefox-theme/chrome/global/alerts/alert-common.css @@ -10,11 +10,6 @@ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -#alertBox[hasBodyText] > #alertTextBox, -#alertBox[hasOrigin] > #alertTitleBox { - border-bottom: 1px solid ThreeDShadow; -} - #alertBox[animate] { animation-timing-function: cubic-bezier(.12,1.23,.48,1.09); } @@ -59,22 +54,30 @@ } #alertImage { - width: 64px; + width: 80px; + height: 80px; + max-width: 80px; + max-height: 80px; + object-fit: scale-down; + margin: 0 7px 7px; } .alertTextBox { - padding-top: 8px; - padding-inline-start: 8px; + padding-top: 4px; /* The text box width is increased to make up for the lack of image when one - is not provided. 319px is the text box width when a picture is present, - 255px, plus the width of the image, 64px. */ - width: 319px; + is not provided. 349px is the text box width when a picture is present, + 255px, plus the width of the image, 80px, and the margins, 7px each. */ + width: 349px; } #alertBox[hasImage] > box > #alertTextBox { width: 255px; } +#alertBox:not([hasImage]) > box > #alertTextBox { + padding-inline-start: 8px; +} + #alertTextLabel { padding-inline-end: 8px; } @@ -82,13 +85,17 @@ .alertTitle { -moz-box-flex: 1; font-weight: bold; - padding: 6px 8px; + padding: 6px 8px 0; width: 255px; } #alertFooter { - -moz-box-align: end; - padding-bottom: 2px; + -moz-box-align: start; +} + +#alertBox:not([hasOrigin]) > box > #alertTextBox, +#alertFooter { + padding-bottom: 5px; } #alertSourceLabel { @@ -103,7 +110,7 @@ border-width: 0; border-radius: 20px; min-width: 0; - list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities"); + list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities-grayscale"); margin-inline-end: 0; margin-bottom: 0; } -- cgit v1.2.3