From: Robert Kaiser Date: Sun, 9 Nov 2014 19:58:33 +0000 (+0100) Subject: first part of syncing LCARStrek with Firefox 34 windows theme changes X-Git-Tag: LCARStrek-2.31~9 X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=d4d77dc0d0de5595725731c8113e5937c9bc1fea;p=themes.git first part of syncing LCARStrek with Firefox 34 windows theme changes --- diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 9f90de36..e7559224 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -485,7 +485,7 @@ menuitem.bookmark-item { /* Whole section of this included file: */ :-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, - #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, + #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-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, diff --git a/LCARStrek/browser/devtools/newtab.png b/LCARStrek/browser/devtools/newtab.png new file mode 100644 index 00000000..a8745091 Binary files /dev/null and b/LCARStrek/browser/devtools/newtab.png differ diff --git a/LCARStrek/browser/devtools/newtab@2x.png b/LCARStrek/browser/devtools/newtab@2x.png new file mode 100644 index 00000000..9d150f8d Binary files /dev/null and b/LCARStrek/browser/devtools/newtab@2x.png differ diff --git a/LCARStrek/browser/devtools/profiler.css b/LCARStrek/browser/devtools/profiler.css index e5e40f45..dc29a1c6 100644 --- a/LCARStrek/browser/devtools/profiler.css +++ b/LCARStrek/browser/devtools/profiler.css @@ -8,72 +8,344 @@ window { padding: 0; } -.profiler-sidebar-empty-notice { - max-width: 176px; - padding: 10px; - background-color: #A09090; - color: #000000; - font-weight: bold; +/* Reload and waiting notices */ + +.notice-container { + margin-top: -50vh; + font-size: 120%; +} + +.notice-container { + background: #000000; /* Toolbars */ + color: #FF9F00; /* Light foreground text */ +} + +#empty-notice button, +#recording-notice button { + min-width: 30px; + min-height: 28px; + margin: 0; + list-style-image: url("profiler-stopwatch.svg"); +} + +#empty-notice button[checked], +#recording-notice button[checked] { + list-style-image: url("profiler-stopwatch-checked.svg"); +} + +#empty-notice button .button-text, +#recording-notice button .button-text { + display: none; +} + +#loading-notice { + font-size: 250%; + color: #9C9CFF; +} + +/* Recordings pane */ + +#recordings-pane > tabs, +#recordings-pane .devtools-toolbar { + -moz-border-end-width: 1px; +} + +#recordings-pane > tabs, +#recordings-pane .devtools-toolbar { + -moz-border-end-color: #9C9CFF; /* Splitters */ +} + +#record-button { + list-style-image: url("profiler-stopwatch.svg"); +} + +#record-button[checked] { + list-style-image: url("profiler-stopwatch-checked.svg"); +} + +#record-button[locked] { + pointer-events: none; +} + +/* Recording items */ + +.recording-item { + padding: 4px; +} + +.recording-item-title { + font-size: 110%; } -.devtools-toolbar { -/* min-height: 33px; */ +.recording-item-footer { + padding-top: 4px; + font-size: 90%; } -.profiler-sidebar { - min-width: 196px; +.recording-item-save { + text-decoration: underline; + cursor: pointer; +} + +.recording-item-duration, +.recording-item-save { + color: #FF9F00; /* Foreground (Text) - Grey */ } -.profiler-sidebar + .devtools-side-splitter { - -moz-border-start-color: transparent; +#recordings-list .selected label { + /* Text inside a selected item should not be custom colored. */ + color: inherit !important; } -.profiler-sidebar .devtools-toolbar { - -moz-border-end: 1px solid #9C9CFF; /* Match the splitter color. */ +/* Profile pane */ + +#profile-content tabs { + -moz-box-align: stretch; + height: 24px; + font: inherit; +} + +#profile-content tab { + -moz-box-flex: 0; + background-color: transparent; + border: none; + border-radius: 0; + padding: 0; + text-shadow: none; + transition-duration: 0.25s; + transition-timing-function: ease-in-out; + transition-property: opacity, transform; } -.profiler-sidebar-item { - padding: 3px 5px; +.theme-dark #profile-content tab { + color: #8fa1b2; /* Body Text */ } -.profiler-sidebar-item, .side-menu-widget-item-contents { - cursor: default; +.theme-light #profile-content tab { + color: #18191a; /* Body Text */ } -.profiler-sidebar-item > h3 { - font-size: 13px; - display: block; +#profile-content tab:not([selected]) { cursor: pointer; } -.profiler-sidebar-item > hbox { - margin-top: 2px; +#profile-content tab[covered] { + opacity: 0; + transform: translateY(100%); +} + +#profile-content tab { + -moz-appearance: none; + -moz-border-end: 1px solid #9C9CFF; /* Splitters */ +} + +#profile-content tab:hover { + background-color: #FFCF00; + color: #000000; +} + +#profile-content tab[selected] { + background-color: #008484; /* Select Highlight Blue */ + color: #000000; /* Light foreground text */ +} + +#profile-content tabpanel { + -moz-box-orient: vertical; + transform: translateZ(1px); /* Make sure the tabpanel appears above the tab */ +} + +#profile-newtab-button { + -moz-appearance: none; + background-color: transparent; + background-position: 4px 2px; + background-size: 54px 20px; + min-width: 26px; + margin: 0; + border: none; + cursor: pointer; +} + +#profile-newtab-button { + background-color: #C09070; +} + +#profile-newtab-button { + background-image: url("newtab.png"); +} + +@media (min-resolution: 2dppx) { + #profile-newtab-button { + background-image: url("newtab@2x.png"); + } +} + +/* Profile call tree */ + +.call-tree-headers-container { + border-top: 1px solid #A09090; } -.profiler-sidebar-item > hbox > a { +.call-tree-cells-container { + /* Hack: force hardware acceleration */ + transform: translateZ(1px); + overflow: auto; +} + +.call-tree-cells-container[categories-hidden] .call-tree-category { display: none; - text-decoration: underline; +} + +.call-tree-header[type="duration"], +.call-tree-cell[type="duration"], +.call-tree-header[type="self-duration"], +.call-tree-cell[type="self-duration"] { + width: 9em; +} + +.call-tree-header[type="percentage"], +.call-tree-cell[type="percentage"], +.call-tree-header[type="self-percentage"], +.call-tree-cell[type="self-percentage"] { + width: 6em; +} + +.call-tree-header[type="samples"], +.call-tree-cell[type="samples"] { + width: 5em; +} + +.call-tree-header[type="function"], +.call-tree-cell[type="function"] { + -moz-box-flex: 1; +} + +.call-tree-header, +.call-tree-cell { + -moz-box-align: center; + overflow: hidden; + padding: 1px 4px; +} + +.call-tree-header:not(:last-child), +.call-tree-cell:not(:last-child) { + -moz-border-end: 1px solid; +} + +.call-tree-header, +.call-tree-cell { + -moz-border-end-color: #9C9CFF; + color: #FF9F00; /* Body Text */ +} + +.call-tree-header:not(:last-child) { + text-align: center; +} + +.call-tree-cell:not(:last-child) { + text-align: end; +} + +.call-tree-header { + background-color: #A09090; /* Tab Toolbar */ + color: #000000; +} + +.call-tree-item:last-child:not(:focus) { + border-bottom: #9C9CFF; +} + +.call-tree-item:nth-child(2n) { + background-color: #392900; +} + +.call-tree-item:hover { + background-color: #392900; +} + +.call-tree-item:focus { + background-color: #008484; /* Select Highlight Blue */ + color: #000000; +} + +.call-tree-item:focus label { + color: #000000 !important; /* Light foreground text */ +} + +.call-tree-item:focus .call-tree-cell { + -moz-border-end-color: #9C9CFF; +} + +.call-tree-item:not([origin="content"]) .call-tree-name, +.call-tree-item:not([origin="content"]) .call-tree-url, +.call-tree-item:not([origin="content"]) .call-tree-line { + /* Style chrome and non-JS nodes differently. */ + opacity: 0.6; +} + +.call-tree-url { + -moz-margin-start: 4px !important; cursor: pointer; } -.profiler-sidebar-item > hbox > a:hover { - color: #FFCF00; +.call-tree-url:hover { + text-decoration: underline; +} + +.call-tree-url { + color: #9C9CFF; +} + +.call-tree-line { + color: #A09090; +} + +.call-tree-host { + -moz-margin-start: 8px !important; + font-size: 90%; +} + +.call-tree-host { + color: #E7ADE7; +} + +.call-tree-url[value=""], +.call-tree-line[value=""], +.call-tree-host[value=""] { + display: none; +} + +.call-tree-zoom { + -moz-appearance: none; + background-color: transparent; + background-position: center; + background-repeat: no-repeat; + background-size: 11px; + min-width: 11px; + -moz-margin-start: 8px !important; + cursor: zoom-in; + opacity: 0; +} + +.call-tree-zoom { + background-image: url("magnifying-glass.png"); } -[state=completed].selected .profiler-sidebar-item > hbox > a { - display: block; +@media (min-resolution: 2dppx) { + .call-tree-zoom { + background-image: url("magnifying-glass@2x.png"); + } } -.selected .profiler-sidebar-item > hbox { - color: #3A3A5F; /* 37% of #9C9CFF */ +.call-tree-item:hover .call-tree-zoom { + transition: opacity 0.3s ease-in; + opacity: 1; } -#profiler-start { - list-style-image: url("chrome://browser/skin/devtools/profiler-stopwatch-tbutton.svg"); +.call-tree-item:hover .call-tree-zoom:hover { + opacity: 0; } -#profiler-start:hover, -#profiler-start[checked], -#profiler-start[checked]:hover { - list-style-image: url("chrome://browser/skin/devtools/profiler-stopwatch.svg"); +.call-tree-category { + transform: scale(0.75); + transform-origin: center right; } diff --git a/LCARStrek/browser/devtools/widgets.css b/LCARStrek/browser/devtools/widgets.css index b38d582f..2a0f70cf 100644 --- a/LCARStrek/browser/devtools/widgets.css +++ b/LCARStrek/browser/devtools/widgets.css @@ -24,6 +24,16 @@ -moz-box-orient: horizontal; } +.devtools-main-content { + min-width: 50px; +} + +.devtools-main-content, +.devtools-sidebar-tabs { + /* Prevent some children that should be hidden from remaining visible as this is shrunk (Bug 971959) */ + position: relative; +} + @media (max-width: 700px) { .devtools-responsive-container { -moz-box-orient: vertical; diff --git a/LCARStrek/browser/newtab/newTab.css b/LCARStrek/browser/newtab/newTab.css index 4f8fe0e3..1e42d934 100644 --- a/LCARStrek/browser/newtab/newTab.css +++ b/LCARStrek/browser/newtab/newTab.css @@ -71,19 +71,6 @@ outline: 1px dotted; } -/* TOGGLE */ -#newtab-toggle { - width: 16px; - height: 16px; - padding: 0; - border: none; - background: -216px 0 transparent url("chrome://browser/skin/newtab/controls.png"); -} - -#newtab-toggle[page-disabled] { - background-position: -232px 0; -} - /* CUSTOMIZE */ #newtab-customize-button, .newtab-customize { @@ -101,27 +88,12 @@ background-color: #FFCF00; } -/* ROWS */ -.newtab-row { - margin-bottom: 20px; -} - -.newtab-row:last-child { - margin-bottom: 0; -} - -.newtab-row > .newtab-cell { - /* this only applies before Directory Tiles work, row is gone afterwards. */ - -moz-margin-end: 20px; -} - /* CELLS */ .newtab-cell { background-color: rgba(255,159,0,.2); border: 1px solid; border-color: #9C9CFF; border-radius: 1px; - transition: border-color 100ms ease-out; } .newtab-cell:empty { @@ -129,16 +101,9 @@ -moz-outline-radius: 2px; } -.newtab-row > .newtab-cell:last-child { - -moz-margin-end: 0; -} - -.newtab-cell:hover:not(:empty):not([dragged]):not([ignorehover]) { - border-color: #FFCF00; -} - /* SITES */ .newtab-site { + border-radius: inherit; text-decoration: none; transition-property: top, left, opacity, box-shadow, background-color; } diff --git a/LCARStrek/browser/preferences/in-content/header.png b/LCARStrek/browser/preferences/in-content/header.png deleted file mode 100644 index b38b5f43..00000000 Binary files a/LCARStrek/browser/preferences/in-content/header.png and /dev/null differ diff --git a/LCARStrek/browser/preferences/in-content/header@2x.png b/LCARStrek/browser/preferences/in-content/header@2x.png deleted file mode 100644 index e9ce653a..00000000 Binary files a/LCARStrek/browser/preferences/in-content/header@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 ac81fcd7..24bed38f 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -383,14 +383,14 @@ radio { /* header */ .header { + border-bottom: 1px solid #A09090; margin-bottom: 15px; + padding-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-advanced { + border-bottom: none; + padding-bottom: 0; } .header-name { @@ -400,68 +400,6 @@ radio { margin: 0; } -#header-general > .header-icon { - -moz-image-region: rect(0, 40px, 40px, 0); -} - -#header-content > .header-icon { - -moz-image-region: rect(0, 80px, 40px, 40px); -} - -#header-application > .header-icon { - -moz-image-region: rect(0, 120px, 40px, 80px); -} - -#header-privacy > .header-icon { - -moz-image-region: rect(0, 160px, 40px, 120px); -} - -#header-security > .header-icon { - -moz-image-region: rect(0, 200px, 40px, 160px); -} - -#header-sync > .header-icon { - -moz-image-region: rect(0, 240px, 40px, 200px); -} - -#header-advanced > .header-icon { - -moz-image-region: rect(0, 280px, 40px, 240px); -} - -@media (min-resolution: 2dppx) { - .header-icon { - list-style-image: url("chrome://browser/skin/preferences/in-content/header@2x.png"); - } - - #header-general > .header-icon { - -moz-image-region: rect(0, 80px, 80px, 0); - } - - #header-content > .header-icon { - -moz-image-region: rect(0, 160px, 80px, 80px); - } - - #header-application > .header-icon { - -moz-image-region: rect(0, 240px, 80px, 160px); - } - - #header-privacy > .header-icon { - -moz-image-region: rect(0, 320px, 80px, 240px); - } - - #header-security > .header-icon { - -moz-image-region: rect(0, 400px, 80px, 320px); - } - - #header-sync > .header-icon { - -moz-image-region: rect(0, 480px, 80px, 400px); - } - - #header-advanced > .header-icon { - -moz-image-region: rect(0, 560px, 80px, 480px); - } -} - .indent { margin-top: 7px; margin-bottom: 7px; @@ -494,7 +432,6 @@ filefield { /* Applications Pane Styles */ #applicationsContent { - -moz-margin-start: 60px; padding: 15px 0; } @@ -618,10 +555,6 @@ description > html|a { background-color: #F1F1F1;*/ } -#weavePrefsDeck { - -moz-margin-start: 60px; -} - #noFxaAccount { /* Overriding the margins from the base preferences.css theme file. These overrides can be simplified by fixing bug 1027174 */ @@ -644,7 +577,6 @@ description > html|a { #encryptionPanel { margin-top: 15px; - -moz-margin-start: 60px; } #telemetryLearnMore, @@ -680,10 +612,6 @@ description > html|a { min-width: 66ch; } -#dialogTitle { - -moz-margin-start: 5px !important; -} - .close-icon { background-color: transparent !important; border: none; @@ -693,6 +621,12 @@ description > html|a { min-width: 18px; } +#dialogBox > .groupbox-title > caption { + margin: 0; + border-radius: 1000px; + background-color: #A09090; +} + #dialogBox > .groupbox-body { -moz-appearance: none; padding: 0; @@ -701,7 +635,7 @@ description > html|a { #dialogFrame { -moz-box-flex: 1; /* Default dialog dimensions */ - height: 20em; + height: 30em; width: 66ch; }