From: Robert Kaiser Date: Tue, 22 Jul 2014 03:09:36 +0000 (+0200) Subject: second part of syncing LCARStrek with Firefox 31 windows theme changes X-Git-Tag: LCARStrek-2.28~6 X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=bb9362a9a645a3ccc0f015cbfe3a1e0054d7157d;p=themes.git second part of syncing LCARStrek with Firefox 31 windows theme changes --- diff --git a/LCARStrek/browser/devtools/app-manager/device.css b/LCARStrek/browser/devtools/app-manager/device.css index bb2c2fd3..0921f8f4 100644 --- a/LCARStrek/browser/devtools/app-manager/device.css +++ b/LCARStrek/browser/devtools/app-manager/device.css @@ -56,6 +56,10 @@ h1 { min-height: 50px; } +#root-actor-debug { + background: #000000; +} + /***************** APP BUTTONS *****************/ diff --git a/LCARStrek/browser/devtools/layoutview.css b/LCARStrek/browser/devtools/layoutview.css index 96d4ddcc..d1f33c07 100644 --- a/LCARStrek/browser/devtools/layoutview.css +++ b/LCARStrek/browser/devtools/layoutview.css @@ -35,3 +35,16 @@ background-color: #A09090; border-color: #A09090; } + +.editable { + border-bottom: 1px dashed transparent; +} + +.editable:hover { + border-bottom-color: #E7ADE7; +} + +.styleinspector-propertyeditor { + border: 1px solid #008484; + padding: 0; +} \ No newline at end of file diff --git a/LCARStrek/browser/devtools/widgets.css b/LCARStrek/browser/devtools/widgets.css index 7fff58c4..b699b78e 100644 --- a/LCARStrek/browser/devtools/widgets.css +++ b/LCARStrek/browser/devtools/widgets.css @@ -511,10 +511,6 @@ color: inherit !important; } -.variable-or-property > .title > .value { - -moz-box-flex: 1; -} - .variable-or-property > .title > .arrow { -moz-margin-start: 3px; } diff --git a/LCARStrek/browser/preferences/in-content/header.png b/LCARStrek/browser/preferences/in-content/header.png new file mode 100644 index 00000000..b38b5f43 Binary files /dev/null and b/LCARStrek/browser/preferences/in-content/header.png differ diff --git a/LCARStrek/browser/preferences/in-content/header@2x.png b/LCARStrek/browser/preferences/in-content/header@2x.png new file mode 100644 index 00000000..e9ce653a Binary files /dev/null and b/LCARStrek/browser/preferences/in-content/header@2x.png differ diff --git a/LCARStrek/browser/preferences/in-content/icons.png b/LCARStrek/browser/preferences/in-content/icons.png new file mode 100644 index 00000000..51c4ac85 Binary files /dev/null and b/LCARStrek/browser/preferences/in-content/icons.png differ diff --git a/LCARStrek/browser/preferences/in-content/icons@2x.png b/LCARStrek/browser/preferences/in-content/icons@2x.png new file mode 100644 index 00000000..1b10091c Binary files /dev/null and b/LCARStrek/browser/preferences/in-content/icons@2x.png differ diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index 3bc88e7b..ac4160cf 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -1,221 +1,623 @@ -/* - 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/. */ - -@import url("chrome://global/skin/inContentUI.css"); - -@namespace html "http://www.w3.org/1999/xhtml"; - -#header { - margin-bottom: 18px; -} - -.indent-small { - -moz-margin-start: 10px; -} - -caption { - font-size: 1.667rem; -} - -.main-content { - max-width: 800px; -} - -prefpane { - padding: 0; -} - -prefpane > .content-box { - overflow: auto; -} - -/* Category List */ - -#categories { - -moz-appearance: none; - border: none; - -moz-margin-end: -1px; - background-color: transparent; - position: relative; - margin-top: 31px; -} - -.category { - -moz-appearance: none; - background-color: transparent; - color: #FF9F00; - padding: 10px 4px; - border-width: 1px; - border-style: solid; - border-color: transparent; - -moz-padding-end: 8px; - -moz-box-align: center; - overflow: hidden; - min-height: 0; - height: 52px; -} - -.category:-moz-locale-dir(ltr) { - border-top-left-radius: 5px; - border-bottom-left-radius: 5px; -} - -.category:-moz-locale-dir(rtl) { - border-top-right-radius: 5px; - border-bottom-right-radius: 5px; -} - -.category[selected] { - background-color: #008484; - color: #FFCF00; - border-color: #9C9CFF; - /* -moz-border-end-color: transparent; */ -} - -.category-name { - font-size: 1.5rem; - -moz-padding-end: 24px; -} - -/* Maximize the size of the viewport when the window is small */ -@media (max-width: 800px) { - .category-name { - display: none; - } -} - -.category-icon { - width: 32px; - height: 32px; - margin: 0 6px; - -moz-margin-start: 6px; - -moz-margin-end: 5px; - list-style-image: url("chrome://browser/skin/preferences/Options.png"); -} - -#category-general > .category-icon { - -moz-image-region: rect(0, 32px, 32px, 0); -} - -#category-content > .category-icon { - -moz-image-region: rect(0, 96px, 32px, 64px) -} - -#category-application > .category-icon { - -moz-image-region: rect(0, 128px, 32px, 96px) -} - -#category-privacy > .category-icon { - -moz-image-region: rect(0, 160px, 32px, 128px) -} - -#category-security > .category-icon { - -moz-image-region: rect(0, 192px, 32px, 160px) -} - -#category-advanced > .category-icon { - -moz-image-region: rect(0, 224px, 32px, 192px) -} - -#category-sync > .category-icon { - list-style-image: url("chrome://browser/skin/preferences/Options-sync.png"); -} - -/* Applications Pane Styles */ - -#applications-content { - padding: 15px; -} - -#handlersView { - border: none; /*1px solid #9C9CFF;*/ - margin: 0; - overflow-y: auto; - border-top-left-radius: 0; - border-top-right-radius: 0; -} - -#handersView > listheader > treecol { - border-radius: 0; -} - -#advancedPrefs { - padding: 0; /* overrides preferences/preferences.css */ -} - -#advancedPrefs > tabs { - -moz-padding-start: 5px; -} - -#advancedPrefs > tabpanels { - border-right: none; - border-left: none; - border-bottom: none; - border-top-left-radius: 0; - border-top-right-radius: 0; -} - -/* XXX This style is for bug 740213 and should be removed once that - bug has a solution. */ -description > html|a { - cursor: pointer; -} - -/* XXX Styles Below can be removed once bug 660726 lands */ -.nav-button { - list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png"); -} - -#forward-btn { - -moz-border-start: none; -} - -#back-btn:-moz-locale-dir(ltr), -#forward-btn:-moz-locale-dir(rtl) { - -moz-image-region: rect(42px 25px 63px 0px); - border-top-right-radius: 0; - border-bottom-right-radius: 0; -} - -#back-btn:not([disabled="true"]):hover:-moz-locale-dir(ltr), -#back-btn:not([disabled="true"]):hover:active:-moz-locale-dir(ltr), -#forward-btn:not([disabled="true"]):hover:-moz-locale-dir(rtl), -#forward-btn:not([disabled="true"]):hover:active:-moz-locale-dir(rtl) { - -moz-image-region: rect(42px 75px 63px 50px); -} - -#back-btn[disabled="true"]:-moz-locale-dir(ltr), -#forward-btn[disabled="true"]:-moz-locale-dir(rtl) { - -moz-image-region: rect(42px 50px 63px 25px); -} - -#back-btn:-moz-locale-dir(rtl), -#forward-btn:-moz-locale-dir(ltr) { - -moz-image-region: rect(63px 25px 84px 0px); - border-top-left-radius: 0; - border-bottom-left-radius: 0; -} - -#back-btn:not([disabled="true"]):hover:-moz-locale-dir(rtl), -#back-btn:not([disabled="true"]):hover:active:-moz-locale-dir(rtl), -#forward-btn:not([disabled="true"]):hover:-moz-locale-dir(ltr), -#forward-btn:not([disabled="true"]):hover:active:-moz-locale-dir(ltr) { - -moz-image-region: rect(63px 75px 84px 50px); -} - -#back-btn[disabled="true"]:-moz-locale-dir(rtl), -#forward-btn[disabled="true"]:-moz-locale-dir(ltr) { - -moz-image-region: rect(63px 50px 84px 25px); -} - -.header-button { -} - -.header-button:not([disabled="true"]):active:hover, -.header-button[open="true"] { -} - -.header-button > .toolbarbutton-text { - display: none; -} +/* - 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/in-content/preferences.css === */ + +@namespace html "http://www.w3.org/1999/xhtml"; + +@font-face { + font-family: "Clear Sans"; + src: url("chrome://browser/skin/fonts/ClearSans-Regular.ttf"); +} + +page { + background-color: #000000; +} + +caption { + -moz-appearance: none; + margin: 0; +} + +.caption-text { + font-size: 1.3rem; + font-weight: bold; + line-height: 22px; + margin: 0 !important; +} + +.main-content { + max-width: 800px; +} + +prefpane > .content-box { + overflow: auto; +} + +prefpane { + padding: 40px 48px 48px; + font-family: "Clear Sans", sans-serif; + font-size: 1.25rem; + line-height: 22px; + color: #000000; +} + +prefpane > .content-box { + overflow: auto; +} + +/* groupboxes */ + +groupbox { +} + +groupbox label { +} + +/* tabpanels and tabs */ + +tabpanels { +} + +tabs { +} + +.tabs-left, +.tabs-right { +} + +tab { +} + +tab[selected] { +} + +.tab-text { +} + +tab:not([selected]):hover > .tab-middle > .tab-text { +} + +tab:not([selected]):hover:active > .tab-middle > .tab-text { +} + +tab[selected] > .tab-middle > .tab-text { +} + +/* buttons and menulists */ + +button, +menulist { +} + +button:not([disabled]):hover, +menulist:not([disabled]):hover { +} + +button:not([disabled]):hover:active, +menulist[open="true"]:not([disabled]) { +} + +button[disabled], +menulist[disabled] { +} + +button > .button-box, +menulist > .menulist-label-box { +} + +button[type="menu"] > .button-box > .button-menu-dropmarker { +} + +.spinbuttons-button { +} + +.spinbuttons-up { +} + +.spinbuttons-down { +} + +.spinbuttons-button > .button-box { +} + +.spinbuttons-up > .button-box > .button-icon { +} + +.spinbuttons-up[disabled] > .button-box > .button-icon { +} + +.spinbuttons-down > .button-box > .button-icon { +} + +.spinbuttons-down[disabled] > .button-box > .button-icon { +} + +menulist:not([editable="true"]) > .menulist-dropmarker { +} + +menulist[disabled]:not([editable="true"]) > .menulist-dropmarker { +} + +menulist > menupopup, +button[type="menu"] > menupopup { +} + +menulist > menupopup menu, +menulist > menupopup menuitem, +button[type="menu"] > menupopup menu, +button[type="menu"] > menupopup menuitem { +} + +menulist > menupopup > menu[_moz-menuactive="true"], +menulist > menupopup > menuitem[_moz-menuactive="true"], +button[type="menu"] > menupopup > menu[_moz-menuactive="true"], +button[type="menu"] > menupopup > menuitem[_moz-menuactive="true"] { +} + +menulist > menupopup menuseparator, +button[type="menu"] > menupopup menuseparator { +} + +/* textboxes */ + +textbox { +} + +textbox[focused] { +} + +textbox[disabled] { +} + +/* Links */ + +.text-link, +.inline-link, +html|a.inline-link { +} + +.text-link:hover, +.inline-link:hover { +} + +.text-link:hover:active, +.inline-link:hover:active { +} + +/* Checkboxes and radio buttons */ + +.checkbox-check { +} + +.checkbox-check[checked] { +} + +checkbox:hover::before, +checkbox[checked]::before { +} + +checkbox[checked]::before { +} + +radio { +} + +.radio-check { +} + +.radio-check[selected] { +} + +radio:hover::before, +radio[selected]::before { +} + +radio[selected]::before { +} + +/* Category List */ + +#categories { + background-color: #A09090; +/* -moz-border-end: 1px solid #FF9F00; */ + padding-top: 39px; + margin: 0; + border-radius: 1em 0 0 0; +} + +.category { + background-color: #000000; + color: #FFCF00; + -moz-border-end-width: 0; + -moz-padding-start: 14px; + -moz-padding-end: 21px; + min-height: 40px; +} + +.category:hover { + background-color: #FFCF00; + color: #000000; +} + +.category[selected] { + background-color: #008484; + color: #000000; +} + +.category-name { + line-height: 22px; + font-family: "Clear Sans", sans-serif; + font-size: 1.25rem; + padding-bottom: 2px; + -moz-padding-start: 9px; + margin: 0; +} + +.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); +} + +#category-general:hover > .category-icon, +#category-general[selected] > .category-icon { + -moz-image-region: rect(24px, 24px, 48px, 0); +} + +#category-content > .category-icon { + -moz-image-region: rect(0, 48px, 24px, 24px) +} + +#category-content:hover > .category-icon, +#category-content[selected] > .category-icon { + -moz-image-region: rect(24px, 48px, 48px, 24px); +} + +#category-application > .category-icon { + -moz-image-region: rect(0, 72px, 24px, 48px) +} + +#category-application:hover > .category-icon, +#category-application[selected] > .category-icon { + -moz-image-region: rect(24px, 72px, 48px, 48px); +} + +#category-privacy > .category-icon { + -moz-image-region: rect(0, 96px, 24px, 72px) +} + +#category-privacy:hover > .category-icon, +#category-privacy[selected] > .category-icon { + -moz-image-region: rect(24px, 96px, 48px, 72px); +} + +#category-security > .category-icon { + -moz-image-region: rect(0, 120px, 24px, 96px) +} + +#category-security:hover > .category-icon, +#category-security[selected] > .category-icon { + -moz-image-region: rect(24px, 120px, 48px, 96px); +} + +#category-sync > .category-icon { + -moz-image-region: rect(0, 144px, 24px, 120px); +} + +#category-sync:hover > .category-icon, +#category-sync[selected] > .category-icon { + -moz-image-region: rect(24px, 144px, 48px, 120px); +} + +#category-advanced > .category-icon { + -moz-image-region: rect(0, 168px, 24px, 144px) +} + +#category-advanced:hover > .category-icon, +#category-advanced[selected] > .category-icon { + -moz-image-region: rect(24px, 168px, 48px, 144px); +} + +/* header */ + +.header { + margin-bottom: 15px; +} + +.header-icon { + width: 40px; + max-height: 40px; + -moz-margin-end: 20px; + list-style-image: url("chrome://browser/skin/preferences/in-content/header.png"); +} + +.header-name { + font-size: 2.5rem; + font-weight: normal; + line-height: 40px; + margin: 0; +} + +#header-general > .header-icon { + -moz-image-region: rect(3px, 45px, 45px, 3px); +} + +#header-content > .header-icon { + -moz-image-region: rect(3px, 93px, 45px, 51px); +} + +#header-application > .header-icon { + -moz-image-region: rect(3px, 141px, 45px, 99px); +} + +#header-privacy > .header-icon { + -moz-image-region: rect(3px, 189px, 45px, 147px); +} + +#header-security > .header-icon { + -moz-image-region: rect(3px, 237px, 45px, 195px); +} + +#header-sync > .header-icon { + -moz-image-region: rect(3px, 285px, 45px, 243px); +} + +#header-advanced > .header-icon { + -moz-image-region: rect(3px, 333px, 45px, 291px); +} + +.indent { + margin-top: 7px; + margin-bottom: 7px; +} + +/* General Pane */ +/* +filefield { + -moz-appearance: none; + background-color: transparent; + border: none; + padding: 0; +} + +.fileFieldContentBox { + background-color: transparent; +} + +.fileFieldIcon { + -moz-margin-start: 10px; + -moz-margin-end: 0; +} + +.fileFieldLabel { + -moz-margin-start: -26px; + -moz-padding-start: 36px; +} +*/ + +/* Applications Pane Styles */ + +#applications-content { + -moz-margin-start: 60px; + padding: 15px; +} + +#handlersView { + font-size: 1.25rem; + line-height: 22px; + border: none; /*1px solid #9C9CFF;*/ + margin: 0; + overflow-y: auto; + border-top-left-radius: 0; + border-top-right-radius: 0; +} + +#handersView > listheader > treecol { + border-radius: 0; +} + +#typeColumn, +#actionColumn { + font-family: "Clear Sans", sans-serif; + line-height: 20px; +/* color: #737980; + height: 36px; + padding: 0 10px; + background-color: #F7F7F7; + border: 1px solid #CCCCCC; + -moz-border-top-colors: none; + -moz-border-right-colors: none; + -moz-border-bottom-colors: none; + -moz-border-left-colors: none; +*/ +} + +#typeColumn:-moz-locale-dir(ltr), +#actionColumn:-moz-locale-dir(rtl) { + border-top-left-radius: 5px; +} + +#typeColumn:-moz-locale-dir(rtl), +#actionColumn:-moz-locale-dir(ltr) { + border-top-right-radius: 5px; +} +/* +#typeColumn:hover, +#actionColumn:hover { + border-color: #737980; +} + +#typeColumn:hover:active, +#actionColumn:hover:active { + padding: 0 10px; + border-color: #0096DC; +} +*/ +#typeColumn > .treecol-sortdirection[sortDirection=ascending], +#actionColumn > .treecol-sortdirection[sortDirection=ascending], +#typeColumn > .treecol-sortdirection[sortDirection=descending], +#actionColumn > .treecol-sortdirection[sortDirection=descending] { +} + +#typeColumn > .treecol-sortdirection[sortDirection=descending], +#actionColumn > .treecol-sortdirection[sortDirection=descending] { +} + +#handlersView > richlistitem { + min-height: 40px !important; +} + +.typeIcon { + -moz-margin-start: 10px !important; + -moz-margin-end: 9px !important; +} + +.actionIcon { + -moz-margin-start: 11px !important; + -moz-margin-end: 8px !important; +} + +.actionsMenu { + height: 40px; + max-height: 40px; +} + +.actionsMenu > menupopup > menuitem { + -moz-padding-start: 10px !important; +} + +.actionsMenu > menupopup > menuitem > .menu-iconic-left { + -moz-margin-end: 8px !important; +} + +/* XXX This style is for bug 740213 and should be removed once that + bug has a solution. */ +description > html|a { + cursor: pointer; +} + +/* Content Pane */ + +#defaultFontSize { + min-width: 5.5em; +} + +/* Sync Pane */ + +#syncEnginesList { +/* -moz-appearance: none; + color: #737980; + padding: 10px; + border: 1px solid rgba(23,50,77,0.4); + border-radius: 5px; + background-color: #F1F1F1;*/ +} + +/* Advanced Pane */ + +#advancedPrefs { + padding-bottom: 0; /* no padding needed in inContent prefs */ +} + +#encryptionPanel { + margin-top: 15px; + -moz-margin-start: 60px; +} + +#offlineAppsList { +/* -moz-appearance: none; + color: #737980; + padding: 2px; + border: 1px solid rgba(23,50,77,0.4); + border-radius: 5px; + background-color: #F1F1F1;*/ +} + +#telemetryLearnMore, +#FHRLearnMore, +#crashReporterLearnMore { + /* center the links */ + margin-top: 8px; + margin-bottom: 8px; +} + +/* === END shared/in-content/preferences.css === */ + +.indent-small { + -moz-margin-start: 10px; +} + +@media (min-resolution: 2dppx) { + checkbox:hover::before, + checkbox[checked]::before { + } + + 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[selected] > .category-icon { + -moz-image-region: rect(48px, 48px, 96px, 0); + } + + #category-content > .category-icon { + -moz-image-region: rect(0, 96px, 48px, 48px); + } + + #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[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[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[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[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[selected] > .category-icon { + -moz-image-region: rect(48px, 336px, 96px, 288px); + } +}