From: Robert Kaiser Date: Wed, 27 Apr 2016 14:21:26 +0000 (+0200) Subject: seventh part of syncing LCARStrek with Firefox 42-44 windows theme changes X-Git-Tag: LCARStrek-2.41~11 X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=fa703ff4868b5400c27aa76a4c65219d297a2431;p=themes.git seventh part of syncing LCARStrek with Firefox 42-44 windows theme changes --- diff --git a/LCARStrek/browser/aboutCertError.css b/LCARStrek/browser/aboutCertError.css index 29b53514..1abab09e 100644 --- a/LCARStrek/browser/aboutCertError.css +++ b/LCARStrek/browser/aboutCertError.css @@ -2,96 +2,97 @@ * 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://global/skin/in-content/common.css"); -html { - background: #000000; +body { + display: flex; + box-sizing: border-box; + min-height: 100vh; + padding: 0 48px; + align-items: center; + justify-content: center; } -body { - margin: 0; - padding: 0 1em; - color: #FF9F00; - font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; +#errorPageContainer { + position: relative; + min-width: 320px; + max-width: 512px; } -h1 { - margin: 0 0 .6em; - border-bottom: 1px solid #008484; - font-size: 160%; - color: #FF0000; +#errorTitle { + background: url("chrome://browser/skin/cert-error.svg") left 0 no-repeat; + background-size: 3em; + margin-inline-start: -5em; + padding-inline-start: 5em; } -h2 { - font-size: 130%; - background-color: #9C9CFF; - color: #000000; - border-radius: 10px; - -moz-padding-start: 10px; +#errorTitle:-moz-dir(rtl) { + background-position: right 0; } -#errorPageContainer { - position: relative; - min-width: 13em; - max-width: 52em; - margin: 4em auto; - border: 2px solid #FFCF00; - border-radius: 10px; - padding: 3em; - -moz-padding-start: 30px; - background: url("chrome://global/skin/icons/sslWarning.png") left 0 no-repeat #000000; - background-origin: content-box; +#errorTitleText { + border-bottom: 1px solid #A09090; + padding-bottom: 0.4em; } -#errorPageContainer:-moz-dir(rtl) { - background-position: right 0; +@media (max-width: 675px) { + #errorTitle { + padding-top: 0; + background-image: none; + margin-inline-start: 0; + padding-inline-start: 0; + } } -#errorTitle { - -moz-margin-start: 80px; +#buttonContainer { + display: flex; + flex-flow: row wrap; } -#errorLongContent { - -moz-margin-start: 80px; +#buttonSpacer { + flex: 1; } -#getMeOutOfHereButton, -#exceptionDialogButton { - border-radius: 10px; - background: #C09070; - color: #000000; - border: none; - padding: 0 .5em; +/* Pressing the retry button will cause the cursor to flicker from a pointer to + * not-allowed. Override the disabled cursor behaviour since we will never show + * the button disabled as the initial state. Remove this in Bug 1219861. */ +button:disabled { + cursor: pointer; } -.expander > button { - -moz-padding-start: 22px; - -moz-margin-start: -22px; - border-radius: 10px; - background: url("chrome://global/skin/tree/twisty-open-selected.gif") 3px center no-repeat; +#returnButton { + background-color: var(--in-content-primary-button-background); border: none; - font: inherit; - color: inherit; - cursor: pointer; + color: var(--in-content-selected-text); + min-width: 250px; + margin-inline-start: 0; +} + +#returnButton:hover { + background-color: var(--in-content-primary-button-background-hover) !important; } -#getMeOutOfHereButton:hover, -#exceptionDialogButton:hover, -.expander:hover, -.expander:hover > button, -.expander > button:hover, -.expander > button:hover:active { - background-color: #FFCF00; - color: #000000; +#returnButton:hover:active { + background-color: var(--in-content-primary-button-background-active) !important; } -.expander > button:-moz-dir(rtl) { - background-position: right center; +#advancedButton { + min-width: 150px; } -.expander[collapsed] > button { - background-image: url("chrome://global/skin/tree/twisty-closed-selected.gif"); +/* Advanced section is hidden via inline styles until the link is clicked */ +#advancedPanel { + background-color: #000000; + color: var(--in-content-text-color); + border: 1px #A09090 solid; + /* Don't use top padding because the default p style has top padding, and it + * makes the overall div look uneven */ + padding: 0 12px 10px; + margin-top: 10px; +/* box-shadow: 0 0 4px #ddd;*/ + font-size: 0.9em; } -.expander[collapsed] > button:-moz-dir(rtl) { - background-image: url("chrome://global/skin/tree/twisty-closed-rtl-selected.gif"); +.hostname { + font-weight: bold; } diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 32c4d9c7..3418f254 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -512,7 +512,7 @@ menuitem.bookmark-item { #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, - #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, + #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #loop-button, #pocket-button), #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { list-style-image: url("chrome://browser/skin/ToolbarFx.png"); @@ -910,14 +910,6 @@ toolbar[brighttext] #pocket-button, transform: scaleX(-1); } -#web-apps-button[cui-areatype="toolbar"] { - -moz-image-region: rect(0, 720px, 18px, 702px); -} - -#web-apps-button[cui-areatype="toolbar"]:hover { - -moz-image-region: rect(18px, 720px, 36px, 702px); -} - #loop-button, #loop-button > .toolbarbutton-badge-stack { list-style-image: url("chrome://browser/skin/loop/toolbarfx.png"); @@ -992,7 +984,7 @@ toolbaritem[sdkstylewidget="true"] > toolbarbutton, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, - #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, + #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #loop-button, #pocket-button)[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, @@ -1000,7 +992,7 @@ toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, # #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, - #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, + #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #loop-button, #pocket-button) { list-style-image: var(--menupanel-list-style-image); } @@ -1288,16 +1280,6 @@ toolbarpaletteitem[place="palette"] > #panic-button:hover, -moz-image-region: rect(32px, 896px, 64px, 864px); } -#web-apps-button[cui-areatype="menu-panel"], -toolbarpaletteitem[place="palette"] > #web-apps-button { - -moz-image-region: rect(0, 928px, 32px, 896px); -} - -#web-apps-button[cui-areatype="menu-panel"]:hover, -toolbarpaletteitem[place="palette"] > #web-apps-button:hover { - -moz-image-region: rect(32px, 928px, 64px, 896px); -} - #webide-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #webide-button { -moz-image-region: rect(0px, 960px, 32px, 928px); @@ -1571,6 +1553,12 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba /* -moz-padding-end: 17px;*/ } +#nav-bar .toolbarbutton-1[type=panel] > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1[type=menu]:not(#PanelUI-menu-button):not(#back-button):not(#forward-button) > .toolbarbutton-icon { + /* horizontal padding + border + icon width */ +/* max-width: 43px;*/ +} + #nav-bar .toolbarbutton-1 > .toolbarbutton-menu-dropmarker { } @@ -1942,6 +1930,9 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, .urlbar-icon { padding: 0 2px; + /* 16x16 icon with border-box sizing */ + width: 20px; + height: 16px; } .search-go-container { @@ -2204,6 +2195,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but list-style-image: url("chrome://browser/skin/identity-secure.svg"); } +.insecureLoginForms > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], .mixedActiveContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { list-style-image: url("chrome://browser/skin/identity-mixed-active-loaded.svg"); } @@ -3188,11 +3180,19 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- */ /* Pinned tabs */ -.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) { +/* +.tabbrowser-tab:-moz-any([image], [pinned]) > .tab-stack > .tab-content[attention]:not([visuallyselected="true"]), +.tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([visuallyselected="true"]) { +*/ +.tabbrowser-tab:-moz-any([image], [pinned]):-moz-any([attention], [titlechanged]):not([visuallyselected="true"]) { background-color: #E7ADE7; } -.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover { +.tab-label[attention]:not([visuallyselected="true"]) { + font-weight: bold; +} + +.tabbrowser-tab[pinned][titlechanged]:not([visuallyselected="true"]):hover { background-color: #3333FF; color: #000000; } @@ -4900,6 +4900,14 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button { transform: none; } +chatbox[src^="about:loopconversation#"] .chat-minimize-button { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-white"); +} + +chatbox[src^="about:loopconversation#"] .chat-swap-button { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-white"); +} + .chat-loop-hangup { list-style-image: url("chrome://browser/skin/social/chat-icons.svg#exit-white"); background-color: #FF0000; @@ -4924,6 +4932,10 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button { cursor: inherit; } +chatbox[src^="about:loopconversation#"] .chat-title { +/* color: white;*/ +} + .chat-titlebar { background-color: #9C9CFF; color: #000000; @@ -4944,6 +4956,11 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button { background-color: #008484; } +chatbox[src^="about:loopconversation#"] > .chat-titlebar { + background-color: #008484; + border-color: #008484; +} + .chat-titlebar > .notification-anchor-icon { margin-left: 2px; margin-right: 2px; @@ -6259,8 +6276,9 @@ menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left { /* margin-top: -4px; */ } -.browser-action-panel > .panel-arrowcontainer > .panel-arrowcontent { +.browser-extension-panel > .panel-arrowcontainer > .panel-arrowcontent { padding: 0; + overflow: hidden; } /* === BEGIN usercontext.inc.css === */ diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index 55caf805..f070827b 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -231,6 +231,10 @@ treecol { margin-right: 4px !important; } +#notificationsPolicyLearnMore { + -moz-margin-start: 1.5em !important; +} + #defaultFontSizeLabel { /* !important needed to override common !important rule */ -moz-margin-start: 4px !important; @@ -340,6 +344,12 @@ description > html|a { margin-bottom: 8px; } +.indent { + /* !important needed to override -moz-margin-start:0 !important; rule + define in common.css for labels - but not in LCARStrek*/ + -moz-margin-start: 33px /*!important*/; +} + .text-link { margin-bottom: 0; } diff --git a/LCARStrek/browser/searchbar.css b/LCARStrek/browser/searchbar.css index a84bb1a6..92b73ddd 100644 --- a/LCARStrek/browser/searchbar.css +++ b/LCARStrek/browser/searchbar.css @@ -94,6 +94,10 @@ border-bottom: none; } +.search-panel-tree { + border-top: 1px solid #A09090 !important; +} + .search-panel-header { font-weight: normal; background-color: #A09090; @@ -103,10 +107,6 @@ color: #000000; } -.search-panel-tree[collapsed=true] + .search-panel-header { - border-top: none; -} - .search-panel-current-input > label { margin: 0 0 !important; } diff --git a/LCARStrek/browser/tabview/tabview.css b/LCARStrek/browser/tabview/tabview.css index 4b9f179a..688ed914 100644 --- a/LCARStrek/browser/tabview/tabview.css +++ b/LCARStrek/browser/tabview/tabview.css @@ -513,7 +513,7 @@ input.name:focus::-moz-placeholder { #search{ width: 100%; - height: 100%; + height: calc(100% - 1.7em - 20px); /* leave room for banner */ } #searchbox{