From: Robert Kaiser Date: Fri, 15 May 2015 20:35:50 +0000 (+0200) Subject: third part of syncing LCARStrek with Firefox 38 windows theme changes X-Git-Tag: LCARStrek-2.35~2 X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=e184b6619b56a4a97edc2b1f31c778bfebacf421;p=themes.git third part of syncing LCARStrek with Firefox 38 windows theme changes --- diff --git a/LCARStrek/browser/aboutSessionRestore.css b/LCARStrek/browser/aboutSessionRestore.css index c6db9975..9efe8d3d 100644 --- a/LCARStrek/browser/aboutSessionRestore.css +++ b/LCARStrek/browser/aboutSessionRestore.css @@ -9,7 +9,7 @@ treechildren::-moz-tree-image(icon), treechildren::-moz-tree-image(noicon) { padding-right: 2px; - margin: 0px 2px; + margin: 0 2px; width: 16px; height: 16px; } diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 2d5f38cd..54925844 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -2839,12 +2839,6 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { color: #000000; } -/* Handle a case where the last separator in a customized tab bar with a - separated new tab button causes the width of the tab to extend and causes - jittering with a small tab curve width (Bug 1111091). */ -#TabsToolbar[currentset]:not([currentset*="tabbrowser-tabs,new-tab-button"]) #tabbrowser-tabs:not([overflow]) > .tabbrowser-tab[last-visible-tab]:not([selected]):not([beforehovered]):not(:hover)::after { -} - /* New tab button */ .tabs-newtab-button { @@ -3526,6 +3520,18 @@ notification[value="translation"] { -moz-appearance: none; } +/* Loop/ Hello browser styles */ + +notification[value="loop-sharing-notification"] .button-menubutton-button { + min-width: 0; + border: 0; + margin: 0; +} + +notification[value="loop-sharing-notification"] .messageImage { + list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png); +} + /* Bookmarks roots menu-items */ #subscribeToPageMenuitem:not([disabled]), #subscribeToPageMenupopup, @@ -4758,6 +4764,17 @@ notification.pluginVulnerable .messageImage { list-style-image: url("chrome://browser/skin/drm-icon.svg#chains-pressed"); } +#eme-notification-icon[firstplay=true] { + animation: emeTeachingMoment 0.2s linear 0s 5 normal; +} + +@keyframes emeTeachingMoment { + 0% {transform: translateX(0); } + 25% {transform: translateX(3px) } + 75% {transform: translateX(-3px) } + 100% { transform: translateX(0); } +} + /* === BEGIN customizeMode.inc.css === */ /* Customization mode */ @@ -5483,54 +5500,6 @@ toolbarpaletteitem[place="toolbar"] { color: #000000; } -.SearchHighlight { - -moz-margin-end: 6px; - font-size: 110%; - width: 225px; -} - -.SearchHighlight label, -.SearchHighlight description { - color: #008484; - margin: 0 0 8px 0; - padding: 0; -} - -.SearchHighlightTitle { - font-weight: bold; -} - -.SearchHighlight .dot { - width: 7px; - height: 7px; - background-image: -moz-image-rect(url("chrome://browser/skin/dots.png"), 0, 100%, 100%, 9); - background-size: 7px; - background-position: center center; - background-repeat: no-repeat; - -moz-margin-end: 2px; -} - -.SearchHighlight .dot.filled { - background-image: -moz-image-rect(url("chrome://browser/skin/dots.png"), 0, 7, 100%, 0); -} - -.SearchHighlight button { - margin: 0; - /* On some platforms clicking the button will steal focus from the search box - causing the popup to close. */ - -moz-user-focus: ignore; -} - -@media not all and (max-resolution: 1dppx) { - .SearchHighlight .dot { - background-image: -moz-image-rect(url("chrome://browser/skin/dots@2x.png"), 0, 100%, 100%, 18); - } - - .SearchHighlight .dot.filled { - background-image: -moz-image-rect(url("chrome://browser/skin/dots@2x.png"), 0, 14, 100%, 0); - } -} - /* Notification overrides for Heartbeat UI */ notification.heartbeat { @@ -5762,6 +5731,10 @@ menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left { list-style-image: url("chrome://browser/skin/drm-icon.svg#chains"); } +#context-media-eme-learnmore { + list-style-image: url("chrome://browser/skin/drm-icon.svg#chains"); +} + /* === END contextmenu.inc.css === */ #context-navigation { diff --git a/LCARStrek/browser/devtools/netmonitor.css b/LCARStrek/browser/devtools/netmonitor.css index c6c1860f..ea934644 100644 --- a/LCARStrek/browser/devtools/netmonitor.css +++ b/LCARStrek/browser/devtools/netmonitor.css @@ -436,6 +436,7 @@ box.requests-menu-status[code^="5"] { } .tabpanel-summary-value { + color: inherit; -moz-padding-start: 3px; } @@ -521,10 +522,6 @@ box.requests-menu-status[code^="5"] { overflow: auto; } -#security-error-message { - white-space: pre-wrap; -} - .security-warning-icon { background-image: url("alerticon-warning.png"); background-size: 13px 12px; diff --git a/LCARStrek/browser/devtools/webconsole.css b/LCARStrek/browser/devtools/webconsole.css index 0de17748..a3f4d556 100644 --- a/LCARStrek/browser/devtools/webconsole.css +++ b/LCARStrek/browser/devtools/webconsole.css @@ -301,6 +301,17 @@ a { margin: 0 6px; } +.message[category=network] .xhr { + background-color: var(--theme-body-color-alt); + color: var(--theme-body-background); + border-radius: 3px; + font-weight: bold; + font-size: 10px; + padding: 2px; + line-height: 10px; + -moz-margin-end: 1ex; +} + /* CSS styles */ .webconsole-filter-button[category="css"] > .toolbarbutton-menubutton-button:before { background-image: linear-gradient(#7575BF, #4E4E7F); diff --git a/LCARStrek/browser/dots.png b/LCARStrek/browser/dots.png deleted file mode 100644 index d47b6382..00000000 Binary files a/LCARStrek/browser/dots.png and /dev/null differ diff --git a/LCARStrek/browser/dots@2x.png b/LCARStrek/browser/dots@2x.png deleted file mode 100644 index b7c1aff8..00000000 Binary files a/LCARStrek/browser/dots@2x.png and /dev/null differ diff --git a/LCARStrek/browser/downloads/allDownloadsViewOverlay.css b/LCARStrek/browser/downloads/allDownloadsViewOverlay.css index f4fb871c..1534b699 100644 --- a/LCARStrek/browser/downloads/allDownloadsViewOverlay.css +++ b/LCARStrek/browser/downloads/allDownloadsViewOverlay.css @@ -58,10 +58,14 @@ richlistitem.download:not([selected]):hover { /*** Button icons ***/ +.downloadButton.downloadConfirmBlock, .downloadButton.downloadCancel { -moz-image-region: rect(0px, 16px, 16px, 0px); } +richlistitem.download:hover > .downloadButton.downloadConfirmBlock, +richlistitem.download:hover > .downloadButton.downloadConfirmBlock:hover, +richlistitem.download:hover > .downloadButton.downloadConfirmBlock:active, richlistitem.download:hover > .downloadButton.downloadCancel, richlistitem.download:hover > .downloadButton.downloadCancel:hover, richlistitem.download:hover > .downloadButton.downloadCancel:active { @@ -88,6 +92,10 @@ richlistitem.download:hover > .downloadButton.downloadRetry:active { -moz-image-region: rect(32px, 32px, 48px, 16px); } +richlistitem.download[selected] > .downloadButton.downloadConfirmBlock, +richlistitem.download[selected]:hover > .downloadButton.downloadConfirmBlock, +richlistitem.download[selected]:hover > .downloadButton.downloadConfirmBlock:hover, +richlistitem.download[selected]:hover > .downloadButton.downloadConfirmBlock:active, richlistitem.download[selected] > .downloadButton.downloadCancel, richlistitem.download[selected]:hover > .downloadButton.downloadCancel, richlistitem.download[selected]:hover > .downloadButton.downloadCancel:hover, diff --git a/LCARStrek/browser/downloads/downloads.css b/LCARStrek/browser/downloads/downloads.css index e90d51e0..c27b724a 100644 --- a/LCARStrek/browser/downloads/downloads.css +++ b/LCARStrek/browser/downloads/downloads.css @@ -176,9 +176,13 @@ richlistitem[type="download"]:first-child { /*** Button icons ***/ +.downloadButton.downloadConfirmBlock, .downloadButton.downloadCancel { -moz-image-region: rect(0px, 16px, 16px, 0px); } +richlistitem[type="download"]:hover > stack > .downloadButton.downloadConfirmBlock, +richlistitem[type="download"]:hover > stack > .downloadButton.downloadConfirmBlock:hover, +richlistitem[type="download"]:hover > stack > .downloadButton.downloadConfirmBlock:active, richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel, richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel:hover, richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel:active { diff --git a/LCARStrek/browser/preferences/in-content/icons.png b/LCARStrek/browser/preferences/in-content/icons.png deleted file mode 100644 index 44f2b8dc..00000000 Binary files a/LCARStrek/browser/preferences/in-content/icons.png and /dev/null differ diff --git a/LCARStrek/browser/preferences/in-content/icons.svg b/LCARStrek/browser/preferences/in-content/icons.svg new file mode 100644 index 00000000..a7fab808 --- /dev/null +++ b/LCARStrek/browser/preferences/in-content/icons.svg @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/preferences/in-content/icons@2x.png b/LCARStrek/browser/preferences/in-content/icons@2x.png deleted file mode 100644 index 9df30050..00000000 Binary files a/LCARStrek/browser/preferences/in-content/icons@2x.png and /dev/null differ diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index 8a37aff2..ecfb6bab 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -104,79 +104,78 @@ treecol { .category-icon { width: 24px; height: 24px; - list-style-image: url("chrome://browser/skin/preferences/in-content/icons.png"); } #category-general > .category-icon { - -moz-image-region: rect(0, 24px, 24px, 0); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#general"); } #category-general:hover > .category-icon, #category-general[selected] > .category-icon { - -moz-image-region: rect(24px, 24px, 48px, 0); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#general-active"); } #category-search > .category-icon { - -moz-image-region: rect(0, 192px, 24px, 168px); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#search"); } #category-search:hover > .category-icon, #category-search[selected] > .category-icon { - -moz-image-region: rect(24px, 192px, 48px, 168px); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#search-active"); } #category-content > .category-icon { - -moz-image-region: rect(0, 48px, 24px, 24px) + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#content"); } #category-content:hover > .category-icon, #category-content[selected] > .category-icon { - -moz-image-region: rect(24px, 48px, 48px, 24px); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#content-active"); } #category-application > .category-icon { - -moz-image-region: rect(0, 72px, 24px, 48px) + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#applications"); } #category-application:hover > .category-icon, #category-application[selected] > .category-icon { - -moz-image-region: rect(24px, 72px, 48px, 48px); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#applications-active"); } #category-privacy > .category-icon { - -moz-image-region: rect(0, 96px, 24px, 72px) + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#privacy"); } #category-privacy:hover > .category-icon, #category-privacy[selected] > .category-icon { - -moz-image-region: rect(24px, 96px, 48px, 72px); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#privacy-active"); } #category-security > .category-icon { - -moz-image-region: rect(0, 120px, 24px, 96px) + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#security"); } #category-security:hover > .category-icon, #category-security[selected] > .category-icon { - -moz-image-region: rect(24px, 120px, 48px, 96px); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#security-active"); } #category-sync > .category-icon { - -moz-image-region: rect(0, 144px, 24px, 120px); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#sync"); } #category-sync:hover > .category-icon, #category-sync[selected] > .category-icon { - -moz-image-region: rect(24px, 144px, 48px, 120px); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#sync-active"); } #category-advanced > .category-icon { - -moz-image-region: rect(0, 168px, 24px, 144px) + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#advanced"); } #category-advanced:hover > .category-icon, #category-advanced[selected] > .category-icon { - -moz-image-region: rect(24px, 168px, 48px, 144px); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#advanced-active"); } @media (max-width: 800px) { @@ -296,6 +295,20 @@ treecol { -moz-margin-end: 8px !important; } +/* Collapse the non-active vboxes in decks to use only the height the + active vbox needs */ +#historyPane:not([selectedIndex="1"]) > #historyDontRememberPane, +#historyPane:not([selectedIndex="2"]) > #historyCustomPane, +#weavePrefsDeck:not([selectedIndex="1"]) > #hasAccount, +#weavePrefsDeck:not([selectedIndex="2"]) > #needsUpdate, +#weavePrefsDeck:not([selectedIndex="3"]) > #fxaDeterminingStatus, +#weavePrefsDeck:not([selectedIndex="4"]) > #noFxaAccount, +#weavePrefsDeck:not([selectedIndex="5"]) > #hasFxaAccount, +#fxaLoginStatus:not([selectedIndex="1"]) > #fxaLoginUnverified, +#fxaLoginStatus:not([selectedIndex="2"]) > #fxaLoginRejected { + visibility: collapse; +} + /* XXX This style is for bug 740213 and should be removed once that bug has a solution. */ description > html|a { @@ -327,10 +340,6 @@ description > html|a { /* -moz-margin-end: 4px; / add the 4px end-margin of other elements */ } -#encryptionPanel { - margin-top: 15px; -} - #telemetryLearnMore, #FHRLearnMore, #crashReporterLearnMore { @@ -351,6 +360,10 @@ description > html|a { } } +#showUpdateHistory { + -moz-margin-start: 0; +} + /** * Dialog */ @@ -418,6 +431,11 @@ description > html|a { width: 66ch; } +.largeDialogContainer.doScroll { + overflow-y: auto; + -moz-box-flex: 1; +} + /** * End Dialog */ @@ -460,80 +478,4 @@ caption { checkbox[checked]::before { } - - .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content/icons@2x.png"); - } - - #category-general > .category-icon { - -moz-image-region: rect(0, 48px, 48px, 0); - } - - #category-general:hover > .category-icon, - #category-general[selected] > .category-icon { - -moz-image-region: rect(48px, 48px, 96px, 0); - } - - #category-search > .category-icon { - -moz-image-region: rect(0, 384px, 48px, 336px); - } - - #category-search:hover > .category-icon, - #category-search[selected] > .category-icon { - -moz-image-region: rect(48, 384px, 96px, 336px); - } - - #category-content > .category-icon { - -moz-image-region: rect(0, 96px, 48px, 48px); - } - - #category-content:hover > .category-icon, - #category-content[selected] > .category-icon { - -moz-image-region: rect(48px, 96px, 96px, 48px); - } - - #category-application > .category-icon { - -moz-image-region: rect(0, 144px, 48px, 96px); - } - - #category-application:hover > .category-icon, - #category-application[selected] > .category-icon { - -moz-image-region: rect(48px, 144px, 96px, 96px); - } - - #category-privacy > .category-icon { - -moz-image-region: rect(0, 192px, 48px, 144px); - } - - #category-privacy:hover > .category-icon, - #category-privacy[selected] > .category-icon { - -moz-image-region: rect(48px, 192px, 96px, 144px); - } - - #category-security > .category-icon { - -moz-image-region: rect(0, 240px, 48px, 192px); - } - - #category-security:hover > .category-icon, - #category-security[selected] > .category-icon { - -moz-image-region: rect(48px, 240px, 96px, 192px); - } - - #category-sync > .category-icon { - -moz-image-region: rect(0, 288px, 48px, 240px); - } - - #category-sync:hover > .category-icon, - #category-sync[selected] > .category-icon { - -moz-image-region: rect(48px, 288px, 96px, 240px); - } - - #category-advanced > .category-icon { - -moz-image-region: rect(0, 336px, 48px, 288px); - } - - #category-advanced:hover > .category-icon, - #category-advanced[selected] > .category-icon { - -moz-image-region: rect(48px, 336px, 96px, 288px); - } } diff --git a/LCARStrek/browser/preferences/preferences.css b/LCARStrek/browser/preferences/preferences.css index f72adf12..38742be5 100644 --- a/LCARStrek/browser/preferences/preferences.css +++ b/LCARStrek/browser/preferences/preferences.css @@ -79,6 +79,7 @@ radio[pane=paneSync] { list-style-image: url("chrome://browser/skin/preferences/Options-sync.png") !important; } +/* These lines should be removed as part of fixing bug 1140495 */ label.small { font-size: smaller; } diff --git a/LCARStrek/global/menu/menu-arrow.svg b/LCARStrek/global/menu/menu-arrow.svg new file mode 100644 index 00000000..78b8f3a5 --- /dev/null +++ b/LCARStrek/global/menu/menu-arrow.svg @@ -0,0 +1,29 @@ + + + + + + + + + +