From: Robert Kaiser Date: Mon, 10 Jul 2017 00:09:20 +0000 (+0200) Subject: first part of syncing LCARStrek with Firefox 55 browser windows theme changes X-Git-Tag: LCARStrek-2.52~6 X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=66b04a0078b6131c940cb08e2cbaf681e7db1cb7;p=themes.git first part of syncing LCARStrek with Firefox 55 browser windows theme changes --- diff --git a/LCARStrek/browser/aboutNetError.css b/LCARStrek/browser/aboutNetError.css index b6d4d63c..3042a671 100644 --- a/LCARStrek/browser/aboutNetError.css +++ b/LCARStrek/browser/aboutNetError.css @@ -162,3 +162,8 @@ span#hostname { white-space: pre-wrap; padding: 1em 0; } + +#cert_domain_link:not([href]) { + color: var(--in-content-page-color); + text-decoration: none; +} diff --git a/LCARStrek/browser/aboutProviderDirectory.css b/LCARStrek/browser/aboutProviderDirectory.css index 7717c43c..444eea2d 100644 --- a/LCARStrek/browser/aboutProviderDirectory.css +++ b/LCARStrek/browser/aboutProviderDirectory.css @@ -7,7 +7,7 @@ body { #message-box { margin-top: 2em; - background: url('chrome://global/skin/icons/information-24.png') no-repeat left 4px; + background: url('chrome://global/skin/icons/info.svg') no-repeat left 4px; padding-inline-start: 30px; } diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 61ea7c6f..e9cb07f3 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -224,7 +224,8 @@ menubar { display: none; } -#navigator-toolbox { +#navigator-toolbox, +#navigator-toolbox > toolbar { } #navigator-toolbox::after { @@ -234,9 +235,6 @@ menubar { /*border-bottom: 1px solid ThreeDShadow;*/ } -#navigator-toolbox > toolbar { -} - #navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme) { } @@ -1635,20 +1633,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but -moz-image-region: rect(1px, 71px, 17px, 55px); } -/* undo close tab menu item */ -#alltabs_undoCloseTab { - list-style-image: url(chrome://browser/skin/undoCloseTab.png); -} - -@media (min-resolution: 1.1dppx) { - #alltabs_undoCloseTab { - list-style-image: url(chrome://browser/skin/undoCloseTab@2x.png); - } - #alltabs_undoCloseTab > .toolbarbutton-icon { - width: 16px; - } -} - /* zoom control text (reset) button special case: */ #nav-bar #zoom-reset-button > .toolbarbutton-text { @@ -3695,6 +3679,15 @@ html|*#webRTC-previewVideo { -moz-image-region: rect(0px, 32px, 16px, 16px); } +/* UPDATE */ + +.popup-notification-icon[popupid="update-available"], +.popup-notification-icon[popupid="update-manual"], +.popup-notification-icon[popupid="update-restart"] { + background: #74BF43 url(chrome://browser/skin/notification-icons.svg#update) no-repeat center; + border-radius: 50%; +} + /* === END notification-icons.inc.css === */ .popup-notification-body[popupid="addon-progress"], diff --git a/LCARStrek/browser/customizableui/panelUI.css b/LCARStrek/browser/customizableui/panelUI.css index 9473d80c..d5731b34 100644 --- a/LCARStrek/browser/customizableui/panelUI.css +++ b/LCARStrek/browser/customizableui/panelUI.css @@ -108,14 +108,31 @@ display: none; } -#PanelUI-menu-button[badge-status="update-succeeded"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { +#PanelUI-menu-button[badge-status="update-available"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, +#PanelUI-menu-button[badge-status="update-manual"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, +#PanelUI-menu-button[badge-status="update-restart"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { background: #008484 url(chrome://browser/skin/update-badge.svg) no-repeat center; - height: 13px; + border-radius: 50%; + box-shadow: none; + border: 1px solid -moz-dialog; + /* "!important" is necessary to override the rule in toolbarbutton.css */ + margin: -9px 0 0 !important; + margin-inline-end: -6px !important; + min-width: 16px; + min-height: 16px; } -#PanelUI-menu-button[badge-status="update-failed"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { - background: #FF0000 url(chrome://browser/skin/update-badge-failed.svg) no-repeat center; - height: 13px; +#PanelUI-update-restart-menu-item::after, +#PanelUI-update-available-menu-item::after, +#PanelUI-update-manual-menu-item::after { + background: #008484 url(chrome://browser/skin/update-badge.svg) no-repeat center; + border-radius: 50%; +} + +#PanelUI-update-restart-menu-item, +#PanelUI-update-available-menu-item, +#PanelUI-update-manual-menu-item { + list-style-image: url(chrome://branding/content/icon16.png); } #PanelUI-menu-button[badge-status="download-warning"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, @@ -447,7 +464,7 @@ toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"] > iframe { #PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-contents-scroller > #PanelUI-contents > .panel-wide-item, #PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-contents-scroller > #PanelUI-contents > .toolbarbutton-1:not([panel-multiview-anchor="true"]), -#PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-update-status, +#PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > .PanelUI-notification-menu-item, #PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-footer-fxa > #PanelUI-fxa-status > #PanelUI-fxa-avatar, #PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-footer-fxa > #PanelUI-fxa-status > #PanelUI-fxa-label, #PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-footer-fxa > #PanelUI-fxa-icon, @@ -579,27 +596,15 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { top: 25%; } -#PanelUI-update-status[update-status]::after, -#PanelUI-footer-addons > toolbarbutton::after { +#PanelUI-footer-addons > toolbarbutton::after, +.PanelUI-notification-menu-item::after { content: ""; - width: 14px; - height: 14px; + width: 16px; + height: 16px; margin-inline-end: 16.5px; - border-radius: 2px; - background-size: contain; display: -moz-box; } -#PanelUI-update-status[update-status="succeeded"]::after { - background-image: url(chrome://browser/skin/update-badge.svg); - background-color: #008484; -} - -#PanelUI-update-status[update-status="failed"]::after { - background-image: url(chrome://browser/skin/update-badge-failed.svg); - background-color: #FF0000; -} - #PanelUI-footer-addons > toolbarbutton { background-color: #A09090; /* Force border to override `#PanelUI-footer-addons > toolbarbutton` selector below */ @@ -661,7 +666,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { /* margin: 0;*/ } -#PanelUI-update-status, +.PanelUI-notification-menu-item, #PanelUI-help, #PanelUI-fxa-label, #PanelUI-fxa-icon, @@ -679,16 +684,13 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { -moz-box-orient: horizontal; } -#PanelUI-update-status { +.PanelUI-notification-menu-item { border-top: 1px solid var(--panel-separator-color); -} - -#PanelUI-update-status { border-bottom: 1px solid transparent; margin-bottom: -1px; } -#PanelUI-update-status > .toolbarbutton-text { +.PanelUI-notification-menu-item > .toolbarbutton-text { width: 0; /* Fancy cropping solution for flexbox. */ } @@ -797,7 +799,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { min-width: 44px; } -#PanelUI-update-status > .toolbarbutton-text, +.PanelUI-notification-menu-item > .toolbarbutton-text, #PanelUI-fxa-label > .toolbarbutton-text, #PanelUI-footer-addons > toolbarbutton > .toolbarbutton-text, #PanelUI-customize > .toolbarbutton-text { @@ -812,7 +814,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { display: none; } -#PanelUI-update-status > .toolbarbutton-icon, +.PanelUI-notification-menu-item > .toolbarbutton-icon, #PanelUI-fxa-label > .toolbarbutton-icon, #PanelUI-fxa-icon > .toolbarbutton-icon, #PanelUI-customize > .toolbarbutton-icon, @@ -841,16 +843,14 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { padding-inline-start: 0px; } -#PanelUI-update-status { +/* descend from #PanelUI-footer to add specificity, or else the + padding-inline-start will be overridden */ +#PanelUI-footer > .PanelUI-notification-menu-item { width: calc(var(--panel-ui-menuPanelWidth) + 30px); padding-inline-start: 15px; border-inline-start-style: none; } -#PanelUI-update-status { - list-style-image: url(chrome://branding/content/icon16.png); -} - #PanelUI-fxa-label, #PanelUI-fxa-icon { list-style-image: url("chrome://browser/skin/syncFx-horizontalbar.png"); @@ -926,6 +926,10 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { margin-left: 28px; } +#PanelUI-remotetabs[mainview] .PanelUI-remotetabs-notabsforclient-label { + margin-left: 32px; +} + .fxaSyncIllustration { width: 180px; height: var(--panel-ui-sync-illustration-height); @@ -1093,33 +1097,16 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { background-color: #FF9F00; } -#PanelUI-update-status { -/* color: black; */ -} - -#PanelUI-update-status[update-status="succeeded"] { +.PanelUI-notification-menu-item { background-color: #008484; color: #000000; } -#PanelUI-update-status[update-status="succeeded"]:not([disabled]):hover { - background-color: #FFCF00; -} - -#PanelUI-update-status[update-status="succeeded"]:not([disabled]):hover:active { - background-color: #FF9F00; -} - -#PanelUI-update-status[update-status="failed"] { - background-color: #FF0000; - color: #000000; -} - -#PanelUI-update-status[update-status="failed"]:not([disabled]):hover { +.PanelUI-notification-menu-item:not([disabled]):hover { background-color: #FFCF00; } -#PanelUI-update-status[update-status="failed"]:not([disabled]):hover:active { +.PanelUI-notification-menu-item:not([disabled]):hover:active { background-color: #FF9F00; } diff --git a/LCARStrek/browser/notification-icons.svg b/LCARStrek/browser/notification-icons.svg index f5ca93d9..3524fa60 100644 --- a/LCARStrek/browser/notification-icons.svg +++ b/LCARStrek/browser/notification-icons.svg @@ -59,6 +59,11 @@ fill: #000000; fill-opacity: 1; } + #update-icon { + stroke: #000000; + stroke-width: 3px; + stroke-linecap: round; + } @@ -77,6 +82,7 @@ + @@ -124,6 +130,7 @@ + diff --git a/LCARStrek/browser/preferences/in-content-old/containers.css b/LCARStrek/browser/preferences/in-content-old/containers.css new file mode 100644 index 00000000..888fb007 --- /dev/null +++ b/LCARStrek/browser/preferences/in-content-old/containers.css @@ -0,0 +1,32 @@ +/* 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/. */ + +@import url("chrome://browser/content/usercontext/usercontext.css"); + +.container-header-links { + margin-block-end: 15px; +} + +[data-identity-icon] { + margin: 0; + margin-inline-end: 16px; +} + +#containersView { + border: 0 none; + background: transparent; +} + +#containersView richlistitem { + margin: 0px; + margin-inline-end: 8px; + padding: 0; + padding-block-end: 8px; + border-block-end: 1px solid var(--in-content-header-border-color); +} + +#containersView richlistitem:last-of-type { + border-block-end: 0 none; + margin-block-end: 8px; +} diff --git a/LCARStrek/browser/preferences/in-content-old/default-profile-image.svg b/LCARStrek/browser/preferences/in-content-old/default-profile-image.svg new file mode 100644 index 00000000..79032c0b --- /dev/null +++ b/LCARStrek/browser/preferences/in-content-old/default-profile-image.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/LCARStrek/browser/preferences/in-content-old/dialog.css b/LCARStrek/browser/preferences/in-content-old/dialog.css new file mode 100644 index 00000000..f2b4e582 --- /dev/null +++ b/LCARStrek/browser/preferences/in-content-old/dialog.css @@ -0,0 +1,72 @@ +/* - 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/. */ + +dialog, +window, +prefpane, +prefwindow, +.windowDialog { + -moz-appearance: none; + background-color: #000000; + color: #FF9F00; + margin: 0; + padding: 0; +} + +.contentPane { + margin: 0; +} + +tabbox { + /* override the rule in certManager.xul */ + margin: 0 0 5px !important; +} + +tabpanels { + font-size: 1em; +} + +tabs, +label, +description, +#useDocumentColors { + margin-right: 4px; + margin-left: 4px; +} + +tree:not(#rejectsTree) { + min-height: 15em; +} + +.actionButtons { + margin: 3px 0 0 !important; +} + +caption { + padding-inline-start: 0; +} + +groupbox { + font-size: 1em; + margin-top: 0; + margin-right: 4px; + margin-left: 4px; + padding-top: 0; + padding-bottom: 5px; +} + +prefpane .groupbox-body { + padding: 0 0 5px; +} + +groupbox description { + margin-right: 0; + margin-left: 0; +} + +/* Create a separate rule to unset these styles on .tree-input instead of + using :not(.tree-input) so the selector specifity doesn't change. */ +textbox.tree-input { + font-size: unset; +} diff --git a/LCARStrek/browser/preferences/in-content-old/favicon.ico b/LCARStrek/browser/preferences/in-content-old/favicon.ico new file mode 100644 index 00000000..19fe85a4 Binary files /dev/null and b/LCARStrek/browser/preferences/in-content-old/favicon.ico differ diff --git a/LCARStrek/browser/preferences/in-content-old/icons.svg b/LCARStrek/browser/preferences/in-content-old/icons.svg new file mode 100644 index 00000000..91b6c63b --- /dev/null +++ b/LCARStrek/browser/preferences/in-content-old/icons.svg @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/preferences/in-content-old/preferences.css b/LCARStrek/browser/preferences/in-content-old/preferences.css new file mode 100644 index 00000000..142ea10d --- /dev/null +++ b/LCARStrek/browser/preferences/in-content-old/preferences.css @@ -0,0 +1,730 @@ +/* - 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/. */ + +/* === BEGIN shared/incontentprefs/preferences.inc.css === */ + +@namespace html "http://www.w3.org/1999/xhtml"; + +.main-content { + padding: 1.5em 0 0; /* That padding needs to match the upper stripe. */ + overflow: auto; + + /* This actually results in two black boxes extending to the right and bottom, + * leaving the LCARS-gray background only in a top stripe and + * a bit larger area on the top left. + * The prefpane will overlay that with the rounded shape we want. */ + background-color: #A09090; + background-position: 3em 1.5em, 0px 5em; + background-image: linear-gradient(0deg, #000, #000), linear-gradient(0deg, #000, #000); + background-repeat: no-repeat; +} + +#mainPrefPane { + padding: 10px 20px 0px; + border-radius: 1em 0 0 0; + background-color: #000000; + + max-width: 800px; + font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; + font-size: 1.25rem; + color: #FF9F00; +} + +* { + -moz-user-select: text; +} + +button, +treecol { + /* override the * rule */ + -moz-user-select: none; +} +/* +#engineList treechildren::-moz-tree-image(engineShown, checked), +#blocklistsTree treechildren::-moz-tree-image(selectionCol, checked) { + list-style-image: url("chrome://global/skin/in-content/check.svg#check"); + width: 21px; + height: 21px; +} + +#engineList treechildren::-moz-tree-image(engineShown, checked, selected), +#blocklistsTree treechildren::-moz-tree-image(selectionCol, checked, selected) { + list-style-image: url("chrome://global/skin/in-content/check.svg#check-inverted"); +} + +#engineList treechildren::-moz-tree-row, +#blocklistsTree treechildren::-moz-tree-row { + min-height: 36px; +} +*/ +#selectionCol { + min-width: 26px; +} + +.learnMore { + margin-inline-start: 10px; + font-weight: normal; + white-space: nowrap; +} + +/* Category List */ + +#categories { + max-height: 100vh; +} + +#categories > scrollbox { + overflow-x: hidden !important; +} + +/** + * We want the last category to always have non-0 getBoundingClientRect().bottom + * so we can use the value to figure out the max-height of the list in + * preferences.js, so use collapse instead of display: none; if it's hidden + */ +#categories > .category[hidden="true"] { + display: -moz-box; + visibility: collapse; +} + +#category-general > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#general"); +} + +#category-general:hover > .category-icon, +#category-general[selected] > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#general-active"); +} + +#category-search > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#search"); +} + +#category-search:hover > .category-icon, +#category-search[selected] > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#search-active"); +} + +#category-content > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#content"); +} + +#category-content:hover > .category-icon, +#category-content[selected] > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#content-active"); +} + +#category-application > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#applications"); +} + +#category-application:hover > .category-icon, +#category-application[selected] > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#applications-active"); +} + +#category-privacy > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#privacy"); +} + +#category-privacy:hover > .category-icon, +#category-privacy[selected] > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#privacy-active"); +} + +#category-security > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#security"); +} + +#category-security:hover > .category-icon, +#category-security[selected] > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#security-active"); +} + +#category-sync > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#sync"); +} + +#category-sync:hover > .category-icon, +#category-sync[selected] > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#sync-active"); +} + +#category-advanced > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#advanced"); +} + +#category-advanced:hover > .category-icon, +#category-advanced[selected] > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content-old/icons.svg#advanced-active"); +} + +@media (max-width: 800px) { + .category-name { + display: none; + } + .help-button { + font-size: 0 !important; + } +} + + +/* header */ + +.header { + display: flex; + align-items: center; + justify-content: space-between; +} + +.header[hidden=true] { + display: none; +} + +#header-advanced { + border-bottom: none; + padding-bottom: 0; +} + +.indent { + margin-top: 7px; + margin-bottom: 7px; +} + +/* General Pane */ + +#startupTable { + border-collapse: collapse; +} + +#startupTable > tr > td { + padding: 0; /* remove the padding from html.css */ +} + +#startupTable > tr:not(:first-child) > td { + padding-top: 0.5em; /* add a spacing between the rows */ +} + +#startupTable > tr > .label-cell { + text-align: end; + width: 0; /* make the column as small as possible */ +} + +#startupTable > tr > .label-cell > label { + white-space: nowrap; +} + +#startupTable > tr > .content-cell > menulist, +#startupTable > tr > .content-cell > textbox { + width: calc(100% - 8px); + margin-left: 4px; + margin-right: 4px; +} + +#startupTable > tr > .homepage-buttons { + display: flex; + flex-wrap: wrap; +} + +#startupTable > tr > .homepage-buttons > .content-cell-item { + flex-grow: 1; +} + +#useFirefoxSync { + font-size: 90%; + margin-inline-end: 8px !important; +} + +#getStarted { + font-size: 90%; +} + +#isNotDefaultLabel { + font-weight: bold; +} + +#browserHomePage:-moz-locale-dir(rtl) input { + unicode-bidi: plaintext; + direction: rtl; +} + +/* Content pane */ +#defaultFontSizeLabel { + /* !important needed to override common !important rule */ + margin-inline-start: 4px !important; +} + +/* Applications Pane Styles */ + +#applicationsContent { + padding: 15px 0; +} + +#filter { + margin-inline-start: 0; +} + +#handlersView { + height: 25em; +} + +#handlersView > richlistitem { + min-height: 36px !important; +} + +.typeIcon { + margin-inline-start: 10px !important; + margin-inline-end: 9px !important; +} + +.actionIcon { + margin-inline-start: 11px !important; + margin-inline-end: 8px !important; +} + +.actionsMenu { + min-height: 36px; +} + +.actionsMenu > menupopup > menuitem { + padding-inline-start: 10px !important; +} + +.actionsMenu > menupopup > menuitem > .menu-iconic-left { + margin-inline-end: 8px !important; +} + +/* Privacy pane */ + +.doNotTrackLearnMore { + margin-inline-start: calc(1em + 30px); + margin-bottom: 1em; + font-weight: normal; +} + +.doNotTrackLearnMore > label { + font-size: 1em !important; + margin-left: 0; +} + +/* 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"]) > #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 { + cursor: pointer; +} + +#noFxaAccount { + padding-top: 15px; +} + +#weavePrefsDeck > vbox > label, +#weavePrefsDeck > vbox > groupbox, +#weavePrefsDeck > vbox > description, +#weavePrefsDeck > vbox > #pairDevice > label, +#weavePrefsDeck > #needsUpdate > hbox > #loginError, +#weavePrefsDeck > #hasFxaAccount > vbox > label, +#weavePrefsDeck > #hasFxaAccount > hbox:not(#tosPP-normal) > label { + /* no margin-inline-start for elements at the begin of a line */ + margin-inline-start: 0; +} + +#advancedPrefs { + padding-bottom: 0; /* no padding needed in inContent prefs */ +} + +#tabsElement { +/* margin-inline-end: 4px; / add the 4px end-margin of other elements */ +} + +.indent { + /* !important needed to override margin-inline-start:0 !important; rule + define in common.css for labels - but not in LCARStrek*/ + margin-inline-start: 33px /*!important*/; +} + +.text-link { + margin-bottom: 0; +} + +#showUpdateHistory { + margin-inline-start: 0; +} + +#fxaProfileImage { + -moz-user-focus: normal; +} + +/** + * Dialog + */ + +#dialogOverlay { + background-color: rgba(0,0,0,0.75); + visibility: hidden; +} + +#dialogBox { + background-color: #000000; + background-clip: content-box; + color: #FF9F00; + /* font-size: 14px; */ + border: 1px solid #9C9CFF; + border-radius: 10px; + display: -moz-box; + margin: 0; + padding-right: 6px; + padding-left: 6px; +} + +#dialogBox[resizable="true"] { + resize: both; + overflow: hidden; + min-height: 20em; + min-width: 66ch; +} + +#dialogBox > .groupbox-title { + margin-inline-start: 0; + margin-inline-end: 0; +/* padding: 3.5px 0; + background-color: #F1F1F1; */ +} + +#dialogTitle { + text-align: center; + -moz-user-select: none; +} + +.close-icon { + background-color: transparent !important; + border: none; + box-shadow: none; + padding: 0; + height: auto; + min-height: 16px; + min-width: 0; +} + +#dialogBox > .groupbox-title > caption { + margin: 0; + border-radius: 1000px; + background-color: #A09090; +} + +#dialogBox > .groupbox-body { + -moz-appearance: none; + padding: 0; +} + +#dialogFrame { + -moz-box-flex: 1; + /* Default dialog dimensions */ + width: 66ch; +} + +.largeDialogContainer.doScroll { + overflow-y: auto; + -moz-box-flex: 1; +} + +/** + * End Dialog + */ + +/** + * Font dialog menulist fixes + */ + +#defaultFontType, +#serif, +#sans-serif, +#monospace { + min-width: 30ch; +} + +/** + * Sync + */ + +#fxaProfileImage { + max-width: 60px; + border-radius: 50%; + list-style-image: url(chrome://browser/skin/fxa/default-avatar.svg); + margin-inline-end: 15px; + image-rendering: -moz-crisp-edges; +} + +#fxaLoginStatus[hasName] #fxaProfileImage { + max-width: 80px; +} + +#fxaProfileImage.actionable { + cursor: pointer; +} + +#fxaProfileImage.actionable:hover { + box-shadow: 0px 0px 0px 1px #FFCF00; +} + +#fxaProfileImage.actionable:hover:active { + box-shadow: 0px 0px 0px 1px #FF9F00; +} + +#noFxaAccount { + /* Overriding the margins from the base preferences.css theme file. + These overrides can be simplified by fixing bug 1027174 */ + margin: 0; + padding-top: 15px; +} + +#fxaContentWrapper { + -moz-box-flex: 1; +} + +#noFxaGroup { + -moz-box-flex: 1; + margin: 0; +} + +#fxaContentWrapper { + padding-right: 15px; +} + +#noFxaGroup > vbox, +#fxaGroup { + -moz-box-align: start; +} + +#fxaSyncEngines > vbox:first-child { + margin-right: 80px; +} + +#fxaSyncComputerName { + margin-inline-start: 0px; + -moz-box-flex: 1; +} + +#tosPP-small-ToS { + margin-bottom: 1em; +} + +#fxaLoginRejectedWarning { + list-style-image: url("chrome://browser/skin/warning.svg"); + margin: 4px 8px 0px 0px; +} + +#noFxaCaption { + font-weight: bold; + margin-bottom: 11px; +} + +#verifiedManage:visited { + color: var(--in-content-link-color); +} + +.fxaSyncIllustration { + margin-top: 35px; +} + +#syncOptions caption { + margin-bottom: 11px; +} + +#fxaSyncComputerName { + margin-left: 0px; +} + +#noFxaDescription { + margin-bottom: 20px !important; +} + +.separator { + border-bottom: 1px solid var(--in-content-header-border-color); +} + +.fxaAccountBox { + border: 1px solid #A09090; + border-radius: 5px; + padding: 14px 20px 14px 14px; +} + +#signedOutAccountBoxTitle { + font-weight: bold; +} + +.fxaAccountBoxButtons { + margin-bottom: 0 !important; + margin-top: 11px; + display: flex; + align-items: center; +} + +.fxaAccountBoxButtons > * { + -moz-box-flex: 1; +} + +.fxaAccountBoxButtons > button { + text-align: center; + padding-left: 11px; + padding-right: 11px; + margin: 0; + min-width: 0; +} + +.fxaAccountBoxButtons > button:first-child { + margin-inline-end: 14px !important; +} + +.fxaSyncIllustration { + width: 231px; +} + +#fxaLoginStatus[hasName] #fxaEmailAddress1 { + font-size: 1.1rem; +} + +#fxaEmailAddress1, +#fxaEmailAddress2, +#fxaEmailAddress3 { + word-break: break-all; +} + +.fxaFirefoxLogo { + list-style-image: url(chrome://browser/skin/fxa/logo.png); + max-width: 64px; + margin-inline-end: 14px; +} + +.fxaMobilePromo { + margin-bottom: 20px; + margin-top: 25px; +} + +#fxaLoginRejectedWarning { + list-style-image: url(chrome://browser/skin/warning.svg); + filter: drop-shadow(0 1px 0 hsla(206, 50%, 10%, .15)); + margin: 4px 8px 0px 0px; +} + +#syncOptions { + margin-bottom: 27.5px; +} + +.androidLink { + background-image: url("chrome://browser/skin/fxa/android.png"); +} + +.iOSLink { + background-image: url("chrome://browser/skin/fxa/ios.png"); +} + +.androidLink, +.iOSLink { + margin: 0 0 0 2px; + padding-left: 28px; + padding-top: 6px; + height: 28px; + background-repeat: no-repeat; + background-size: 24px 28px; +} + +#tosPP-small { + margin-top: 20px; + margin-bottom: 20px; +} + +@media (min-resolution: 1.1dppx) { + .androidLink { + background-image: url("chrome://browser/skin/fxa/android@2x.png"); + } + .iOSLink { + background-image: url("chrome://browser/skin/fxa/ios@2x.png"); + } + .fxaFirefoxLogo { + list-style-image: url(chrome://browser/skin/fxa/logo@2x.png); + } +} + +#updateDeck > hbox > label { + margin-inline-end: 5px ! important; +} + +.update-throbber { + width: 16px; + min-height: 16px; + margin-inline-end: 3px; + list-style-image: url("chrome://global/skin/icons/loading.png"); +} + +@media (min-resolution: 1.1dppx) { + .update-throbber { + list-style-image: url("chrome://global/skin/icons/loading@2x.png"); + } +} + +.help-button { + position: fixed; + left: 3px; + /* Needs to have enough gap from the bottom to not + get behind the status panel (bug 1357841). */ + bottom: 2rem; + font-size: 13px; + line-height: 13px; + height: 14px; + background-position: 5px; + padding-inline-start: 25px; + white-space: nowrap; + background-color: var(--in-content-category-background); + width: auto; + padding-inline-end: 10px; + border: 3px solid black; + border-radius: 0 300px 300px 0; +} + +.help-button:-moz-locale-dir(rtl) { + left: auto; + right: 0; + background-position: right 15px top 0; +} + +.help-button:link, +.help-button:visited { + color: var(--in-content-category-text); + text-decoration: none; +} + +.help-button:hover { + background-image: url("chrome://global/skin/in-content/help-glyph.svg#help-inverted"); + color: var(--in-content-category-text-selected); + background-color: var(--in-content-category-background-hover); + border-color: var(--in-content-category-background-hover); +} + +/* === END shared/incontentprefs/preferences.inc.css === */ + +caption { +} + +.indent-small { + margin-inline-start: 10px; +} + +@media (min-resolution: 2dppx) { + checkbox:hover::before, + checkbox[checked]::before { + } + + checkbox[checked]::before { + } +} diff --git a/LCARStrek/browser/preferences/in-content-old/search.css b/LCARStrek/browser/preferences/in-content-old/search.css new file mode 100644 index 00000000..66ccebdd --- /dev/null +++ b/LCARStrek/browser/preferences/in-content-old/search.css @@ -0,0 +1,42 @@ +/* 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/. */ + +#defaultEngine { +} + +#defaultEngine > .menulist-label-box > .menulist-icon { + height: 16px; +} + +/* work around a display: none in Linux's menu.css, see bug 1112310 */ +.searchengine-menuitem > .menu-iconic-left { + display: -moz-box; +} + +#engineList { + margin: .5em 2px; +} + +#engineList treechildren::-moz-tree-image(engineName) { + margin-inline-end: 10px; + margin-inline-start: 1px; + width: 16px; + height: 16px; +} + +#engineList treechildren::-moz-tree-drop-feedback { + background-color: #008484; + width: 10000px; /* 100% doesn't work; 10k is hopefully larger than any window + we may have, overflow isn't visible. */ + height: 2px; + margin-inline-start: 0; +} + +#engineShown { + min-width: 26px; +} + +#addEnginesBox { + margin-bottom: 1em; +} diff --git a/LCARStrek/browser/preferences/in-content-old/siteDataSettings.css b/LCARStrek/browser/preferences/in-content-old/siteDataSettings.css new file mode 100644 index 00000000..d5adbc62 --- /dev/null +++ b/LCARStrek/browser/preferences/in-content-old/siteDataSettings.css @@ -0,0 +1,38 @@ +/* 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/. */ + +/** + * Site Data - Settings dialog + */ +#sitesList { + min-height: 20em; +} + +.item-box { + padding: 5px 8px; +} + +/** + * Confirmation dialog of removing sites selected + */ +#SiteDataRemoveSelectedDialog { + padding: 16px; +} + +#contentContainer { + font-size: 1.2em; + margin-bottom: 10px; +} + +.question-icon { + margin: 6px; +} + +#removing-label { + font-weight: bold; +} + +#sitesTree { + height: 15em; +} diff --git a/LCARStrek/browser/preferences/in-content/icons.svg b/LCARStrek/browser/preferences/in-content/icons.svg index 91b6c63b..4ddb4101 100644 --- a/LCARStrek/browser/preferences/in-content/icons.svg +++ b/LCARStrek/browser/preferences/in-content/icons.svg @@ -21,43 +21,64 @@ - - - - - - - - - + - - + + + + + - - - - - - + + diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index 4ed9cc01..c8cd2a5c 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -97,48 +97,21 @@ treecol { list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#general-active"); } -#category-search > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#search"); -} - -#category-search:hover > .category-icon, -#category-search[selected] > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#search-active"); -} - -#category-content > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#content"); -} - -#category-content:hover > .category-icon, -#category-content[selected] > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#content-active"); -} - #category-application > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#applications"); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#content"); } #category-application:hover > .category-icon, #category-application[selected] > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#applications-active"); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#content-active"); } #category-privacy > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#privacy"); + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#security"); } #category-privacy:hover > .category-icon, #category-privacy[selected] > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#privacy-active"); -} - -#category-security > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#security"); -} - -#category-security:hover > .category-icon, -#category-security[selected] > .category-icon { list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#security-active"); } @@ -160,6 +133,14 @@ treecol { list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#advanced-active"); } +#category-search-results > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#searchResults"); +} + +#category-search-results > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#searchResults-active"); +} + @media (max-width: 800px) { .category-name { display: none; @@ -249,7 +230,6 @@ treecol { direction: rtl; } -/* Content pane */ #defaultFontSizeLabel { /* !important needed to override common !important rule */ margin-inline-start: 4px !important; diff --git a/LCARStrek/browser/undoCloseTab.png b/LCARStrek/browser/undoCloseTab.png deleted file mode 100644 index 44c62158..00000000 Binary files a/LCARStrek/browser/undoCloseTab.png and /dev/null differ diff --git a/LCARStrek/browser/undoCloseTab@2x.png b/LCARStrek/browser/undoCloseTab@2x.png deleted file mode 100644 index 3275f4f0..00000000 Binary files a/LCARStrek/browser/undoCloseTab@2x.png and /dev/null differ diff --git a/LCARStrek/browser/update-badge.svg b/LCARStrek/browser/update-badge.svg index 3a910142..b3f23079 100644 --- a/LCARStrek/browser/update-badge.svg +++ b/LCARStrek/browser/update-badge.svg @@ -2,5 +2,7 @@ - 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/. --> - + + +