From db72ff4b17145f48e9d78864872f9579613629fa Mon Sep 17 00:00:00 2001 From: Louis Chan Date: Thu, 2 Apr 2015 00:08:40 +0800 Subject: [PATCH 1/7] Update devtools for 38a2 --- .../browser/devtools/animationinspector.css | 78 +++++++++++-- whitefox/browser/devtools/canvasdebugger.css | 8 +- whitefox/browser/devtools/dark-theme.css | 87 +++++++++----- whitefox/browser/devtools/filters.svg | 11 ++ whitefox/browser/devtools/light-theme.css | 87 +++++++++----- whitefox/browser/devtools/netmonitor.css | 26 ++++- .../browser/devtools/performance-icons.svg | 18 +-- whitefox/browser/devtools/performance.css | 108 ++++++++++++++++-- whitefox/browser/devtools/power.svg | 14 +++ whitefox/browser/devtools/profiler.css | 13 ++- whitefox/browser/devtools/shadereditor.css | 9 -- whitefox/browser/devtools/splitview.css | 11 +- whitefox/browser/devtools/webaudioeditor.css | 92 +++++++++++++-- whitefox/browser/devtools/webconsole.css | 11 ++ 14 files changed, 459 insertions(+), 114 deletions(-) create mode 100644 whitefox/browser/devtools/power.svg diff --git a/whitefox/browser/devtools/animationinspector.css b/whitefox/browser/devtools/animationinspector.css index 395fb73..c632d91 100644 --- a/whitefox/browser/devtools/animationinspector.css +++ b/whitefox/browser/devtools/animationinspector.css @@ -1,25 +1,65 @@ +html { + height: 100%; +} + body { margin: 0; padding: 0; + display : flex; + flex-direction: column; + height: 100%; + overflow: hidden; + color: var(--theme-content-color3); +} + +/* The top toolbar, containing the toggle-all button */ + +#toolbar { + border-bottom: 1px solid var(--theme-splitter-color); + display: flex; + flex-direction: row; + align-items: center; + justify-content: flex-end; + height: 20px; +} + +#toolbar .label { + padding: 1px 4px; +} + +#toggle-all { + border-width: 0px 1px; + min-height: 20px; } /* The error message, shown when an invalid/unanimated element is selected */ #error-message { - margin-top: 10%; + padding-top: 10%; text-align: center; + flex: 1; + overflow: auto; /* The error message is hidden by default */ display: none; } -/* Element picker button */ +/* The animation players container */ + +#players { + flex: 1; + overflow: auto; +} + +/* Element picker and toggle-all buttons */ -#element-picker { +#element-picker, +#toggle-all { position: relative; } -#element-picker::before { +#element-picker::before, +#toggle-all::before { content: ""; display: block; width: 16px; @@ -31,23 +71,45 @@ body { background-image: url("chrome://browser/skin/devtools/command-pick.png"); } +#toggle-all::before { + background-image: url("debugger-pause.png"); +} + #element-picker[checked]::before { background-position: -48px 0; filter: none; /* Icon is blue when checked, don't invert for light theme */ } +#toggle-all.paused::before { + background-image: url("debugger-play.png"); +} + @media (min-resolution: 2dppx) { #element-picker::before { background-image: url("chrome://browser/skin/devtools/command-pick@2x.png"); background-size: 64px; } + + #toggle-all::before { + background-image: url("debugger-pause@2x.png"); + } + + #toggle-all.paused::before { + background-image: url("debugger-play@2x.png"); + } +} + +/* Disabled playerWidget when the animation has ended */ + +.finished { + pointer-events: none; + opacity: .5; } /* Animation title gutter, contains the name, duration, iteration */ .animation-title { background-color: var(--theme-toolbar-background); - color: var(--theme-content-color3); border-bottom: 1px solid var(--theme-splitter-color); padding: 1px 4px; word-wrap: break-word; @@ -91,7 +153,8 @@ body { background-image: url(debugger-pause.png); } -.paused .timeline .toggle::before { +.paused .timeline .toggle::before, +.finished .timeline .toggle::before { background-image: url(debugger-play.png); } @@ -100,7 +163,8 @@ body { background-image: url(debugger-pause@2x.png); } - .paused .timeline .toggle::before { + .paused .timeline .toggle::before, + .finished .timeline .toggle::before { background-image: url(debugger-play@2x.png); } } diff --git a/whitefox/browser/devtools/canvasdebugger.css b/whitefox/browser/devtools/canvasdebugger.css index d9f15b4..24b191c 100644 --- a/whitefox/browser/devtools/canvasdebugger.css +++ b/whitefox/browser/devtools/canvasdebugger.css @@ -116,14 +116,8 @@ pointer-events: none; } -.snapshot-item-footer[saving]::before { - display: inline-block; - content: ""; - background: url("chrome://global/skin/icons/loading_16.png") center no-repeat; - width: 16px; - height: 16px; +.snapshot-item-footer.devtools-throbber::before { margin-top: -2px; - -moz-margin-end: 4px; } #snapshots-list .selected label { diff --git a/whitefox/browser/devtools/dark-theme.css b/whitefox/browser/devtools/dark-theme.css index 61fc3fb..1f90b49 100644 --- a/whitefox/browser/devtools/dark-theme.css +++ b/whitefox/browser/devtools/dark-theme.css @@ -191,7 +191,8 @@ .theme-toolbar, .devtools-toolbar, -.devtools-sidebar-tabs > tabs, +.devtools-sidebar-tabs tabs, +.devtools-sidebar-alltabs, .CodeMirror-dialog { /* General toolbar styling */ color: var(--theme-body-color-alt); background-color: var(--theme-toolbar-background); @@ -405,7 +406,8 @@ div.CodeMirror span.eval-text { /* Toolbars */ .devtools-toolbar, -.devtools-sidebar-tabs > tabs { +.devtools-sidebar-tabs tabs, +.devtools-sidebar-alltabs { -moz-appearance: none; padding: 0; border-width: 0; @@ -806,19 +808,30 @@ div.CodeMirror span.eval-text { color: var(--theme-body-color); } -.devtools-sidebar-tabs > tabs { +.devtools-sidebar-tabs tabs { position: static; font: inherit; margin-bottom: 0; overflow: hidden; } -.devtools-sidebar-tabs > tabs > .tabs-right, -.devtools-sidebar-tabs > tabs > .tabs-left { +.devtools-sidebar-alltabs { + margin: 0; + border-width: 0 0 1px 0; + -moz-border-start-width: 1px; + border-style: solid; +} + +.devtools-sidebar-alltabs dropmarker { display: none; } -.devtools-sidebar-tabs > tabs > tab { +.devtools-sidebar-tabs tabs > .tabs-right, +.devtools-sidebar-tabs tabs > .tabs-left { + display: none; +} + +.devtools-sidebar-tabs tabs > tab { -moz-appearance: none; /* We want to match the height of a toolbar with a toolbarbutton * First, we need to replicated the padding of toolbar (4px), @@ -839,70 +852,70 @@ div.CodeMirror span.eval-text { text-shadow: none; } -.devtools-sidebar-tabs > tabs > tab:first-child { +.devtools-sidebar-tabs tabs > tab:first-child { -moz-border-start-width: 0; } -.theme-dark .devtools-sidebar-tabs > tabs > tab { +.theme-dark .devtools-sidebar-tabs tabs > tab { border-image: linear-gradient(transparent 15%, #5a6169 15%, #5a6169 85%, transparent 85%) 1 1; } -.theme-dark .devtools-sidebar-tabs > tabs > tab:hover { +.theme-dark .devtools-sidebar-tabs tabs > tab:hover { background: hsla(206,37%,4%,.2); border-image: linear-gradient(transparent 15%, #5a6169 15%, #5a6169 85%, transparent 85%) 1 1; } -.theme-dark .devtools-sidebar-tabs > tabs > tab:hover:active { +.theme-dark .devtools-sidebar-tabs tabs > tab:hover:active { background: hsla(206,37%,4%,.4); border-image: linear-gradient(transparent 15%, #5a6169 15%, #5a6169 85%, transparent 85%) 1 1; } -.theme-dark .devtools-sidebar-tabs > tabs > tab[selected] + tab { +.theme-dark .devtools-sidebar-tabs tabs > tab[selected] + tab { border-image: linear-gradient(#2d5b7d, #2d5b7d) 1 1; } -.theme-dark .devtools-sidebar-tabs > tabs > tab[selected] + tab:hover { +.theme-dark .devtools-sidebar-tabs tabs > tab[selected] + tab:hover { background: hsla(206,37%,4%,.2); border-image: linear-gradient(#2d5b7d, #2d5b7d) 1 1; } -.theme-dark .devtools-sidebar-tabs > tabs > tab[selected] + tab:hover:active { +.theme-dark .devtools-sidebar-tabs tabs > tab[selected] + tab:hover:active { background: hsla(206,37%,4%,.4); border-image: linear-gradient(#2d5b7d, #2d5b7d) 1 1; } -.theme-dark .devtools-sidebar-tabs > tabs > tab[selected], -.theme-dark .devtools-sidebar-tabs > tabs > tab[selected]:hover:active { +.theme-dark .devtools-sidebar-tabs tabs > tab[selected], +.theme-dark .devtools-sidebar-tabs tabs > tab[selected]:hover:active { color: var(--theme-selection-color); background: #1d4f73; border-image: linear-gradient(#2d5b7d, #2d5b7d) 1 1; } -.theme-light .devtools-sidebar-tabs > tabs > tab { +.theme-light .devtools-sidebar-tabs tabs > tab { border-image: linear-gradient(transparent 15%, #aaa 15%, #aaa 85%, transparent 85%) 1 1; } -.theme-light .devtools-sidebar-tabs > tabs > tab:hover { +.theme-light .devtools-sidebar-tabs tabs > tab:hover { background: #ddd; border-image: linear-gradient(transparent 15%, #aaa 15%, #aaa 85%, transparent 85%) 1 1; } -.theme-light .devtools-sidebar-tabs > tabs > tab:hover:active { +.theme-light .devtools-sidebar-tabs tabs > tab:hover:active { background: #ddd; border-image: linear-gradient(transparent 15%, #aaa 15%, #aaa 85%, transparent 85%) 1 1; } -.theme-light .devtools-sidebar-tabs > tabs > tab[selected] + tab { +.theme-light .devtools-sidebar-tabs tabs > tab[selected] + tab { border-image: linear-gradient(#aaa, #aaa); } -.theme-light .devtools-sidebar-tabs > tabs > tab[selected] + tab:hover { +.theme-light .devtools-sidebar-tabs tabs > tab[selected] + tab:hover { background: #ddd; border-image: linear-gradient(#aaa, #aaa); } -.theme-light .devtools-sidebar-tabs > tabs > tab[selected], -.theme-light .devtools-sidebar-tabs > tabs > tab[selected]:hover:active { +.theme-light .devtools-sidebar-tabs tabs > tab[selected], +.theme-light .devtools-sidebar-tabs tabs > tab[selected]:hover:active { color: var(--theme-selection-color); background: #4c9ed9; border-image: linear-gradient(#aaa, #aaa); @@ -1124,7 +1137,7 @@ div.CodeMirror span.eval-text { -moz-box-align: center; min-width: 32px; min-height: 24px; - max-width: 127px; + max-width: 110px; margin: 0; padding: 0; border-style: solid; @@ -1269,8 +1282,7 @@ div.CodeMirror span.eval-text { .theme-light .scrollbutton-up > .toolbarbutton-icon, .theme-light .scrollbutton-down > .toolbarbutton-icon, .theme-light #black-boxed-message-button .button-icon, -.theme-light #profiling-notice-button .button-icon, -.theme-light #canvas-debugging-empty-notice-button .button-icon, +.theme-light .notice-container button .button-icon, .theme-light #requests-menu-perf-notice-button .button-icon, .theme-light #requests-menu-network-summary-button .button-icon, .theme-light .event-tooltip-debugger-icon, @@ -1284,7 +1296,8 @@ div.CodeMirror span.eval-text { .theme-light .devtools-tab[icon-invertable][selected] > image, .theme-light .devtools-tab[icon-invertable][highlighted] > image, .theme-light #record-snapshot[checked] > image, -.theme-light #profiler-start[checked] > image { +.theme-light #profiler-start[checked] > image, +.theme-light .notice-container button[checked] .button-icon { filter: none !important; } @@ -1315,3 +1328,25 @@ div.CodeMirror span.eval-text { border-color: var(--theme-splitter-color); /* Needed for responsive container at low width. */ } +/* Throbbers */ +.devtools-throbber::before { + content: ""; + display: inline-block; + vertical-align: bottom; + -moz-margin-end: 0.5em; + width: 1em; + height: 1em; + border: 2px solid currentColor; + border-right-color: transparent; + border-radius: 50%; + animation: 1.1s linear throbber-spin infinite; +} + +@keyframes throbber-spin { + from { + transform: none; + } + to { + transform: rotate(360deg); + } +} diff --git a/whitefox/browser/devtools/filters.svg b/whitefox/browser/devtools/filters.svg index 69c6bc3..916028b 100644 --- a/whitefox/browser/devtools/filters.svg +++ b/whitefox/browser/devtools/filters.svg @@ -13,4 +13,15 @@ + + + + + + + + + + + diff --git a/whitefox/browser/devtools/light-theme.css b/whitefox/browser/devtools/light-theme.css index 87be9ea..b13e682 100644 --- a/whitefox/browser/devtools/light-theme.css +++ b/whitefox/browser/devtools/light-theme.css @@ -194,7 +194,8 @@ .theme-toolbar, .devtools-toolbar, -.devtools-sidebar-tabs > tabs, +.devtools-sidebar-tabs tabs, +.devtools-sidebar-alltabs, .CodeMirror-dialog { /* General toolbar styling */ color: var(--theme-body-color-alt); background-color: var(--theme-toolbar-background); @@ -403,7 +404,8 @@ div.CodeMirror span.eval-text { /* Toolbars */ .devtools-toolbar, -.devtools-sidebar-tabs > tabs { +.devtools-sidebar-tabs tabs, +.devtools-sidebar-alltabs { -moz-appearance: none; padding: 0; border-width: 0; @@ -804,19 +806,30 @@ div.CodeMirror span.eval-text { color: var(--theme-body-color); } -.devtools-sidebar-tabs > tabs { +.devtools-sidebar-tabs tabs { position: static; font: inherit; margin-bottom: 0; overflow: hidden; } -.devtools-sidebar-tabs > tabs > .tabs-right, -.devtools-sidebar-tabs > tabs > .tabs-left { +.devtools-sidebar-alltabs { + margin: 0; + border-width: 0 0 1px 0; + -moz-border-start-width: 1px; + border-style: solid; +} + +.devtools-sidebar-alltabs dropmarker { display: none; } -.devtools-sidebar-tabs > tabs > tab { +.devtools-sidebar-tabs tabs > .tabs-right, +.devtools-sidebar-tabs tabs > .tabs-left { + display: none; +} + +.devtools-sidebar-tabs tabs > tab { -moz-appearance: none; /* We want to match the height of a toolbar with a toolbarbutton * First, we need to replicated the padding of toolbar (4px), @@ -837,70 +850,70 @@ div.CodeMirror span.eval-text { text-shadow: none; } -.devtools-sidebar-tabs > tabs > tab:first-child { +.devtools-sidebar-tabs tabs > tab:first-child { -moz-border-start-width: 0; } -.theme-dark .devtools-sidebar-tabs > tabs > tab { +.theme-dark .devtools-sidebar-tabs tabs > tab { border-image: linear-gradient(transparent 15%, #5a6169 15%, #5a6169 85%, transparent 85%) 1 1; } -.theme-dark .devtools-sidebar-tabs > tabs > tab:hover { +.theme-dark .devtools-sidebar-tabs tabs > tab:hover { background: hsla(206,37%,4%,.2); border-image: linear-gradient(transparent 15%, #5a6169 15%, #5a6169 85%, transparent 85%) 1 1; } -.theme-dark .devtools-sidebar-tabs > tabs > tab:hover:active { +.theme-dark .devtools-sidebar-tabs tabs > tab:hover:active { background: hsla(206,37%,4%,.4); border-image: linear-gradient(transparent 15%, #5a6169 15%, #5a6169 85%, transparent 85%) 1 1; } -.theme-dark .devtools-sidebar-tabs > tabs > tab[selected] + tab { +.theme-dark .devtools-sidebar-tabs tabs > tab[selected] + tab { border-image: linear-gradient(#2d5b7d, #2d5b7d) 1 1; } -.theme-dark .devtools-sidebar-tabs > tabs > tab[selected] + tab:hover { +.theme-dark .devtools-sidebar-tabs tabs > tab[selected] + tab:hover { background: hsla(206,37%,4%,.2); border-image: linear-gradient(#2d5b7d, #2d5b7d) 1 1; } -.theme-dark .devtools-sidebar-tabs > tabs > tab[selected] + tab:hover:active { +.theme-dark .devtools-sidebar-tabs tabs > tab[selected] + tab:hover:active { background: hsla(206,37%,4%,.4); border-image: linear-gradient(#2d5b7d, #2d5b7d) 1 1; } -.theme-dark .devtools-sidebar-tabs > tabs > tab[selected], -.theme-dark .devtools-sidebar-tabs > tabs > tab[selected]:hover:active { +.theme-dark .devtools-sidebar-tabs tabs > tab[selected], +.theme-dark .devtools-sidebar-tabs tabs > tab[selected]:hover:active { color: var(--theme-selection-color); background: #1d4f73; border-image: linear-gradient(#2d5b7d, #2d5b7d) 1 1; } -.theme-light .devtools-sidebar-tabs > tabs > tab { +.theme-light .devtools-sidebar-tabs tabs > tab { border-image: linear-gradient(transparent 15%, #aaa 15%, #aaa 85%, transparent 85%) 1 1; } -.theme-light .devtools-sidebar-tabs > tabs > tab:hover { +.theme-light .devtools-sidebar-tabs tabs > tab:hover { background: #ddd; border-image: linear-gradient(transparent 15%, #aaa 15%, #aaa 85%, transparent 85%) 1 1; } -.theme-light .devtools-sidebar-tabs > tabs > tab:hover:active { +.theme-light .devtools-sidebar-tabs tabs > tab:hover:active { background: #ddd; border-image: linear-gradient(transparent 15%, #aaa 15%, #aaa 85%, transparent 85%) 1 1; } -.theme-light .devtools-sidebar-tabs > tabs > tab[selected] + tab { +.theme-light .devtools-sidebar-tabs tabs > tab[selected] + tab { border-image: linear-gradient(#aaa, #aaa); } -.theme-light .devtools-sidebar-tabs > tabs > tab[selected] + tab:hover { +.theme-light .devtools-sidebar-tabs tabs > tab[selected] + tab:hover { background: #ddd; border-image: linear-gradient(#aaa, #aaa); } -.theme-light .devtools-sidebar-tabs > tabs > tab[selected], -.theme-light .devtools-sidebar-tabs > tabs > tab[selected]:hover:active { +.theme-light .devtools-sidebar-tabs tabs > tab[selected], +.theme-light .devtools-sidebar-tabs tabs > tab[selected]:hover:active { color: var(--theme-selection-color); background: #4c9ed9; border-image: linear-gradient(#aaa, #aaa); @@ -1122,7 +1135,7 @@ div.CodeMirror span.eval-text { -moz-box-align: center; min-width: 32px; min-height: 24px; - max-width: 127px; + max-width: 110px; margin: 0; padding: 0; border-style: solid; @@ -1267,8 +1280,7 @@ div.CodeMirror span.eval-text { .theme-light .scrollbutton-up > .toolbarbutton-icon, .theme-light .scrollbutton-down > .toolbarbutton-icon, .theme-light #black-boxed-message-button .button-icon, -.theme-light #profiling-notice-button .button-icon, -.theme-light #canvas-debugging-empty-notice-button .button-icon, +.theme-light .notice-container button .button-icon, .theme-light #requests-menu-perf-notice-button .button-icon, .theme-light #requests-menu-network-summary-button .button-icon, .theme-light .event-tooltip-debugger-icon, @@ -1282,7 +1294,8 @@ div.CodeMirror span.eval-text { .theme-light .devtools-tab[icon-invertable][selected] > image, .theme-light .devtools-tab[icon-invertable][highlighted] > image, .theme-light #record-snapshot[checked] > image, -.theme-light #profiler-start[checked] > image { +.theme-light #profiler-start[checked] > image, +.theme-light .notice-container button[checked] .button-icon { filter: none !important; } @@ -1313,3 +1326,25 @@ div.CodeMirror span.eval-text { border-color: var(--theme-splitter-color); /* Needed for responsive container at low width. */ } +/* Throbbers */ +.devtools-throbber::before { + content: ""; + display: inline-block; + vertical-align: bottom; + -moz-margin-end: 0.5em; + width: 1em; + height: 1em; + border: 2px solid currentColor; + border-right-color: transparent; + border-radius: 50%; + animation: 1.1s linear throbber-spin infinite; +} + +@keyframes throbber-spin { + from { + transform: none; + } + to { + transform: rotate(360deg); + } +} diff --git a/whitefox/browser/devtools/netmonitor.css b/whitefox/browser/devtools/netmonitor.css index d33d9dc..71419ab 100644 --- a/whitefox/browser/devtools/netmonitor.css +++ b/whitefox/browser/devtools/netmonitor.css @@ -177,6 +177,11 @@ list-style-image: url(chrome://browser/skin/identity-icons-https.png); } +.security-state-weak { + cursor: pointer; + list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-display.png); +} + .security-state-broken { cursor: pointer; list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active.png); @@ -192,6 +197,11 @@ width: 8em; } +.requests-menu-transferred { + text-align: center; + width: 8em; +} + /* Network requests table: status codes */ box.requests-menu-status { @@ -484,6 +494,7 @@ label.requests-menu-status-code { } .tabpanel-summary-value { + color: inherit; -moz-padding-start: 3px; } @@ -568,8 +579,19 @@ label.requests-menu-status-code { overflow: auto; } -#security-error-message { - white-space: pre-wrap; +.security-warning-icon { + background-image: url(alerticon-warning.png); + background-size: 13px 12px; + -moz-margin-start: 5px; + vertical-align: top; + width: 13px; + height: 12px; +} + +@media (min-resolution: 2dppx) { + .security-warning-icon { + background-image: url(alerticon-warning@2x.png); + } } /* Custom request form */ diff --git a/whitefox/browser/devtools/performance-icons.svg b/whitefox/browser/devtools/performance-icons.svg index 2a9292d..8bea997 100644 --- a/whitefox/browser/devtools/performance-icons.svg +++ b/whitefox/browser/devtools/performance-icons.svg @@ -27,16 +27,16 @@ - - - - + + + + - - - - - + + + + + diff --git a/whitefox/browser/devtools/performance.css b/whitefox/browser/devtools/performance.css index 8ad74d2..198e56a 100644 --- a/whitefox/browser/devtools/performance.css +++ b/whitefox/browser/devtools/performance.css @@ -29,31 +29,65 @@ -moz-border-end-color: var(--theme-splitter-color); } +#performance-toolbar-controls-detail-views > toolbarbutton { + min-width: 0; +} + +#performance-toolbar-controls-detail-views .toolbarbutton-text { + -moz-padding-start: 4px; + -moz-padding-end: 8px; +} + +/* Recording Notice */ + +#performance-view .notice-container { + font-size: 120%; + background-color: var(--theme-toolbar-background); + color: var(--theme-body-color); + padding-bottom: 20vh; +} + +#performance-view .notice-container button { + min-width: 30px; + min-height: 28px; + margin: 0; +} + /* Overview Panel */ -#record-button { +.record-button { list-style-image: url(profiler-stopwatch.svg); } -#record-button[checked] { +.record-button[checked] { list-style-image: url(profiler-stopwatch-checked.svg); } -#record-button[locked] { +.record-button[locked] { pointer-events: none; } +.record-button .button-icon { + margin: 0; +} + +.record-button .button-text { + display: none; +} + /* Details Panel */ #select-waterfall-view { list-style-image: url(performance-icons.svg#details-waterfall); } -#select-calltree-view { +#select-js-calltree-view, +#select-memory-calltree-view { list-style-image: url(performance-icons.svg#details-call-tree); } -#select-flamegraph-view { +#select-js-flamegraph-view, +#select-memory-flamegraph-view { list-style-image: url(performance-icons.svg#details-flamegraph); } @@ -65,27 +99,42 @@ overflow: auto; } +.call-tree-cells-container[allocations-hidden] .call-tree-cell[type="allocations"], +.call-tree-cells-container[allocations-hidden] .call-tree-cell[type="self-allocations"], .call-tree-cells-container[categories-hidden] .call-tree-category { display: none; } +.call-tree-header { + font-size: 90%; + padding-top: 2px !important; + padding-bottom: 2px !important; +} + .call-tree-header[type="duration"], .call-tree-cell[type="duration"], .call-tree-header[type="self-duration"], .call-tree-cell[type="self-duration"] { - width: 9em; + width: 6vw; } .call-tree-header[type="percentage"], .call-tree-cell[type="percentage"], .call-tree-header[type="self-percentage"], .call-tree-cell[type="self-percentage"] { - width: 6em; + width: 5vw; } .call-tree-header[type="samples"], .call-tree-cell[type="samples"] { - width: 5em; + width: 4.5vw; +} + +.call-tree-header[type="allocations"], +.call-tree-cell[type="allocations"], +.call-tree-header[type="self-allocations"], +.call-tree-cell[type="self-allocations"] { + width: 7vw; } .call-tree-header[type="function"], @@ -146,7 +195,8 @@ .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 { +.call-tree-item:not([origin="content"]) .call-tree-line, +.call-tree-item:not([origin="content"]) .call-tree-column { /* Style chrome and non-JS nodes differently. */ opacity: 0.6; } @@ -168,14 +218,21 @@ color: var(--theme-highlight-orange); } +.call-tree-column { + color: var(--theme-highlight-orange); + opacity: 0.6; +} + .call-tree-host { -moz-margin-start: 8px !important; font-size: 90%; color: var(--theme-content-color2); } +.call-tree-name[value=""], .call-tree-url[value=""], .call-tree-line[value=""], +.call-tree-column[value=""], .call-tree-host[value=""] { display: none; } @@ -280,7 +337,8 @@ } .waterfall-header-name { - padding: 4px; + padding: 2px 4px; + font-size: 90%; } .waterfall-header-tick { @@ -365,3 +423,33 @@ .marker-details-duration { font-weight: bold; } + +/* Recording items */ + +.recording-item { + padding: 4px; +} + +.recording-item-title { + font-size: 110%; +} + +.recording-item-footer { + padding-top: 4px; + font-size: 90%; +} + +.recording-item-save { + text-decoration: underline; + cursor: pointer; +} + +.recording-item-duration, +.recording-item-save { + color: var(--theme-body-color-alt); +} + +#recordings-list .selected label { + /* Text inside a selected item should not be custom colored. */ + color: inherit !important; +} diff --git a/whitefox/browser/devtools/power.svg b/whitefox/browser/devtools/power.svg new file mode 100644 index 0000000..2888951 --- /dev/null +++ b/whitefox/browser/devtools/power.svg @@ -0,0 +1,14 @@ + + + + diff --git a/whitefox/browser/devtools/profiler.css b/whitefox/browser/devtools/profiler.css index 85c71f4..58868e3 100644 --- a/whitefox/browser/devtools/profiler.css +++ b/whitefox/browser/devtools/profiler.css @@ -224,6 +224,8 @@ overflow: auto; } +.call-tree-cells-container[allocations-hidden] .call-tree-cell[type="allocations"], +.call-tree-cells-container[allocations-hidden] .call-tree-cell[type="self-allocations"], .call-tree-cells-container[categories-hidden] .call-tree-category { display: none; } @@ -309,7 +311,8 @@ .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 { +.call-tree-item:not([origin="content"]) .call-tree-line, +.call-tree-item:not([origin="content"]) .call-tree-column { /* Style chrome and non-JS nodes differently. */ opacity: 0.6; } @@ -327,19 +330,25 @@ color: var(--theme-highlight-blue); } - .call-tree-line { color: var(--theme-highlight-orange); } +.call-tree-column { + color: var(--theme-highlight-orange); + opacity: 0.6; +} + .call-tree-host { -moz-margin-start: 8px !important; font-size: 90%; color: var(--theme-content-color2); } +.call-tree-name[value=""], .call-tree-url[value=""], .call-tree-line[value=""], +.call-tree-column[value=""], .call-tree-host[value=""] { display: none; } diff --git a/whitefox/browser/devtools/shadereditor.css b/whitefox/browser/devtools/shadereditor.css index 90441a0..3d01e20 100644 --- a/whitefox/browser/devtools/shadereditor.css +++ b/whitefox/browser/devtools/shadereditor.css @@ -22,15 +22,6 @@ font-size: 110%; } -#waiting-notice::before { - display: inline-block; - content: ""; - background: url("chrome://global/skin/icons/loading_16.png") center no-repeat; - width: 16px; - height: 16px; - -moz-margin-end: 6px; -} - /* Shaders pane */ #shaders-pane { diff --git a/whitefox/browser/devtools/splitview.css b/whitefox/browser/devtools/splitview.css index 55f51f2..9710c38 100644 --- a/whitefox/browser/devtools/splitview.css +++ b/whitefox/browser/devtools/splitview.css @@ -4,10 +4,13 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -.loading .splitview-nav-container { - background-image: url(chrome://global/skin/icons/loading_16.png); - background-repeat: no-repeat; - background-position: center center; +.splitview-nav-container .devtools-throbber { + display: none; + text-align: center; +} + +.loading .splitview-nav-container .devtools-throbber { + display: block; } .theme-dark .splitview-nav-container { diff --git a/whitefox/browser/devtools/webaudioeditor.css b/whitefox/browser/devtools/webaudioeditor.css index 21f4d8d..de0e21e 100644 --- a/whitefox/browser/devtools/webaudioeditor.css +++ b/whitefox/browser/devtools/webaudioeditor.css @@ -21,15 +21,6 @@ font-size: 110%; } -#waiting-notice::before { - display: inline-block; - content: ""; - background: url("chrome://global/skin/icons/loading_16.png") center no-repeat; - width: 16px; - height: 16px; - -moz-margin-end: 6px; -} - /* Context Graph */ svg { overflow: hidden; @@ -85,13 +76,47 @@ g.edgePath.param-connection { .nodes rect { stroke: var(--theme-tab-toolbar-background); +} +.theme-light rect { + fill: var(--theme-tab-toolbar-background); +} +.theme-dark rect { fill: var(--theme-toolbar-background); } +/** + * Bypassed Nodes + */ + +.theme-light .nodes g.bypassed rect { + fill: url(chrome://browser/skin/devtools/filters.svg#bypass-light); +} +.theme-dark .nodes g.bypassed rect { + fill: url(chrome://browser/skin/devtools/filters.svg#bypass-dark); +} +.nodes g.bypassed.selected rect { + stroke: var(--theme-selection-background); +} + +/* +.nodes g.bypassed text { + opacity: 0.8; +} +*/ + +/** + * Selected Nodes + */ .nodes g.selected rect { fill: var(--theme-selection-background); } +/* Don't style bypassed nodes text different because it'd be illegible in light-theme */ +.theme-light g.selected:not(.bypassed) text { + fill: var(--theme-toolbar-background); +} + + /* Text in nodes and edges */ text { cursor: default; /* override the "text" cursor */ @@ -104,9 +129,6 @@ text { fill: var(--theme-body-color-alt); } -.theme-light g.selected text { - fill: var(--theme-toolbar-background); -} .nodes text { cursor: pointer; @@ -116,6 +138,12 @@ text { * Inspector Styles */ +/* hide the variables view scope title as its redundant, + * because there's only one scope displayed. */ +.variables-view-scope > .title { + display: none; +} + #web-audio-inspector-title { margin: 6px; } @@ -149,6 +177,20 @@ text { -moz-image-region: rect(0px,32px,16px,16px); } +/** + * Automation Styles + */ + +#automation-param-toolbar .automation-param-button[selected] { + color: var(--theme-selection-color); + background-color: var(--theme-selection-background); +} + +#automation-graph { + overflow: hidden; + -moz-box-flex: 1; +} + @media (min-resolution: 2dppx) { #inspector-pane-toggle { list-style-image: url(debugger-collapse@2x.png); @@ -168,6 +210,32 @@ text { } } +/** + * Inspector toolbar + */ + +#audio-node-toolbar .bypass { + list-style-image: url(power.svg); +} + +#audio-node-toolbar toolbarbutton[disabled] { + opacity: 0.5; + background-color: transparent; +} + +.theme-dark #audio-node-toolbar toolbarbutton[checked] { + background-color: #1d4f73; /* Select Highlight Blue */ +} +.theme-light #audio-node-toolbar toolbarbutton[checked] { + background-color: #4c9ed9; /* Select Highlight Blue */ +} + +/* don't invert checked buttons so we can have white icons on light theme */ +#audio-node-toolbar toolbarbutton[checked] > .toolbarbutton-icon { + filter: none; +} + + /** * Responsive Styles * `.devtools-responsive-container` takes care of most of diff --git a/whitefox/browser/devtools/webconsole.css b/whitefox/browser/devtools/webconsole.css index acd43d2..9ae37e7 100644 --- a/whitefox/browser/devtools/webconsole.css +++ b/whitefox/browser/devtools/webconsole.css @@ -266,6 +266,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(#2DC3F3, #00B6F0); From 59c6e8466767c4ad327c6febfce164f83402a74e Mon Sep 17 00:00:00 2001 From: Louis Chan Date: Thu, 2 Apr 2015 00:38:30 +0800 Subject: [PATCH 2/7] Update about: pages for 38a2 browser/aboutSessionRestore.css browser/aboutTabCrashed.css browser/aboutWelcomeBack.css global/aboutReader.css global/aboutSupport.css --- chrome.manifest | 3 + whitefox/apptarget/33/aboutReader.css | 3 + whitefox/apptarget/33/aboutSessionRestore.css | 63 +++ whitefox/apptarget/33/aboutSupport.css | 113 +++++ whitefox/apptarget/33/aboutTabCrashed.css | 108 +++++ whitefox/apptarget/33/aboutWelcomeBack.css | 42 ++ whitefox/apptarget/38/aboutReader.css | 441 ++++++++++++++++++ whitefox/apptarget/38/aboutSessionRestore.css | 33 ++ whitefox/apptarget/38/aboutSupport.css | 118 +++++ whitefox/apptarget/38/aboutTabCrashed.css | 11 + whitefox/apptarget/38/aboutWelcomeBack.css | 51 ++ whitefox/browser/aboutSessionRestore.css | 64 +-- whitefox/browser/aboutTabCrashed.css | 109 +---- whitefox/browser/aboutWelcomeBack.css | 43 +- whitefox/global/aboutReader.css | 4 +- whitefox/global/aboutSupport.css | 114 +---- 16 files changed, 991 insertions(+), 329 deletions(-) create mode 100644 whitefox/apptarget/33/aboutReader.css create mode 100755 whitefox/apptarget/33/aboutSessionRestore.css create mode 100644 whitefox/apptarget/33/aboutSupport.css create mode 100644 whitefox/apptarget/33/aboutTabCrashed.css create mode 100644 whitefox/apptarget/33/aboutWelcomeBack.css create mode 100644 whitefox/apptarget/38/aboutReader.css create mode 100644 whitefox/apptarget/38/aboutSessionRestore.css create mode 100644 whitefox/apptarget/38/aboutSupport.css create mode 100644 whitefox/apptarget/38/aboutTabCrashed.css create mode 100644 whitefox/apptarget/38/aboutWelcomeBack.css diff --git a/chrome.manifest b/chrome.manifest index 488d675..2a0f7bf 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -9,3 +9,6 @@ skin osbrowser simplewhite whitefox/ostarget/general/ skin osbrowser simplewhite whitefox/ostarget/darwin/ os=Darwin skin osbrowser simplewhite whitefox/ostarget/win/ os=WINNT skin osbrowser simplewhite whitefox/ostarget/sunos/ os=SunOS + +skin apptarget simplewhite whitefox/apptarget/33/ appversion>=33.0a1 +skin apptarget simplewhite whitefox/apptarget/38/ appversion>=38.0a1 diff --git a/whitefox/apptarget/33/aboutReader.css b/whitefox/apptarget/33/aboutReader.css new file mode 100644 index 0000000..630b26a --- /dev/null +++ b/whitefox/apptarget/33/aboutReader.css @@ -0,0 +1,3 @@ +/* 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/. */ diff --git a/whitefox/apptarget/33/aboutSessionRestore.css b/whitefox/apptarget/33/aboutSessionRestore.css new file mode 100755 index 0000000..b4959c0 --- /dev/null +++ b/whitefox/apptarget/33/aboutSessionRestore.css @@ -0,0 +1,63 @@ + +html { + height: 100%; +} + +body { + height: 100%; + text-align: center; +} + +#errorPageContainer { + background-image: url("chrome://global/skin/icons/warning-large.png"); + display: -moz-box; + width: -moz-available; + height: 70%; + -moz-box-orient: vertical; + text-align: start; +} + +#errorShortDesc > p { + margin-top: 0.4em; + margin-bottom: 0; +} + +#errorLongContent, #errorTrailerDesc { + display: -moz-box; + -moz-box-flex: 1; + -moz-box-orient: vertical; +} + +#tabList { + margin-top: 2.5em; + width: 100%; + min-height: 12em; +} + +treechildren::-moz-tree-image(icon), +treechildren::-moz-tree-image(noicon) { + padding-right: 2px; + margin: 0px 2px; + width: 16px; + height: 16px; +} + +treechildren::-moz-tree-image(noicon) { + list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); +} +treechildren::-moz-tree-image(container, noicon) { + list-style-image: url("chrome://browser/skin/aboutSessionRestore-window-icon.png"); +} +treechildren::-moz-tree-image(checked) { + list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif"); +} +treechildren::-moz-tree-image(partial) { + list-style-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif"); +} + +#buttons { + width: 100%; +} +#buttons > button { + margin-top: 2em; +} diff --git a/whitefox/apptarget/33/aboutSupport.css b/whitefox/apptarget/33/aboutSupport.css new file mode 100644 index 0000000..1438ab0 --- /dev/null +++ b/whitefox/apptarget/33/aboutSupport.css @@ -0,0 +1,113 @@ +/* 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/. */ + +html { + background-color: -moz-Field; + color: -moz-FieldText; + font: message-box; +} + +body { + width: 90%; + margin-left: 5%; + margin-right: 5%; +} + +.page-subtitle { + margin-bottom: 3em; +} + +.major-section { + margin-top: 2em; + margin-bottom: 1em; + font-size: large; + text-align: start; + font-weight: bold; +} + +table { + background-color: -moz-Dialog; + color: -moz-DialogText; + font: message-box; + text-align: start; + width: 100%; + border: 1px solid ThreeDShadow; + border-spacing: 0px; +} + +th, td { + border: 1px dotted ThreeDShadow; + padding: 3px; +} + +thead th { + text-align: center; +} + +th { + text-align: start; + background-color: Highlight; + color: HighlightText; +} + +th.column { + white-space: nowrap; + width: 0px; +} + +td { + text-align: start; + border-top: 1px dotted ThreeDShadow; +} + +.prefs-table { + width: 100%; + table-layout: fixed; +} + +.pref-name { + width: 70%; + white-space: nowrap; + overflow: hidden; +} + +.pref-value { + width: 30%; + white-space: nowrap; + overflow: hidden; +} + +#reset-box { + background-color: -moz-Dialog; + border: 1px solid ThreeDShadow; + color: -moz-DialogText; + float: right; + margin-top: 2em; + margin-bottom: 20px; + -moz-margin-start: 20px; + -moz-margin-end: 0; + padding: 16px; + width: 30%; + visibility: hidden; +} + +#reset-box:-moz-dir(rtl) { + float: left; +} + +#reset-box > h3 { + margin-top: 0; +} + +#reset-box > button { + display: block; +} + +.block { + display: block; +} + +.hidden { + display: none; +} diff --git a/whitefox/apptarget/33/aboutTabCrashed.css b/whitefox/apptarget/33/aboutTabCrashed.css new file mode 100644 index 0000000..54d6e8f --- /dev/null +++ b/whitefox/apptarget/33/aboutTabCrashed.css @@ -0,0 +1,108 @@ +body { + background-color: rgb(241, 244, 248); + margin-top: 2em; + font: message-box; + font-size: 100%; +} + +p { + font-size: .8em; +} + +#error-box { + background: url('chrome://global/skin/icons/information-24.png') no-repeat left 4px; + -moz-padding-start: 30px; +} + +#error-box:-moz-locale-dir(rtl) { + background-position: right 4px; +} + +#main-error-msg { + color: #4b4b4b; + font-weight: bold; +} + +#report-box { + text-align: center; + width: 75%; + margin: 0 auto; + display: none; +} + +.crashDumpAvailable #report-box { + display: block +} + +#button-box { + text-align: center; + width: 75%; + margin: 0 auto; +} + +@media all and (min-width: 300px) { + #error-box { + max-width: 50%; + margin: 0 auto; + background-image: url('chrome://global/skin/icons/information-32.png'); + min-height: 36px; + -moz-padding-start: 38px; + } + + button { + width: auto !important; + min-width: 150px; + } +} + +@media all and (min-width: 780px) { + #error-box { + max-width: 30%; + } +} + +button { + font: message-box; + font-size: 0.6875em; + -moz-appearance: none; + -moz-user-select: none; + width: 100%; + margin: 2px 0; + padding: 2px 6px; + line-height: 1.2; + background-color: hsla(210,30%,95%,.1); + background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1)); + background-clip: padding-box; + border: 1px solid hsla(210,15%,25%,.4); + border-color: hsla(210,15%,25%,.3) hsla(210,15%,25%,.35) hsla(210,15%,25%,.4); + border-radius: 3px; + box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset, + 0 0 0 1px hsla(0,0%,100%,.3) inset, + 0 1px 0 hsla(0,0%,100%,.1); + + transition-property: background-color, border-color, box-shadow; + transition-duration: 150ms; + transition-timing-function: ease; + +} + +button:hover { + background-color: hsla(210,30%,95%,.8); + border-color: hsla(210,15%,25%,.45) hsla(210,15%,25%,.5) hsla(210,15%,25%,.55); + box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset, + 0 0 0 1px hsla(0,0%,100%,.3) inset, + 0 1px 0 hsla(0,0%,100%,.1), + 0 0 3px hsla(210,15%,25%,.1); + transition-property: background-color, border-color, box-shadow; + transition-duration: 150ms; + transition-timing-function: ease; +} + +button:hover:active { + background-color: hsla(210,15%,25%,.2); + box-shadow: 0 1px 1px hsla(210,15%,25%,.2) inset, + 0 0 2px hsla(210,15%,25%,.4) inset; + transition-property: background-color, border-color, box-shadow; + transition-duration: 10ms; + transition-timing-function: linear; +} diff --git a/whitefox/apptarget/33/aboutWelcomeBack.css b/whitefox/apptarget/33/aboutWelcomeBack.css new file mode 100644 index 0000000..dd79400 --- /dev/null +++ b/whitefox/apptarget/33/aboutWelcomeBack.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/. */ + +#errorPageContainer { + background-image: url("chrome://global/skin/icons/information-64.png"); + height: auto; +} + +/* tablist starts out hidden, but JS may make it visible in response to + clicks on the radio buttons by setting an "available" attribute. +*/ +#tabList { + display: none; +} + +#tabList[available] { + display: -moz-box; +} + +.radioRestoreContainer { + display: flex; +} + +.radioRestoreButton { + flex: 0 0 auto; +} + +.radioRestoreButton:-moz-focusring { + outline: 1px dotted black; +} + +.radioChooseLabel { + flex: 1 1 auto; +} + +/* We want errorTrailerDesc to have the same padding-top as errorShortDesc + has padding-bottom +*/ +#errorTrailerDesc { + padding-top: 1em; +} diff --git a/whitefox/apptarget/38/aboutReader.css b/whitefox/apptarget/38/aboutReader.css new file mode 100644 index 0000000..41cb532 --- /dev/null +++ b/whitefox/apptarget/38/aboutReader.css @@ -0,0 +1,441 @@ +/* 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/. */ + +body { + padding: 64px 0; + max-width: 660px; + margin-left: auto; + margin-right: auto; +} + +.light, +.light-button { + color: #333333; + background-color: #ffffff; +} + +.dark, +.dark-button { + color: #eeeeee; + background-color: #333333; +} + +.sepia, +.sepia-button { + color: #333333; + background-color: #f0ece7; +} + +.sans-serif { + font-family: sans-serif; +} + +.serif { + font-family: serif; +} + +.font-size1 { + font-size: 10px; +} + +.font-size2 { + font-size: 12px; +} + +.font-size3 { + font-size: 14px; +} + +.font-size4 { + font-size: 16px; +} + +.font-size5 { + font-size: 18px; +} + +.font-size6 { + font-size: 20px; +} + +.font-size7 { + font-size: 22px; +} + +.font-size8 { + font-size: 24px; +} + +.font-size9 { + font-size: 26px; +} + + +/* Loading/error message */ + +.message { + margin-top: 40px; + display: none; + text-align: center; + width: 100%; + font-size: 0.9rem; +} + +/* Header */ + +.header { + text-align: start; + display: none; +} + +.domain { + font-size: 0.9rem; + line-height: 1.33rem; + padding-bottom: 4px; + font-family: sans-serif; + text-decoration: none; + border-bottom: 1px solid; + color: #0095dd; +} + +.light > .container > .header > .domain, +.sepia > .container > .header > .domain { + border-bottom-color: #333333; +} + +.dark > .container > .header > .domain { + border-bottom-color: #eeeeee; +} + +.header > h1 { + font-size: 1.33rem; + line-height: 1.66rem; + width: 100%; + margin: 30px 0; + padding: 0; +} + +.header > .credits { + font-size: 0.9rem; + line-height: 1.33rem; + margin: 0 0 30px 0; + padding: 0; + font-style: italic; +} + +/* Content */ + +.content { + display: none; + font-size: 1rem; + line-height: 1.44rem; +} + +.content h1, +.content h2, +.content h3 { + font-weight: bold; +} + +.content h1 { + font-size: 1.33rem; + line-height: 1.66rem; +} + +.content h2 { + font-size: 1.1rem; + line-height: 1.66rem; +} + +.content h3 { + font-size: 1rem; + line-height: 1.66rem; +} + +.content a { + text-decoration: underline; + font-weight: normal; +} + +.content a, +.content a:visited, +.content a:hover, +.content a:active { + color: #0095dd; +} + +.content * { + max-width: 100%; + height: auto; +} + +.content p, +.content img, +.content code, +.content pre, +.content blockquote, +.content ul, +.content ol, +.content li { + margin: 0 0 30px 0; +} + +.content .wp-caption, +.content figure { + margin: 0 30px 30px 30px; +} + +.content .caption, +.content .wp-caption-text, +.content figcaption { + font-size: 0.9rem; + line-height: 1.33rem; + font-style: italic; +} + +.content code, +.content pre { + white-space: pre-wrap; +} + +.content blockquote { + padding: 0; + -moz-padding-start: 16px; +} + +.light > .container > .content blockquote, +.sepia > .container > .content blockquote { + -moz-border-start: 2px solid #333333; +} + +.dark > .container > .content blockquote { + -moz-border-start: 2px solid #eeeeee; +} + +.content ul, +.content ol { + padding: 0; +} + +.content ul { + -moz-padding-start: 30px; + list-style: disk; +} + +.content ol { + -moz-padding-start: 30px; + list-style: decimal; +} + +/*======= Controls toolbar =======*/ + +.toolbar { + font-family: sans-serif; + position: fixed; + height: 100%; + top: 0px; + left: 0px; + margin: 0; + padding: 0; + list-style: none; + background-color: #FBFBFB; + -moz-user-select: none; + border-right: 1px solid #B5B5B5; +} + +.button { + color: white; + display: block; + background-position: center; + background-size: 24px 24px; + background-repeat: no-repeat; + background-color: transparent; + height: 40px; + width: 40px; + border-top: 0; + border-left: 0; + border-right: 0; + border-bottom: 1px solid #c1c1c1; +} + +.button[hidden] { + display: none; +} + +.dropdown { + text-align: center; + list-style: none; + margin: 0px; + padding: 0px; +} + +.dropdown li { + margin: 0px; + padding: 0px; +} + +/*======= Font style popup =======*/ + +.dropdown-popup { + min-width: 250px; + text-align: start; + position: absolute; + left: 48px; /* offset to account for toolbar width */ + z-index: 1000; + background-color: #FBFBFB; + visibility: hidden; + border-radius: 4px; + border: 1px solid #B5B5B5; + box-shadow: 0px 1px 12px #666; +} + +.dropdown-popup > hr { + width: 100%; + height: 0px; + border: 0px; + border-top: 1px solid #B5B5B5; + margin: 0; +} + +.open > .dropdown-popup { + visibility: visible; +} + +.dropdown-arrow { + position: absolute; + top: 30px; /* offset arrow from top of popup */ + left: -16px; + width: 24px; + height: 24px; + background-image: url("chrome://global/skin/reader/RM-Type-Controls-Arrow.svg"); + display: block; +} + +#font-type-buttons, +#font-size-buttons, +#color-scheme-buttons { + display: flex; + flex-direction: row; +} + +#font-type-buttons > button, +#font-size-buttons > button, +#color-scheme-buttons > button { + text-align: center; + border-left: 1px solid #B5B5B5; + border-right: 0; + border-top: 0; + border-bottom: 0; + padding: 10px; +} + +#font-type-buttons > button, +#font-size-buttons > button { + width: 50%; + background-color: transparent; +} + +#color-scheme-buttons > button { + width: 33%; + font-size: 14px; +} + +#font-type-buttons > button:first-child, +#font-size-buttons > button:first-child, +#color-scheme-buttons > button:first-child { + border-left: 0px; +} + +#font-type-buttons > button { + display: inline-block; + font-size: 48px; + border-bottom: 3px solid transparent; +} + +#font-type-buttons > button:active:hover, +#font-type-buttons > button.selected { + border-bottom: 3px solid #FC6420; +} + +#font-type-buttons > button > div { + color: #666; + font-size: 12px; +} + +.button:hover, +#font-size-buttons > button:hover { + background-color: #EBEBEB; +} + +.dropdown.open, +.button:active, +#font-size-buttons > button:active, +#font-size-buttons > button.selected { + background-color: #DADADA; +} + +/* Only used on Android */ +#font-size-sample { + display: none; +} + +.serif-button { + font-family: serif; +} + +.minus-button, +.plus-button { + background-color: transparent; + border: 0; + height: 50px; + background-size: 18px 18px; + background-repeat: no-repeat; + background-position: center; +} + +/*======= Toolbar icons =======*/ + +/* Android-only controls */ +.share-button { + display: none; +} + +.close-button { + background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg"); + height: 68px; + background-position: center 8px; +} + +.close-button:active, +.close-button:hover { + background-image: url("chrome://global/skin/reader/RM-Close-hover-24x24.svg"); + background-color: #d94141; +} + +.style-button { + background-image: url("chrome://global/skin/reader/RM-Type-Controls-24x24.svg"); +} + +.toggle-button.on { + background-image: url("chrome://global/skin/reader/RM-Delete-24x24.svg"); +} + +.toggle-button { + background-image: url("chrome://global/skin/reader/RM-Add-24x24.svg"); +} + +.list-button { + background-image: url("chrome://global/skin/reader/RM-Reading-List-24x24.svg"); +} +.list-button.on { + background-color: #d9d9d9; +} + +.minus-button { + background-image: url("chrome://global/skin/reader/RM-Minus-24x24.svg"); +} + +.plus-button { + background-image: url("chrome://global/skin/reader/RM-Plus-24x24.svg"); +} diff --git a/whitefox/apptarget/38/aboutSessionRestore.css b/whitefox/apptarget/38/aboutSessionRestore.css new file mode 100644 index 0000000..5ee66a2 --- /dev/null +++ b/whitefox/apptarget/38/aboutSessionRestore.css @@ -0,0 +1,33 @@ + +.title { + background-image: url("chrome://browser/skin/session-restore.svg"); +} + +treechildren::-moz-tree-image(icon), +treechildren::-moz-tree-image(noicon) { + padding-right: 2px; + margin: 0 2px; + width: 16px; + height: 16px; +} + +treechildren::-moz-tree-image(noicon) { + list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); +} +treechildren::-moz-tree-image(container, noicon) { + list-style-image: url("chrome://browser/skin/aboutSessionRestore-window-icon.png"); +} + +treechildren::-moz-tree-image(checked) { + list-style-image: url("chrome://global/skin/in-content/check.svg#check"); +} +treechildren::-moz-tree-image(checked, selected) { + list-style-image: url("chrome://global/skin/in-content/check.svg#check-inverted"); +} + +treechildren::-moz-tree-image(partial) { + list-style-image: url("chrome://global/skin/in-content/check-partial.svg#check-partial"); +} +treechildren::-moz-tree-image(partial, selected) { + list-style-image: url("chrome://global/skin/in-content/check-partial.svg#check-partial-inverted"); +} \ No newline at end of file diff --git a/whitefox/apptarget/38/aboutSupport.css b/whitefox/apptarget/38/aboutSupport.css new file mode 100644 index 0000000..71ef7a7 --- /dev/null +++ b/whitefox/apptarget/38/aboutSupport.css @@ -0,0 +1,118 @@ +/* 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/. */ + +html { + background-color: -moz-Field; + color: -moz-FieldText; + font: message-box; +} + +body { + width: 90%; + margin-left: 5%; + margin-right: 5%; +} + +.page-subtitle { + margin-bottom: 3em; +} + +.major-section { + margin-top: 2em; + margin-bottom: 1em; + font-size: large; + text-align: start; + font-weight: bold; +} + +table { + background-color: -moz-Dialog; + color: -moz-DialogText; + font: message-box; + text-align: start; + width: 100%; + border: 1px solid ThreeDShadow; + border-spacing: 0px; +} + +th, td { + border: 1px dotted ThreeDShadow; + padding: 3px; +} + +thead th { + text-align: center; +} + +th { + text-align: start; + background-color: Highlight; + color: HighlightText; +} + +th.column { + white-space: nowrap; + width: 0px; +} + +td { + text-align: start; + border-top: 1px dotted ThreeDShadow; +} + +.prefs-table { + width: 100%; + table-layout: fixed; +} + +.pref-name { + width: 70%; + white-space: nowrap; + overflow: hidden; +} + +.pref-value { + width: 30%; + white-space: nowrap; + overflow: hidden; +} + +#action-box { + background-color: -moz-Dialog; + border: 1px solid ThreeDShadow; + color: -moz-DialogText; + float: right; + margin-top: 2em; + margin-bottom: 20px; + -moz-margin-start: 20px; + -moz-margin-end: 0; + padding: 16px; + width: 30%; +} + +#action-box, +#reset-box, +#safe-mode-box { + display: none; +} + +#action-box:-moz-dir(rtl) { + float: left; +} + +#reset-box > h3 { + margin-top: 0; +} + +#action-box button { + display: block; +} + +.block { + display: block; +} + +.hidden { + display: none; +} diff --git a/whitefox/apptarget/38/aboutTabCrashed.css b/whitefox/apptarget/38/aboutTabCrashed.css new file mode 100644 index 0000000..2ef767e --- /dev/null +++ b/whitefox/apptarget/38/aboutTabCrashed.css @@ -0,0 +1,11 @@ +/* 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/. */ + +.title { + background-image: url("chrome://browser/skin/tab-crashed.svg"); +} + +#reportSent { + font-weight: bold; +} diff --git a/whitefox/apptarget/38/aboutWelcomeBack.css b/whitefox/apptarget/38/aboutWelcomeBack.css new file mode 100644 index 0000000..eb0b7a9 --- /dev/null +++ b/whitefox/apptarget/38/aboutWelcomeBack.css @@ -0,0 +1,51 @@ +/* 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/. */ + +.title { + background-image: url("chrome://browser/skin/welcome-back.svg"); +} + +.radioRestoreContainer:not(:last-child) { + margin-bottom: 0.2em; +} + +/* tablist starts out hidden, but JS may make it visible in response to + clicks on the radio buttons by setting an "available" attribute. +*/ +#tabList { + display: none; +} + +#tabList[available] { + display: -moz-box; +} + +treechildren::-moz-tree-image(icon), +treechildren::-moz-tree-image(noicon) { + padding-right: 2px; + margin: 0 2px; + width: 16px; + height: 16px; +} + +treechildren::-moz-tree-image(noicon) { + list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); +} +treechildren::-moz-tree-image(container, noicon) { + list-style-image: url("chrome://browser/skin/aboutSessionRestore-window-icon.png"); +} + +treechildren::-moz-tree-image(checked) { + list-style-image: url("chrome://global/skin/in-content/check.svg#check"); +} +treechildren::-moz-tree-image(checked, selected) { + list-style-image: url("chrome://global/skin/in-content/check.svg#check-inverted"); +} + +treechildren::-moz-tree-image(partial) { + list-style-image: url("chrome://global/skin/in-content/check-partial.svg#check-partial"); +} +treechildren::-moz-tree-image(partial, selected) { + list-style-image: url("chrome://global/skin/in-content/check-partial.svg#check-partial-inverted"); +} \ No newline at end of file diff --git a/whitefox/browser/aboutSessionRestore.css b/whitefox/browser/aboutSessionRestore.css index b4959c0..a392449 100755 --- a/whitefox/browser/aboutSessionRestore.css +++ b/whitefox/browser/aboutSessionRestore.css @@ -1,63 +1 @@ - -html { - height: 100%; -} - -body { - height: 100%; - text-align: center; -} - -#errorPageContainer { - background-image: url("chrome://global/skin/icons/warning-large.png"); - display: -moz-box; - width: -moz-available; - height: 70%; - -moz-box-orient: vertical; - text-align: start; -} - -#errorShortDesc > p { - margin-top: 0.4em; - margin-bottom: 0; -} - -#errorLongContent, #errorTrailerDesc { - display: -moz-box; - -moz-box-flex: 1; - -moz-box-orient: vertical; -} - -#tabList { - margin-top: 2.5em; - width: 100%; - min-height: 12em; -} - -treechildren::-moz-tree-image(icon), -treechildren::-moz-tree-image(noicon) { - padding-right: 2px; - margin: 0px 2px; - width: 16px; - height: 16px; -} - -treechildren::-moz-tree-image(noicon) { - list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); -} -treechildren::-moz-tree-image(container, noicon) { - list-style-image: url("chrome://browser/skin/aboutSessionRestore-window-icon.png"); -} -treechildren::-moz-tree-image(checked) { - list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif"); -} -treechildren::-moz-tree-image(partial) { - list-style-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif"); -} - -#buttons { - width: 100%; -} -#buttons > button { - margin-top: 2em; -} +@import url("chrome://apptarget/skin/aboutSessionRestore.css"); \ No newline at end of file diff --git a/whitefox/browser/aboutTabCrashed.css b/whitefox/browser/aboutTabCrashed.css index 54d6e8f..3bcac30 100644 --- a/whitefox/browser/aboutTabCrashed.css +++ b/whitefox/browser/aboutTabCrashed.css @@ -1,108 +1 @@ -body { - background-color: rgb(241, 244, 248); - margin-top: 2em; - font: message-box; - font-size: 100%; -} - -p { - font-size: .8em; -} - -#error-box { - background: url('chrome://global/skin/icons/information-24.png') no-repeat left 4px; - -moz-padding-start: 30px; -} - -#error-box:-moz-locale-dir(rtl) { - background-position: right 4px; -} - -#main-error-msg { - color: #4b4b4b; - font-weight: bold; -} - -#report-box { - text-align: center; - width: 75%; - margin: 0 auto; - display: none; -} - -.crashDumpAvailable #report-box { - display: block -} - -#button-box { - text-align: center; - width: 75%; - margin: 0 auto; -} - -@media all and (min-width: 300px) { - #error-box { - max-width: 50%; - margin: 0 auto; - background-image: url('chrome://global/skin/icons/information-32.png'); - min-height: 36px; - -moz-padding-start: 38px; - } - - button { - width: auto !important; - min-width: 150px; - } -} - -@media all and (min-width: 780px) { - #error-box { - max-width: 30%; - } -} - -button { - font: message-box; - font-size: 0.6875em; - -moz-appearance: none; - -moz-user-select: none; - width: 100%; - margin: 2px 0; - padding: 2px 6px; - line-height: 1.2; - background-color: hsla(210,30%,95%,.1); - background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1)); - background-clip: padding-box; - border: 1px solid hsla(210,15%,25%,.4); - border-color: hsla(210,15%,25%,.3) hsla(210,15%,25%,.35) hsla(210,15%,25%,.4); - border-radius: 3px; - box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset, - 0 0 0 1px hsla(0,0%,100%,.3) inset, - 0 1px 0 hsla(0,0%,100%,.1); - - transition-property: background-color, border-color, box-shadow; - transition-duration: 150ms; - transition-timing-function: ease; - -} - -button:hover { - background-color: hsla(210,30%,95%,.8); - border-color: hsla(210,15%,25%,.45) hsla(210,15%,25%,.5) hsla(210,15%,25%,.55); - box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset, - 0 0 0 1px hsla(0,0%,100%,.3) inset, - 0 1px 0 hsla(0,0%,100%,.1), - 0 0 3px hsla(210,15%,25%,.1); - transition-property: background-color, border-color, box-shadow; - transition-duration: 150ms; - transition-timing-function: ease; -} - -button:hover:active { - background-color: hsla(210,15%,25%,.2); - box-shadow: 0 1px 1px hsla(210,15%,25%,.2) inset, - 0 0 2px hsla(210,15%,25%,.4) inset; - transition-property: background-color, border-color, box-shadow; - transition-duration: 10ms; - transition-timing-function: linear; -} +@import url("chrome://apptarget/skin/aboutTabCrashed.css"); \ No newline at end of file diff --git a/whitefox/browser/aboutWelcomeBack.css b/whitefox/browser/aboutWelcomeBack.css index dd79400..716af7a 100644 --- a/whitefox/browser/aboutWelcomeBack.css +++ b/whitefox/browser/aboutWelcomeBack.css @@ -1,42 +1 @@ -/* 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/. */ - -#errorPageContainer { - background-image: url("chrome://global/skin/icons/information-64.png"); - height: auto; -} - -/* tablist starts out hidden, but JS may make it visible in response to - clicks on the radio buttons by setting an "available" attribute. -*/ -#tabList { - display: none; -} - -#tabList[available] { - display: -moz-box; -} - -.radioRestoreContainer { - display: flex; -} - -.radioRestoreButton { - flex: 0 0 auto; -} - -.radioRestoreButton:-moz-focusring { - outline: 1px dotted black; -} - -.radioChooseLabel { - flex: 1 1 auto; -} - -/* We want errorTrailerDesc to have the same padding-top as errorShortDesc - has padding-bottom -*/ -#errorTrailerDesc { - padding-top: 1em; -} +@import url("chrome://apptarget/skin/aboutWelcomeBack.css"); \ No newline at end of file diff --git a/whitefox/global/aboutReader.css b/whitefox/global/aboutReader.css index 630b26a..07878c1 100644 --- a/whitefox/global/aboutReader.css +++ b/whitefox/global/aboutReader.css @@ -1,3 +1 @@ -/* 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://apptarget/skin/aboutReader.css"); \ No newline at end of file diff --git a/whitefox/global/aboutSupport.css b/whitefox/global/aboutSupport.css index 1438ab0..ebcbac3 100644 --- a/whitefox/global/aboutSupport.css +++ b/whitefox/global/aboutSupport.css @@ -1,113 +1 @@ -/* 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/. */ - -html { - background-color: -moz-Field; - color: -moz-FieldText; - font: message-box; -} - -body { - width: 90%; - margin-left: 5%; - margin-right: 5%; -} - -.page-subtitle { - margin-bottom: 3em; -} - -.major-section { - margin-top: 2em; - margin-bottom: 1em; - font-size: large; - text-align: start; - font-weight: bold; -} - -table { - background-color: -moz-Dialog; - color: -moz-DialogText; - font: message-box; - text-align: start; - width: 100%; - border: 1px solid ThreeDShadow; - border-spacing: 0px; -} - -th, td { - border: 1px dotted ThreeDShadow; - padding: 3px; -} - -thead th { - text-align: center; -} - -th { - text-align: start; - background-color: Highlight; - color: HighlightText; -} - -th.column { - white-space: nowrap; - width: 0px; -} - -td { - text-align: start; - border-top: 1px dotted ThreeDShadow; -} - -.prefs-table { - width: 100%; - table-layout: fixed; -} - -.pref-name { - width: 70%; - white-space: nowrap; - overflow: hidden; -} - -.pref-value { - width: 30%; - white-space: nowrap; - overflow: hidden; -} - -#reset-box { - background-color: -moz-Dialog; - border: 1px solid ThreeDShadow; - color: -moz-DialogText; - float: right; - margin-top: 2em; - margin-bottom: 20px; - -moz-margin-start: 20px; - -moz-margin-end: 0; - padding: 16px; - width: 30%; - visibility: hidden; -} - -#reset-box:-moz-dir(rtl) { - float: left; -} - -#reset-box > h3 { - margin-top: 0; -} - -#reset-box > button { - display: block; -} - -.block { - display: block; -} - -.hidden { - display: none; -} +@import url("chrome://apptarget/skin/aboutSupport.css"); \ No newline at end of file From 81a45ff643c8d91e65a9345e5c95fb5758645e7d Mon Sep 17 00:00:00 2001 From: Louis Chan Date: Thu, 2 Apr 2015 01:26:13 +0800 Subject: [PATCH 3/7] Updates for 38b2 (Part I) --- whitefox/apptarget/33/config.css | 76 ++++++++++ whitefox/apptarget/38/config.css | 49 +++++++ .../downloads/allDownloadsViewOverlay.css | 4 + whitefox/browser/downloads/downloads.css | 4 + whitefox/browser/pageInfo.css | 20 ++- .../browser/preferences/in-content/search.css | 20 ++- whitefox/browser/preferences/preferences.css | 1 + whitefox/browser/readerMode.svg | 34 +++++ whitefox/browser/readinglist/icons.svg | 56 +++++++ .../browser/readinglist/readinglist-icon.svg | 9 ++ whitefox/browser/readinglist/sidebar.css | 137 ++++++++++++++++++ whitefox/browser/session-restore.svg | 12 ++ whitefox/browser/tab-crashed.svg | 16 ++ whitefox/browser/welcome-back.svg | 17 +++ whitefox/global/config.css | 77 +--------- whitefox/global/icons/warning.svg | 12 ++ whitefox/global/in-content/check-partial.svg | 31 ++++ whitefox/global/in-content/sorter.png | Bin 264 -> 0 bytes whitefox/global/in-content/sorter@2x.png | Bin 523 -> 0 bytes .../global/media/videoClickToPlayButton.svg | 38 +---- whitefox/global/reader/RM-Add-24x24.svg | 6 + whitefox/global/reader/RM-Close-24x24.svg | 8 + .../global/reader/RM-Close-hover-24x24.svg | 8 + whitefox/global/reader/RM-Delete-24x24.svg | 6 + whitefox/global/reader/RM-Minus-24x24.svg | 39 +++++ whitefox/global/reader/RM-Plus-24x24.svg | 39 +++++ .../global/reader/RM-Reading-List-24x24.svg | 46 ++++++ .../global/reader/RM-Type-Controls-24x24.svg | 23 +++ .../global/reader/RM-Type-Controls-Arrow.svg | 42 ++++++ 29 files changed, 714 insertions(+), 116 deletions(-) create mode 100644 whitefox/apptarget/33/config.css create mode 100644 whitefox/apptarget/38/config.css mode change 100755 => 100644 whitefox/browser/pageInfo.css create mode 100644 whitefox/browser/readerMode.svg create mode 100644 whitefox/browser/readinglist/icons.svg create mode 100644 whitefox/browser/readinglist/readinglist-icon.svg create mode 100644 whitefox/browser/readinglist/sidebar.css create mode 100644 whitefox/browser/session-restore.svg create mode 100644 whitefox/browser/tab-crashed.svg create mode 100644 whitefox/browser/welcome-back.svg create mode 100644 whitefox/global/icons/warning.svg create mode 100644 whitefox/global/in-content/check-partial.svg delete mode 100644 whitefox/global/in-content/sorter.png delete mode 100644 whitefox/global/in-content/sorter@2x.png mode change 100755 => 100644 whitefox/global/media/videoClickToPlayButton.svg create mode 100644 whitefox/global/reader/RM-Add-24x24.svg create mode 100644 whitefox/global/reader/RM-Close-24x24.svg create mode 100644 whitefox/global/reader/RM-Close-hover-24x24.svg create mode 100644 whitefox/global/reader/RM-Delete-24x24.svg create mode 100644 whitefox/global/reader/RM-Minus-24x24.svg create mode 100644 whitefox/global/reader/RM-Plus-24x24.svg create mode 100644 whitefox/global/reader/RM-Reading-List-24x24.svg create mode 100644 whitefox/global/reader/RM-Type-Controls-24x24.svg create mode 100644 whitefox/global/reader/RM-Type-Controls-Arrow.svg diff --git a/whitefox/apptarget/33/config.css b/whitefox/apptarget/33/config.css new file mode 100644 index 0000000..04ba1e8 --- /dev/null +++ b/whitefox/apptarget/33/config.css @@ -0,0 +1,76 @@ + +@import url("chrome://global/skin/"); +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + + +#warningScreen +{ + background-color: -moz-Dialog; +} + +#warningBox +{ + background-color: -moz-Field; + color: -moz-FieldText; + border: 1px solid ThreeDShadow; + border-radius: 10px; + padding: 3em; + -moz-padding-start: 30px; + margin-left: 1em; + margin-right: 1em; +} + +#warningInnerBox +{ + max-width: 50em; +} + +#warningTitle +{ + margin: 0 0 .6em 0; + font-size: 160%; + border-bottom: 1px solid ThreeDLightShadow +} + +#warningText +{ + font-size: 110%; + margin-left: 0; +} + +#warningButton +{ + margin-top: 0.6em; +} + +#showWarningNextTime +{ + margin-top: 0.6em; +} + +#exclam +{ + list-style-image: url("chrome://global/skin/icons/warning-large.png"); + -moz-margin-end: 3em; +} + +#configTreeBody::-moz-tree-cell-text(user) +{ + font-weight: bold; +} + +#configTreeBody::-moz-tree-cell-text(locked) +{ + font-style: italic; +} + +#configTree +{ + margin-top: 5px; + margin-bottom: 5px; +} + +#filterRow +{ + margin-top: 5px; +} diff --git a/whitefox/apptarget/38/config.css b/whitefox/apptarget/38/config.css new file mode 100644 index 0000000..f1c7396 --- /dev/null +++ b/whitefox/apptarget/38/config.css @@ -0,0 +1,49 @@ +/* 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/. */ + +#warningScreen { + font-size: 15px; + padding-top: 0; + padding-bottom: 0; + -moz-padding-start: calc(48px + 4.6em); + -moz-padding-end: 48px; +} + +.title { + background-image: url("chrome://global/skin/icons/warning.svg"); +} + +#warningTitle { + font-weight: lighter; + line-height: 1.2; + color: #333; + margin: 0; + margin-bottom: .5em; +} + +#warningText { + margin: 1em 0; +} + +#warningButton { + margin-top: 0.6em; +} + +#filterRow { + margin-top: 4px; + -moz-margin-start: 4px; +} + +#configTree { + margin-top: 4px; + margin-bottom: 4px; +} + +#configTreeBody::-moz-tree-cell-text(user) { + font-weight: bold; +} + +#configTreeBody::-moz-tree-cell-text(locked) { + font-style: italic; +} diff --git a/whitefox/browser/downloads/allDownloadsViewOverlay.css b/whitefox/browser/downloads/allDownloadsViewOverlay.css index e05ae08..c674487 100755 --- a/whitefox/browser/downloads/allDownloadsViewOverlay.css +++ b/whitefox/browser/downloads/allDownloadsViewOverlay.css @@ -52,18 +52,22 @@ /*** Button icons ***/ +.downloadButton.downloadConfirmBlock, .downloadButton.downloadCancel { -moz-image-region: rect(0px, 16px, 16px, 0px); } +richlistitem.download:hover > .downloadButton.downloadConfirmBlock, richlistitem.download:hover > .downloadButton.downloadCancel { -moz-image-region: rect(0px, 32px, 16px, 16px); } +richlistitem.download:hover > .downloadButton.downloadConfirmBlock:hover, richlistitem.download:hover > .downloadButton.downloadCancel:hover { -moz-image-region: rect(0px, 48px, 16px, 32px); } +richlistitem.download:hover > .downloadButton.downloadConfirmBlock:active, richlistitem.download:hover > .downloadButton.downloadCancel:active { -moz-image-region: rect(0px, 64px, 16px, 48px); } diff --git a/whitefox/browser/downloads/downloads.css b/whitefox/browser/downloads/downloads.css index c609816..c9b8396 100755 --- a/whitefox/browser/downloads/downloads.css +++ b/whitefox/browser/downloads/downloads.css @@ -182,15 +182,19 @@ 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.downloadCancel { -moz-image-region: rect(0px, 32px, 16px, 16px); } +richlistitem[type="download"]:hover > stack > .downloadButton.downloadConfirmBlock:hover, richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel:hover { -moz-image-region: rect(0px, 48px, 16px, 32px); } +richlistitem[type="download"]:hover > stack > .downloadButton.downloadConfirmBlock:active, richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel:active { -moz-image-region: rect(0px, 64px, 16px, 48px); } diff --git a/whitefox/browser/pageInfo.css b/whitefox/browser/pageInfo.css old mode 100755 new mode 100644 index f205b57..d125fd9 --- a/whitefox/browser/pageInfo.css +++ b/whitefox/browser/pageInfo.css @@ -116,7 +116,7 @@ textbox[disabled] { } /* General Tab */ -groupbox.collapsable caption .caption-icon { +groupbox.collapsable caption .caption-icon { width: 9px; height: 9px; background-repeat: no-repeat; @@ -132,16 +132,16 @@ groupbox.collapsable[closed="true"] { -moz-appearance: none; } -groupbox.collapsable[closed="true"] caption .caption-icon { +groupbox.collapsable[closed="true"] caption .caption-icon { background-image: url("chrome://global/skin/tree/twisty-clsd.png"); } -groupbox tree { +groupbox tree { margin: 0 3px; border: none; } -#securityBox description { +#securityBox description { -moz-margin-start: 10px; } @@ -206,7 +206,7 @@ treechildren::-moz-tree-cell-text(broken) { -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow; } -.feedTitle { +.feedTitle { font-weight: bold; } @@ -247,12 +247,16 @@ treechildren::-moz-tree-cell-text(broken) { #securityPanel .header { font-size: 120%; } - + #securityPanel .fieldLabel { - margin: 2px 10px 3px 10px; + margin: 2px 10px 3px; } #securityPanel .fieldValue { font-weight: bold; - margin: 2px 10px 0px 10px; + margin: 2px 10px 3px; +} + +#securityPanel row { + -moz-box-align: center; } diff --git a/whitefox/browser/preferences/in-content/search.css b/whitefox/browser/preferences/in-content/search.css index ebcd82e..a203a4d 100644 --- a/whitefox/browser/preferences/in-content/search.css +++ b/whitefox/browser/preferences/in-content/search.css @@ -2,6 +2,10 @@ * 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 { + -moz-margin-start: 0; + } + #defaultEngine > .menulist-label-box > .menulist-icon { height: 16px; } @@ -12,7 +16,7 @@ } #engineList { - margin: .5em 6px; + margin: .5em 0; } #engineList treechildren::-moz-tree-image(engineShown, checked) { @@ -43,3 +47,17 @@ height: 2px; -moz-margin-start: 0; } + +#engineShown { + min-width: 26px; +} + +#addEnginesBox { + margin-bottom: 1em; +} + +#removeEngineButton, +#restoreDefaultSearchEngines { + margin-right: 0; + margin-left: 0; +} diff --git a/whitefox/browser/preferences/preferences.css b/whitefox/browser/preferences/preferences.css index 66450e4..20d7e67 100644 --- a/whitefox/browser/preferences/preferences.css +++ b/whitefox/browser/preferences/preferences.css @@ -47,6 +47,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/whitefox/browser/readerMode.svg b/whitefox/browser/readerMode.svg new file mode 100644 index 0000000..3d024ea --- /dev/null +++ b/whitefox/browser/readerMode.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/whitefox/browser/readinglist/icons.svg b/whitefox/browser/readinglist/icons.svg new file mode 100644 index 0000000..c859ae2 --- /dev/null +++ b/whitefox/browser/readinglist/icons.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/whitefox/browser/readinglist/readinglist-icon.svg b/whitefox/browser/readinglist/readinglist-icon.svg new file mode 100644 index 0000000..0a24a67 --- /dev/null +++ b/whitefox/browser/readinglist/readinglist-icon.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/whitefox/browser/readinglist/sidebar.css b/whitefox/browser/readinglist/sidebar.css new file mode 100644 index 0000000..2771ae0 --- /dev/null +++ b/whitefox/browser/readinglist/sidebar.css @@ -0,0 +1,137 @@ +/* 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/. */ + + +:root, body { + height: 100%; + overflow-x: hidden; +} + +body { + margin: 0; + font: message-box; + color: #333333; + -moz-user-select: none; + overflow: hidden; +} + +#emptyListInfo { + cursor: default; + padding: 3em 1em; + text-align: center; +} + +#list { + height: 100%; + overflow-x: auto; +} + +.item { + display: flex; + flex-flow: row; + cursor: pointer; + padding: 6px; +} + +.item.active { + background: #FEFEFE; +} + +.item.selected { + background: #FDFDFD; +} + +.item-thumb-container { + min-width: 64px; + max-width: 64px; + min-height: 40px; + max-height: 40px; + border: 1px solid white; + box-shadow: 0px 1px 2px rgba(0,0,0,.35); + margin: 5px; + background-color: #ebebeb; + background-size: contain; + background-repeat: no-repeat; + background-position: center; + background-image: url("chrome://branding/content/silhouette-40.svg"); +} + +.item-thumb-container.preview-available { + background-color: #fff; + background-size: cover; +} + +.item-summary-container { + display: flex; + flex-flow: column; + -moz-padding-start: 4px; + overflow: hidden; + flex-grow: 1; +} + +.item-title-lines { + display: flex; +} + +.item-title { + overflow: hidden; + max-height: 2.8em; + line-height: 1.4; + flex-grow: 1; +} + +.item-domain { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + max-height: 1.4em; + color: #0095DD; +} + +.item:hover .item-domain { + color: #008ACB; +} + +.item:not(:hover):not(.selected) .remove-button { + visibility: hidden; +} + +.remove-button { + padding: 0; + width: 16px; + height: 16px; + background-size: contain; + background-color: transparent; + border-width: 0; +} + + +html { + background-color: #EEF3FA; +} + +.item { + -moz-padding-end: 0; +} + +.item-title { + margin: 1px 0 0; +} + +.item-title, .item-domain { + -moz-margin-end: 6px; +} + +.remove-button { + -moz-margin-end: 2px; + background-image: -moz-image-rect(url("chrome://global/skin/icons/close.png"), 0, 16, 16, 0); +} + +.remove-button:hover { + background-image: -moz-image-rect(url("chrome://global/skin/icons/close.png"), 0, 32, 16, 16); +} + +.remove-button:hover:active { + background-image: -moz-image-rect(url("chrome://global/skin/icons/close.png"), 0, 48, 16, 32); +} diff --git a/whitefox/browser/session-restore.svg b/whitefox/browser/session-restore.svg new file mode 100644 index 0000000..aadee35 --- /dev/null +++ b/whitefox/browser/session-restore.svg @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/whitefox/browser/tab-crashed.svg b/whitefox/browser/tab-crashed.svg new file mode 100644 index 0000000..9a656eb --- /dev/null +++ b/whitefox/browser/tab-crashed.svg @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/whitefox/browser/welcome-back.svg b/whitefox/browser/welcome-back.svg new file mode 100644 index 0000000..38610cb --- /dev/null +++ b/whitefox/browser/welcome-back.svg @@ -0,0 +1,17 @@ + + + + + + + + \ No newline at end of file diff --git a/whitefox/global/config.css b/whitefox/global/config.css index 04ba1e8..000f836 100644 --- a/whitefox/global/config.css +++ b/whitefox/global/config.css @@ -1,76 +1 @@ - -@import url("chrome://global/skin/"); -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - - -#warningScreen -{ - background-color: -moz-Dialog; -} - -#warningBox -{ - background-color: -moz-Field; - color: -moz-FieldText; - border: 1px solid ThreeDShadow; - border-radius: 10px; - padding: 3em; - -moz-padding-start: 30px; - margin-left: 1em; - margin-right: 1em; -} - -#warningInnerBox -{ - max-width: 50em; -} - -#warningTitle -{ - margin: 0 0 .6em 0; - font-size: 160%; - border-bottom: 1px solid ThreeDLightShadow -} - -#warningText -{ - font-size: 110%; - margin-left: 0; -} - -#warningButton -{ - margin-top: 0.6em; -} - -#showWarningNextTime -{ - margin-top: 0.6em; -} - -#exclam -{ - list-style-image: url("chrome://global/skin/icons/warning-large.png"); - -moz-margin-end: 3em; -} - -#configTreeBody::-moz-tree-cell-text(user) -{ - font-weight: bold; -} - -#configTreeBody::-moz-tree-cell-text(locked) -{ - font-style: italic; -} - -#configTree -{ - margin-top: 5px; - margin-bottom: 5px; -} - -#filterRow -{ - margin-top: 5px; -} +@import url("chrome://apptarget/skin/config.css"); \ No newline at end of file diff --git a/whitefox/global/icons/warning.svg b/whitefox/global/icons/warning.svg new file mode 100644 index 0000000..0082970 --- /dev/null +++ b/whitefox/global/icons/warning.svg @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/whitefox/global/in-content/check-partial.svg b/whitefox/global/in-content/check-partial.svg new file mode 100644 index 0000000..b46a731 --- /dev/null +++ b/whitefox/global/in-content/check-partial.svg @@ -0,0 +1,31 @@ + + + + + + + + + + \ No newline at end of file diff --git a/whitefox/global/in-content/sorter.png b/whitefox/global/in-content/sorter.png deleted file mode 100644 index 41934733aae415712b2d513f7ee07e15cda217b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 264 zcmV+j0r&oiP)5Ie|2mz4d<;&L?PMkXX%d}Z@j{y0scr~nFzg}SCw3+w&CQbhj z!qaBWp9Ivzgv)g1NmJ)+>FS&O9|`}PIcI(p$YuOc znm~-HGv~Usb@l&g>FE96+S&IXL?h#lzDc*YZQI5N)-ZF?BDt3KzBi4no&THKy8gpx zWHyNI>Ycm}f{JjCFfe!$Qs<{@}bdS#f O0000`;+z zr9&wQf@ljS0SCq7xni_pq!0DN@BUA6ZqCg;=N^lti6P7Kh~+;90JM>Kd`#F>Zl&j8p9DvGq|k1}FUnxRlW;MU%MDZiZ#U=+@5EMo zJONJFe8aHCkaCRv-j+9^DcFz4r@ege(Gv)Q8S++S71wpO61@E=ogVQCr0n(y!1_g? z`VCHa+TJ^yYpNdadGEzEoH1S=>cRShx2aTWyrG-*9=uB=irwW2KqEL=KX?PuMLwVJ zt6L9RR7Hu*JKfx~!_9#iG@zlia3YcL`|ck%p+}6xk`oS=tJoPIw7`ofg_r10nx-b3 z%?`R)?#kx!!iLiWRBLUjwYHhx=Je?M+Xqu$>R~h!!wI`qha2ia0~uOt8-6@VF_X!B zHX%I{&y(eKI|GfdW^;Y08Ptb0{A@y;`b(wK>|Lc|ebBUXUDt0=A2eN88wJ;^nx@^W zs+O--tE61MUck7+Z~cMO5Hf?%u8bln - - - - - - - + + style="fill:#ffffff;" /> + style="filter:url(#dropShadow);" /> + style="fill:url(#arrowGradient);" /> + style="fill:url(#whiteGradient);" /> + style="fill:white;fill-opacity:.3;" /> + style="fill:white;fill-opacity:.8;" /> diff --git a/whitefox/global/reader/RM-Add-24x24.svg b/whitefox/global/reader/RM-Add-24x24.svg new file mode 100644 index 0000000..66551ef --- /dev/null +++ b/whitefox/global/reader/RM-Add-24x24.svg @@ -0,0 +1,6 @@ + + + + diff --git a/whitefox/global/reader/RM-Close-24x24.svg b/whitefox/global/reader/RM-Close-24x24.svg new file mode 100644 index 0000000..7436217 --- /dev/null +++ b/whitefox/global/reader/RM-Close-24x24.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/whitefox/global/reader/RM-Close-hover-24x24.svg b/whitefox/global/reader/RM-Close-hover-24x24.svg new file mode 100644 index 0000000..425bd54 --- /dev/null +++ b/whitefox/global/reader/RM-Close-hover-24x24.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/whitefox/global/reader/RM-Delete-24x24.svg b/whitefox/global/reader/RM-Delete-24x24.svg new file mode 100644 index 0000000..6010fbe --- /dev/null +++ b/whitefox/global/reader/RM-Delete-24x24.svg @@ -0,0 +1,6 @@ + + + + diff --git a/whitefox/global/reader/RM-Minus-24x24.svg b/whitefox/global/reader/RM-Minus-24x24.svg new file mode 100644 index 0000000..9da7e03 --- /dev/null +++ b/whitefox/global/reader/RM-Minus-24x24.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/whitefox/global/reader/RM-Plus-24x24.svg b/whitefox/global/reader/RM-Plus-24x24.svg new file mode 100644 index 0000000..249912a --- /dev/null +++ b/whitefox/global/reader/RM-Plus-24x24.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/whitefox/global/reader/RM-Reading-List-24x24.svg b/whitefox/global/reader/RM-Reading-List-24x24.svg new file mode 100644 index 0000000..1f21efd --- /dev/null +++ b/whitefox/global/reader/RM-Reading-List-24x24.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/whitefox/global/reader/RM-Type-Controls-24x24.svg b/whitefox/global/reader/RM-Type-Controls-24x24.svg new file mode 100644 index 0000000..a25429a --- /dev/null +++ b/whitefox/global/reader/RM-Type-Controls-24x24.svg @@ -0,0 +1,23 @@ + + + + + + + diff --git a/whitefox/global/reader/RM-Type-Controls-Arrow.svg b/whitefox/global/reader/RM-Type-Controls-Arrow.svg new file mode 100644 index 0000000..9094d8a --- /dev/null +++ b/whitefox/global/reader/RM-Type-Controls-Arrow.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 33d6f68653dc75c89ae65dfd264b31e6189c49dd Mon Sep 17 00:00:00 2001 From: Louis Chan Date: Thu, 2 Apr 2015 02:15:48 +0800 Subject: [PATCH 4/7] Updates for 38b2 (Part II) --- whitefox/browser/browser-common.css | 131 +++++++++++------- .../browser/customizableui/menu-arrow.svg | 29 ++++ whitefox/browser/dots.png | Bin 496 -> 0 bytes whitefox/browser/dots@2x.png | Bin 519 -> 0 bytes .../browser/places/bookmarks-menu-arrow.png | Bin 183 -> 0 bytes .../preferences/in-content/preferences.css | 128 +++++++++++++++-- whitefox/browser/readinglist/sidebar.css | 1 - .../darwin/global/in-content/common.css | 115 +++++++++++---- .../general/global/in-content/common.css | 120 ++++++++++++---- whitefox/ostarget/general/panelUIOverlay.css | 110 ++++++++++++++- 10 files changed, 515 insertions(+), 119 deletions(-) create mode 100644 whitefox/browser/customizableui/menu-arrow.svg delete mode 100644 whitefox/browser/dots.png delete mode 100644 whitefox/browser/dots@2x.png delete mode 100755 whitefox/browser/places/bookmarks-menu-arrow.png diff --git a/whitefox/browser/browser-common.css b/whitefox/browser/browser-common.css index c97962f..f0a0012 100755 --- a/whitefox/browser/browser-common.css +++ b/whitefox/browser/browser-common.css @@ -1154,7 +1154,7 @@ toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon { } /*#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon { - -moz-border-end: none; + -moz-border-end: none transparent; }*/ #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { @@ -1984,6 +1984,54 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- -moz-image-region: rect(0, 48px, 16px, 32px); } +/* Reading List button */ + +#urlbar:not([focused]):not(:hover) #readinglist-addremove-button { + display: none; +} + +#readinglist-addremove-button { + list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage"); + -moz-image-region: rect(0, 14px, 14px, 0); +} + +#readinglist-addremove-button:hover { + list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage-hover"); +} + +#readinglist-addremove-button:active { + list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage-active"); +} + +#readinglist-addremove-button[already-added="true"] { + list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded"); +} + +#readinglist-addremove-button[already-added="true"]:hover { + list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded-hover"); +} + +#readinglist-addremove-button[already-added="true"]:active { + list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded-active"); +} + +/* Reader mode button */ + +#reader-mode-button { + list-style-image: url("chrome://browser/skin/readerMode.svg"); + -moz-image-region: rect(0, 16px, 16px, 0); +} + +#reader-mode-button:hover, +#reader-mode-button[readeractive]:hover { + -moz-image-region: rect(0, 32px, 16px, 16px); +} + +#reader-mode-button:hover:active, +#reader-mode-button[readeractive] { + -moz-image-region: rect(0, 48px, 16px, 32px); +} + /* social share panel */ .social-share-frame { @@ -2200,7 +2248,7 @@ toolbarbutton[type="socialmark"] > .toolbarbutton-icon { #TabsToolbar { min-height: 0; padding: 0; - /*margin-bottom: -1px; overlap the nav-bar's top border *//*Louis*/ + /*margin-bottom: calc(-1 * var(--tab-toolbar-navbar-overlap)); overlap the nav-bar's top border *//*Louis*/ } #tabbrowser-tabs { @@ -2666,7 +2714,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { } .popup-notification-icon[popupid="indexedDB-permissions-prompt"], -.popup-notification-icon[popupid="indexedDB-quota-prompt"], .popup-notification-icon[popupid*="offline-app-requested"], .popup-notification-icon[popupid="offline-app-usage"] { list-style-image: url(chrome://global/skin/icons/question-64.png); @@ -3050,6 +3097,19 @@ notification[value="translation"] { -moz-appearance: none; } +/* Loop/ Hello browser styles */ + +notification[value="loop-sharing-notification"] .button-menubutton-button { + -moz-appearance: none; + 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, @@ -3071,6 +3131,12 @@ notification[value="translation"] { -moz-image-region: auto; } +#menu_readingList, +#BMB_readingList { + list-style-image: url("chrome://browser/skin/readinglist/readinglist-icon.svg"); + -moz-image-region: auto; +} + /* ::::: Keyboard UI Panel ::::: */ .KUI-panel { @@ -4522,6 +4588,17 @@ chatbox { 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); } +} + /* Customization mode */ /* This Source Code Form is subject to the terms of the Mozilla Public @@ -5248,54 +5325,6 @@ toolbarpaletteitem[place="toolbar"] { background-color: rgb(105,173,61); } -.SearchHighlight { - -moz-margin-end: 6px; - font-size: 110%; - width: 225px; -} - -.SearchHighlight label, -.SearchHighlight description { - color: #535353; - 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 { diff --git a/whitefox/browser/customizableui/menu-arrow.svg b/whitefox/browser/customizableui/menu-arrow.svg new file mode 100644 index 0000000..23b087f --- /dev/null +++ b/whitefox/browser/customizableui/menu-arrow.svg @@ -0,0 +1,29 @@ + + + + + + + + + + diff --git a/whitefox/browser/dots.png b/whitefox/browser/dots.png deleted file mode 100644 index e856fd0ab2e7f4c36a846c678cd9e539a46c92cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 496 zcmVfcWV6|YWHNb!Z&vWl zSG``(Rjbu+IueQa5pWrc#ZCl4SY%mtgQjVrR;xV{A;U1>@pvGU$=sn?O4oInQ1zhjXGRg3INC@puf9Btf^^-Elgd4+KI{)Gw!B{NKVWY#7?cs9V>%!+o|RFXVpLUqce~wd#F>c6 ztSAbg;8oK!_ygRN1lSXnBtUo8;c)DtwnD|@aX&WbA{veE697rkYPD{$v;&Oz3qS$n z^Z5!oiiTmlp*YO{l#XpF}OB5olY5l;Z&AoYdW36Y&Ij2Nm)Px$!AV3xR5%gERJ(2hF%Yy*JUf&w5*3swQqe~!pFx*L0TmSah!jw9MIK$0uZW`b zR4JgNLrNFXp#uqLXYpE=bB>6F5=(IQ%-rnSw`-;TdFUX%9*@VDTI&nKPb@bz#ys|V zy$4#GKp$J~?c)*{jYh}ia`}mZxAR;niPtR4I{kkCBaavCw>|~?qL$#5O2sr94PC3% zm|8BEYCfME3f_i>z;pV=PQv++X0hFFZ`SMe8_iXzR60wNWQ8njr;31E(~_Z7O6NBE3RQk&!B_$PZYHIrQ$TpaqGsVhyI<+4nOoS2v$C^V0hKB-&c2TrSmmLW+_(YSsd(U h(tH(;CR{IA8BR~l5VXvgyB6pY22WQ%mvv4FO#q;wKPUhI diff --git a/whitefox/browser/preferences/in-content/preferences.css b/whitefox/browser/preferences/in-content/preferences.css index 4f57324..071d671 100644 --- a/whitefox/browser/preferences/in-content/preferences.css +++ b/whitefox/browser/preferences/in-content/preferences.css @@ -28,6 +28,24 @@ treecol { list-style-image: url("chrome://browser/skin/preferences/in-content/icons.png"); } +#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 { -moz-image-region: rect(0, 24px, 24px, 0); } @@ -113,6 +131,43 @@ treecol { /* 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%; -moz-margin-end: 8px !important; @@ -147,6 +202,10 @@ treecol { -moz-margin-start: 0; } +#handlersView { + height: 25em; +} + #handlersView > richlistitem { min-height: 36px !important; } @@ -173,6 +232,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 { @@ -196,18 +269,10 @@ description > html|a { -moz-margin-start: 0; } -#advancedPrefs { - padding-bottom: 0; /* no padding needed in inContent prefs */ -} - #tabsElement { -moz-margin-end: 4px; /* add the 4px end-margin of other elements */ } -#encryptionPanel { - margin-top: 15px; -} - #telemetryLearnMore, #FHRLearnMore, #crashReporterLearnMore { @@ -232,6 +297,10 @@ description > html|a { } } +#showUpdateHistory { + -moz-margin-start: 0; +} + /** * Dialog */ @@ -294,6 +363,11 @@ description > html|a { width: 66ch; } +.largeDialogContainer.doScroll { + overflow-y: auto; + -moz-box-flex: 1; +} + /** * End Dialog */ @@ -320,6 +394,40 @@ description > html|a { to { opacity: 1; } } +/*@media not all and (-moz-windows-default-theme) { + #category-general > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#general-native"); + } + + #category-search > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#search-native"); + } + + #category-content > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#content-native"); + } + + #category-application > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#applications-native"); + } + + #category-privacy > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#privacy-native"); + } + + #category-security > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#security-native"); + } + + #category-sync > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#sync-native"); + } + + #category-advanced > .category-icon { + list-style-image: url("chrome://browser/skin/preferences/in-content/icons.svg#advanced-native"); + } +}*/ + .actionsMenu > .menulist-label-box > .menulist-icon { -moz-margin-end: 9px; } @@ -329,6 +437,10 @@ filefield + button { -moz-margin-start: -4px; } +#advancedPrefs { + padding-bottom: 0; /* override padding from normal preferences.css */ +} + /** * Dialog */ diff --git a/whitefox/browser/readinglist/sidebar.css b/whitefox/browser/readinglist/sidebar.css index 2771ae0..7d1c7d2 100644 --- a/whitefox/browser/readinglist/sidebar.css +++ b/whitefox/browser/readinglist/sidebar.css @@ -108,7 +108,6 @@ body { html { - background-color: #EEF3FA; } .item { diff --git a/whitefox/ostarget/darwin/global/in-content/common.css b/whitefox/ostarget/darwin/global/in-content/common.css index de4e1f2..18d910a 100644 --- a/whitefox/ostarget/darwin/global/in-content/common.css +++ b/whitefox/ostarget/darwin/global/in-content/common.css @@ -11,7 +11,8 @@ @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; html|body, -xul|page { +xul|page, +xul|window { font: message-box; -moz-appearance: none; background-color: #fbfbfb; @@ -28,15 +29,22 @@ html|h1 { font-size: 2.5em; font-weight: lighter; line-height: 1.2; + color: #333; margin: 0; margin-bottom: .5em; } +html|hr { + border-style: solid none none none; + border-color: #c1c1c1; +} + xul|caption { -moz-appearance: none; margin: 0; } +xul|caption > xul|checkbox, xul|caption > xul|label { font-size: 1.3rem; font-weight: bold; @@ -65,7 +73,7 @@ xul|prefpane > xul|*.content-box { xul|groupbox { -moz-appearance: none; border: none; - margin: 15px 0; + margin: 15px 0 0; -moz-padding-start: 0; -moz-padding-end: 0; font-size: 1.25rem; @@ -202,7 +210,7 @@ xul|menulist > xul|*.menulist-label-box { padding-left: 10px !important; } -xul|menulist > xul|*.menulist-label-box > xul|*.menulist-icon { +xul|menulist > xul|*.menulist-label-box > xul|*.menulist-icon[src] { -moz-margin-end: 5px; } @@ -361,7 +369,6 @@ xul|button[type="menu"] > xul|menupopup xul|menuseparator { height: 30px; color: #333; line-height: 20px; - text-shadow: 0 1px 1px #fefffe; padding-right: 10px; padding-left: 10px; border: 1px solid #c1c1c1; @@ -386,34 +393,52 @@ xul|textbox[disabled="true"] { /* Links */ html|a, -xul|*.text-link, -xul|*.inline-link { +.text-link, +.inline-link { line-height: 22px; color: #0095dd; text-decoration: none; } html|a:hover, -xul|*.text-link:hover, -xul|*.inline-link:hover { - color: #4cb1ff; - text-decoration: none; +.text-link:hover, +.inline-link:hover { + color: #178ce5; + text-decoration: underline; } html|a:hover:active, -xul|*.text-link:hover:active, -xul|*.inline-link:hover:active { +.text-link:hover:active, +.inline-link:hover:active { color: #ff9500; text-decoration: none; } /* Checkboxes and radio buttons */ +/* Hide the actual checkbox */ +html|input[type="checkbox"] { + opacity: 0; + position: absolute; +} + +/* Create a box to style as the checkbox */ +html|input[type="checkbox"] + html|label:before { + display: inline-block; + content: ""; + vertical-align: middle; +} + +html|input[type="checkbox"] + html|label { + line-height: 0px; +} + xul|checkbox { -moz-margin-start: 0; } -xul|*.checkbox-check { +xul|*.checkbox-check, +html|input[type="checkbox"] + html|label:before { -moz-appearance: none; width: 23px; height: 23px; @@ -428,7 +453,8 @@ xul|*.checkbox-check { box-shadow: 0 1px 1px 0 #fff, inset 0 2px 0 0 rgba(0,0,0,0.03); } -xul|checkbox:not([disabled="true"]):hover > xul|*.checkbox-check { +xul|checkbox:not([disabled="true"]):hover > xul|*.checkbox-check, +html|input[type="checkbox"]:not(:disabled) + html|label:hover:before { border-color: #0095dd; } @@ -436,7 +462,12 @@ xul|*.checkbox-check[checked] { list-style-image: url("chrome://global/skin/in-content/check.svg#check"); } -xul|checkbox[disabled="true"] > xul|*.checkbox-check { +html|input[type="checkbox"]:checked + html|label:before { + background-image: url("chrome://global/skin/in-content/check.svg#check"), linear-gradient(#fff, rgba(255,255,255,0.8)) !important; +} + +xul|checkbox[disabled="true"] > xul|*.checkbox-check, +html|input[type="checkbox"]:disabled + html|label { opacity: 0.5; } @@ -449,6 +480,10 @@ xul|richlistitem > xul|*.checkbox-check { margin: 3px 6px; } +xul|radio { + -moz-margin-start: 0; +} + xul|*.radio-check { -moz-appearance: none; width: 23px; @@ -521,6 +556,7 @@ xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[cur padding-bottom: 2px; -moz-padding-start: 9px; margin: 0; + -moz-user-select: none; } *|*.category-icon { @@ -542,6 +578,7 @@ xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[cur font-weight: normal; line-height: 40px; margin: 0; + -moz-user-select: none; } /* File fields */ @@ -627,6 +664,11 @@ xul|tree { border: 1px solid #c1c1c1; } +xul|tree:-moz-focusring, +xul|richlistbox:-moz-focusring { + border: 1px dotted #0095dd; +} + xul|listheader, xul|treecols { -moz-appearance: none; @@ -644,7 +686,7 @@ xul|treecolpicker { padding: 5px 10px; } -xul|treecol:not([hideheader="true"]):hover, +xul|treecol:not([hideheader="true"]):not([sortable="false"]):hover, xul|treecolpicker:hover { background-color: #dadada; color: #333; @@ -658,21 +700,15 @@ xul|treecolpicker { } xul|treecol:not([hideheader="true"]) > xul|*.treecol-sortdirection[sortDirection] { - list-style-image: url("chrome://global/skin/in-content/sorter.png"); - width: 12px; - height: 8px; + list-style-image: url("chrome://global/skin/in-content/dropdown.svg#dropdown"); + width: 18px; + height: 18px; } -xul|treecol:not([hideheader="true"]) > xul|*.treecol-sortdirection[sortDirection="descending"] { +xul|treecol:not([hideheader="true"]) > xul|*.treecol-sortdirection[sortDirection="ascending"] { transform: scaleY(-1); } -@media (min-resolution: 2dppx) { - xul|treecol:not([hideheader="true"]) > xul|*.treecol-sortdirection[sortDirection] { - list-style-image: url("chrome://global/skin/in-content/sorter@2x.png"); - } -} - /* This is the only way to increase the height of a tree row unfortunately */ xul|treechildren::-moz-tree-row { min-height: 2em; @@ -686,6 +722,7 @@ xul|treechildren::-moz-tree-cell-text { xul|treechildren::-moz-tree-cell-text(selected) { color: #fff; } + xul|tabs { padding-right: 0; padding-left: 0; @@ -696,17 +733,23 @@ xul|tab[selected] { } xul|button, +html|button, xul|colorpicker[type="button"], xul|menulist { margin-top: 3px; } -xul|button { +xul|button, +html|button { /* use the same margin of other elements for the alignment */ margin-left: 4px; margin-right: 4px; } +xul|caption { + -moz-padding-start: 0; +} + xul|groupbox > xul|*.groupbox-body { padding: 0; } @@ -754,6 +797,20 @@ xul|description { html|a:-moz-focusring, xul|*.text-link:-moz-focusring, xul|*.inline-link:-moz-focusring { - outline-width: 0; - box-shadow: 0 0 1px -moz-mac-focusring inset, 0 0 4px 1px -moz-mac-focusring, 0 0 1.5px 1px -moz-mac-focusring; + color: #ff9500; + text-decoration: underline; +} + +xul|button:-moz-focusring, +xul|menulist:-moz-focusring, +xul|checkbox:-moz-focusring > .checkbox-check, +xul|radio[focused="true"] > .radio-check, +xul|tab:-moz-focusring > .tab-middle > .tab-text { + outline: 2px solid rgba(0,149,221,0.5); + outline-offset: 1px; + -moz-outline-radius: 2px; } + +xul|radio[focused="true"] > .radio-check { + -moz-outline-radius: 100%; +} \ No newline at end of file diff --git a/whitefox/ostarget/general/global/in-content/common.css b/whitefox/ostarget/general/global/in-content/common.css index e0c28a4..b96f102 100644 --- a/whitefox/ostarget/general/global/in-content/common.css +++ b/whitefox/ostarget/general/global/in-content/common.css @@ -6,7 +6,8 @@ @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; html|body, -xul|page { +xul|page, +xul|window { font: message-box; -moz-appearance: none; background-color: #fbfbfb; @@ -23,15 +24,22 @@ html|h1 { font-size: 2.5em; font-weight: lighter; line-height: 1.2; + color: #333; margin: 0; margin-bottom: .5em; } +html|hr { + border-style: solid none none none; + border-color: #c1c1c1; +} + xul|caption { -moz-appearance: none; margin: 0; } +xul|caption > xul|checkbox, xul|caption > xul|label { font-size: 1.3rem; font-weight: bold; @@ -60,7 +68,7 @@ xul|prefpane > xul|*.content-box { xul|groupbox { -moz-appearance: none; border: none; - margin: 15px 0; + margin: 15px 0 0; -moz-padding-start: 0; -moz-padding-end: 0; font-size: 1.25rem; @@ -197,7 +205,7 @@ xul|menulist > xul|*.menulist-label-box { padding-left: 10px !important; } -xul|menulist > xul|*.menulist-label-box > xul|*.menulist-icon { +xul|menulist > xul|*.menulist-label-box > xul|*.menulist-icon[src] { -moz-margin-end: 5px; } @@ -356,7 +364,6 @@ xul|button[type="menu"] > xul|menupopup xul|menuseparator { height: 30px; color: #333; line-height: 20px; - text-shadow: 0 1px 1px #fefffe; padding-right: 10px; padding-left: 10px; border: 1px solid #c1c1c1; @@ -381,34 +388,52 @@ xul|textbox[disabled="true"] { /* Links */ html|a, -xul|*.text-link, -xul|*.inline-link { +.text-link, +.inline-link { line-height: 22px; color: #0095dd; text-decoration: none; } html|a:hover, -xul|*.text-link:hover, -xul|*.inline-link:hover { - color: #4cb1ff; - text-decoration: none; +.text-link:hover, +.inline-link:hover { + color: #178ce5; + text-decoration: underline; } html|a:hover:active, -xul|*.text-link:hover:active, -xul|*.inline-link:hover:active { +.text-link:hover:active, +.inline-link:hover:active { color: #ff9500; text-decoration: none; } /* Checkboxes and radio buttons */ +/* Hide the actual checkbox */ +html|input[type="checkbox"] { + opacity: 0; + position: absolute; +} + +/* Create a box to style as the checkbox */ +html|input[type="checkbox"] + html|label:before { + display: inline-block; + content: ""; + vertical-align: middle; +} + +html|input[type="checkbox"] + html|label { + line-height: 0px; +} + xul|checkbox { -moz-margin-start: 0; } -xul|*.checkbox-check { +xul|*.checkbox-check, +html|input[type="checkbox"] + html|label:before { -moz-appearance: none; width: 23px; height: 23px; @@ -423,7 +448,8 @@ xul|*.checkbox-check { box-shadow: 0 1px 1px 0 #fff, inset 0 2px 0 0 rgba(0,0,0,0.03); } -xul|checkbox:not([disabled="true"]):hover > xul|*.checkbox-check { +xul|checkbox:not([disabled="true"]):hover > xul|*.checkbox-check, +html|input[type="checkbox"]:not(:disabled) + html|label:hover:before { border-color: #0095dd; } @@ -431,7 +457,12 @@ xul|*.checkbox-check[checked] { list-style-image: url("chrome://global/skin/in-content/check.svg#check"); } -xul|checkbox[disabled="true"] > xul|*.checkbox-check { +html|input[type="checkbox"]:checked + html|label:before { + background-image: url("chrome://global/skin/in-content/check.svg#check"), linear-gradient(#fff, rgba(255,255,255,0.8)) !important; +} + +xul|checkbox[disabled="true"] > xul|*.checkbox-check, +html|input[type="checkbox"]:disabled + html|label { opacity: 0.5; } @@ -444,6 +475,10 @@ xul|richlistitem > xul|*.checkbox-check { margin: 3px 6px; } +xul|radio { + -moz-margin-start: 0; +} + xul|*.radio-check { -moz-appearance: none; width: 23px; @@ -516,6 +551,7 @@ xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[cur padding-bottom: 2px; -moz-padding-start: 9px; margin: 0; + -moz-user-select: none; } *|*.category-icon { @@ -537,6 +573,7 @@ xul|*#categories[keyboard-navigation="true"]:-moz-focusring > xul|*.category[cur font-weight: normal; line-height: 40px; margin: 0; + -moz-user-select: none; } /* File fields */ @@ -622,6 +659,11 @@ xul|tree { border: 1px solid #c1c1c1; } +xul|tree:-moz-focusring, +xul|richlistbox:-moz-focusring { + border: 1px dotted #0095dd; +} + xul|listheader, xul|treecols { -moz-appearance: none; @@ -639,7 +681,7 @@ xul|treecolpicker { padding: 5px 10px; } -xul|treecol:not([hideheader="true"]):hover, +xul|treecol:not([hideheader="true"]):not([sortable="false"]):hover, xul|treecolpicker:hover { background-color: #dadada; color: #333; @@ -653,21 +695,15 @@ xul|treecolpicker { } xul|treecol:not([hideheader="true"]) > xul|*.treecol-sortdirection[sortDirection] { - list-style-image: url("chrome://global/skin/in-content/sorter.png"); - width: 12px; - height: 8px; + list-style-image: url("chrome://global/skin/in-content/dropdown.svg#dropdown"); + width: 18px; + height: 18px; } -xul|treecol:not([hideheader="true"]) > xul|*.treecol-sortdirection[sortDirection="descending"] { +xul|treecol:not([hideheader="true"]) > xul|*.treecol-sortdirection[sortDirection="ascending"] { transform: scaleY(-1); } -@media (min-resolution: 2dppx) { - xul|treecol:not([hideheader="true"]) > xul|*.treecol-sortdirection[sortDirection] { - list-style-image: url("chrome://global/skin/in-content/sorter@2x.png"); - } -} - /* This is the only way to increase the height of a tree row unfortunately */ xul|treechildren::-moz-tree-row { min-height: 2em; @@ -681,11 +717,13 @@ xul|treechildren::-moz-tree-cell-text { xul|treechildren::-moz-tree-cell-text(selected) { color: #fff; } + xul|caption { background-color: transparent; } xul|button, +html|button, xul|colorpicker[type="button"], xul|menulist { margin: 2px 4px; @@ -713,7 +751,6 @@ xul|checkbox { xul|radio { -moz-binding: url("chrome://global/content/bindings/radio.xml#radio"); - -moz-margin-start: 0; -moz-padding-start: 0; } @@ -739,9 +776,38 @@ xul|*.inline-link:-moz-focusring { border: 1px dotted -moz-DialogText; } +/* Don't draw a transparent border for the focusring because when page + colors are disabled, the border is drawn in -moz-DialogText */ +xul|*.text-link:not(:-moz-focusring), +xul|button:not(:-moz-focusring) > xul|*.button-box, +xul|menulist:not(:-moz-focusring) > xul|*.menulist-label-box, xul|radio:not([focused="true"]) > xul|*.radio-label-box, xul|checkbox:not(:-moz-focusring) > xul|*.checkbox-label-box { border-width: 0; margin: 1px; +} + +xul|*.text-link:not(:-moz-focusring) { + margin-top: 2px; + margin-right: 1px !important; + margin-left: 1px !important; + margin-bottom: 3px; +} + +xul|menulist:not(:-moz-focusring) > xul|*.menulist-label-box { + margin: 2px; +} + +xul|radio:not([focused="true"]) > xul|*.radio-label-box, +xul|checkbox:not(:-moz-focusring) > xul|*.checkbox-label-box { -moz-margin-start: 0; } + +/* Use a 2px border so that selected row highlight is still visible behind + an existing high-contrast border that uses the background color */ +@media not all and (-moz-windows-default-theme) { + xul|treechildren::-moz-tree-row(selected), + xul|listbox xul|listitem[selected="true"] { + border: 2px dotted Highlight; + } +} diff --git a/whitefox/ostarget/general/panelUIOverlay.css b/whitefox/ostarget/general/panelUIOverlay.css index aa93c24..776f2be 100644 --- a/whitefox/ostarget/general/panelUIOverlay.css +++ b/whitefox/ostarget/general/panelUIOverlay.css @@ -1457,12 +1457,19 @@ toolbarbutton.social-provider-menuitem > .toolbarbutton-icon { menu.subviewbutton > .menu-right { -moz-appearance: none; - list-style-image: url(chrome://browser/skin/places/bookmarks-menu-arrow.png); - -moz-image-region: rect(0, 16px, 16px, 0); + list-style-image: url(chrome://browser/skin/customizableui/menu-arrow.svg#arrow); + /* Reset the rect we inherit from the button: */ + -moz-image-region: auto; } menu[disabled="true"].subviewbutton > .menu-right { - -moz-image-region: rect(0, 32px, 16px, 16px); + list-style-image: url(chrome://browser/skin/customizableui/menu-arrow.svg#arrow-disabled); +} + +@media not all and (-moz-windows-default-theme) { + menu[_moz-menuactive].subviewbutton > .menu-right { + list-style-image: url(chrome://browser/skin/customizableui/menu-arrow.svg#arrow-hover); + } } menu.subviewbutton > .menu-right:-moz-locale-dir(rtl) { @@ -1485,3 +1492,100 @@ menu.subviewbutton > .menu-right:-moz-locale-dir(rtl) { } } } + +@media not all and (-moz-windows-default-theme) { + #edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #copy-button, + #zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #zoom-reset-button, + .toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton { + border: 1px solid transparent; + } + + panelview .toolbarbutton-1:not(:-moz-any([disabled],[open],:active)):hover, + .widget-overflow-list .toolbarbutton-1:not(:-moz-any([disabled],[open],:active)):hover, + .toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton:not(:-moz-any([disabled],[open],:active)):hover { + border-color: ThreeDLightShadow !important; + } + + toolbarbutton.subviewbutton:not(:-moz-any([disabled],[open],:active)):hover, + menu.subviewbutton:not(:-moz-any([disabled],:active))[_moz-menuactive], + menuitem.subviewbutton:not(:-moz-any([disabled],:active))[_moz-menuactive] { + border-color: Highlight; + } + + panelview:not(#PanelUI-mainView) .toolbarbutton-1:not(:-moz-any([disabled],[open],:active)):hover, + toolbarbutton.subviewbutton:not(:-moz-any([disabled],[open],:active)):hover, + menu.subviewbutton:not(:-moz-any([disabled],:active))[_moz-menuactive], + menuitem.subviewbutton:not(:-moz-any([disabled],:active))[_moz-menuactive], + .widget-overflow-list .toolbarbutton-1:not(:-moz-any([disabled],[open],:active)):hover { + background-color: Highlight; + color: highlighttext; + } + + panelview .toolbarbutton-1:-moz-any(:not([disabled]):-moz-any([open],:hover:active),[checked=true]), + toolbarbutton.subviewbutton:not([disabled]):-moz-any([open],:hover:active), + menu.subviewbutton:not([disabled])[_moz-menuactive]:active, + menuitem.subviewbutton:not([disabled])[_moz-menuactive]:active, + .widget-overflow-list .toolbarbutton-1:not([disabled]):-moz-any([open],:hover:active), + .toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton:not([disabled]):-moz-any([open],:hover:active) { + background-color: Highlight; + border-color: ThreeDLightShadow; + color: highlighttext; + box-shadow: none; + } + + panelview .toolbarbutton-1[disabled], + toolbarbutton.subviewbutton[disabled], + menu.subviewbutton[disabled], + menuitem.subviewbutton[disabled], + .widget-overflow-list .toolbarbutton-1[disabled], + .toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton[disabled] { + text-shadow: none; + } + + #PanelUI-fxa-status, + #PanelUI-help, + #PanelUI-customize { + border: 1px solid transparent; + } + + #PanelUI-fxa-status:not([disabled]):hover, + #PanelUI-help:not([disabled]):hover, + #PanelUI-customize:hover, + #PanelUI-fxa-status:not([disabled]):hover:active, + #PanelUI-help:not([disabled]):hover:active, + #PanelUI-customize:hover:active { + border-color: ThreeDLightShadow; + box-shadow: none; + } + + #BMB_bookmarksPopup .menu-text, + #BMB_bookmarksPopup menupopup { + color: -moz-FieldText; + } + + #BMB_bookmarksPopup .subviewbutton[disabled=true] > .menu-text { + color: GrayText; + } + + #BMB_bookmarksPopup menupopup[placespopup=true] > hbox { + box-shadow: none; + background: -moz-field; + border: 1px solid ThreeDShadow; + } + + .subviewbutton.panel-subview-footer, + #BMB_bookmarksPopup .subviewbutton.panel-subview-footer { + color: ButtonText; + } + + .subviewbutton:not(:-moz-any([disabled],:active))[_moz-menuactive], + menuitem.panel-subview-footer:not(:-moz-any([disabled],:active))[_moz-menuactive], + .subviewbutton.panel-subview-footer:not(:-moz-any([disabled],[open],:active)):hover, + .subviewbutton.panel-subview-footer:not([disabled]):-moz-any([open],:hover:active), + .subviewbutton:not(:-moz-any([disabled],:active))[_moz-menuactive] > .menu-accel-container, + .PanelUI-subView .subviewbutton[shortcut]:not(:-moz-any([disabled],[open],:active)):hover::after, + #BMB_bookmarksPopup .panel-subview-footer:not(:-moz-any([disabled],:active))[_moz-menuactive] > .menu-text { + background-color: Highlight; + color: highlighttext !important; + } +} From 55d832ee6b01aa58f44fe822bd115c246a115ced Mon Sep 17 00:00:00 2001 From: Louis Chan Date: Thu, 2 Apr 2015 02:41:48 +0800 Subject: [PATCH 5/7] Fix the size of menu buttons in retina display #29 --- whitefox/ostarget/darwin/browser.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/whitefox/ostarget/darwin/browser.css b/whitefox/ostarget/darwin/browser.css index ce039e6..a0cf0c2 100644 --- a/whitefox/ostarget/darwin/browser.css +++ b/whitefox/ostarget/darwin/browser.css @@ -212,4 +212,12 @@ toolbarbutton.bookmark-item > menupopup { .messageCloseButton > .toolbarbutton-icon { width: 16px !important; } + + #PanelUI-update-status > .toolbarbutton-icon, + #PanelUI-fxa-status > .toolbarbutton-icon, + #PanelUI-quit > .toolbarbutton-icon, + #PanelUI-customize > .toolbarbutton-icon, + #PanelUI-help > .toolbarbutton-icon { + width: 16px; + } } From 1311fafc39dfc7fea9eac6e0370c440d477da77a Mon Sep 17 00:00:00 2001 From: Louis Chan Date: Thu, 2 Apr 2015 02:46:30 +0800 Subject: [PATCH 6/7] Change to v2.2b16 --- install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.rdf b/install.rdf index 09d2a20..34a5779 100755 --- a/install.rdf +++ b/install.rdf @@ -5,7 +5,7 @@ 4 Simple White Paint your firefox white. Make it look simpler, nicer. - 2.2b15 + 2.2b16 Louis Chan http://www.louis.hk/whitefox/ From 9cf07ce89fe9bece242966d3a76a95507934264e Mon Sep 17 00:00:00 2001 From: Louis Chan Date: Tue, 2 Jun 2015 23:22:51 +0800 Subject: [PATCH 7/7] Updates for 38 --- whitefox/browser/Toolbar-aero.png | Bin 3288 -> 3899 bytes whitefox/browser/Toolbar-inverted.png | Bin 5319 -> 6344 bytes whitefox/browser/Toolbar.png | Bin 3288 -> 3899 bytes whitefox/browser/browser-common.css | 150 ++++--- whitefox/browser/menuPanel-aero.png | Bin 6259 -> 7204 bytes whitefox/browser/menuPanel.png | Bin 6259 -> 7204 bytes .../preferences/in-content/preferences.css | 35 ++ whitefox/browser/reader-tour.png | Bin 0 -> 2672 bytes whitefox/browser/reader-tour@2x.png | Bin 0 -> 6426 bytes whitefox/browser/readinglist/icons.svg | 12 +- whitefox/browser/readinglist/sidebar.css | 17 +- whitefox/browser/update-badge.svg | 3 + whitefox/browser/yosemite/Toolbar.png | Bin 3288 -> 3899 bytes whitefox/browser/yosemite/menuPanel.png | Bin 6259 -> 7204 bytes whitefox/global/aboutReader.css | 125 +++++- whitefox/global/aboutReaderContent.css | 113 ++++++ whitefox/global/aboutReaderControls.css | 371 ++++++++++++++++++ whitefox/global/reader/RM-Close-24x24.svg | 39 +- .../global/reader/RM-Close-hover-24x24.svg | 8 - whitefox/global/reader/pocket.svg | 28 ++ whitefox/ostarget/darwin/panelUIOverlay.css | 28 +- whitefox/ostarget/general/panelUIOverlay.css | 28 +- 22 files changed, 865 insertions(+), 92 deletions(-) create mode 100644 whitefox/browser/reader-tour.png create mode 100644 whitefox/browser/reader-tour@2x.png create mode 100644 whitefox/browser/update-badge.svg create mode 100644 whitefox/global/aboutReaderContent.css create mode 100644 whitefox/global/aboutReaderControls.css delete mode 100644 whitefox/global/reader/RM-Close-hover-24x24.svg create mode 100644 whitefox/global/reader/pocket.svg diff --git a/whitefox/browser/Toolbar-aero.png b/whitefox/browser/Toolbar-aero.png index 9fdbf7cd1434da4494a59bc6def23d13ce9d7a82..83f6cd3e33e91315362ff8f9373fcbc1f8fc4bd9 100644 GIT binary patch literal 3899 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 R-SOj$Zm4IfTc+b0{XfDV4k`cu diff --git a/whitefox/browser/Toolbar-inverted.png b/whitefox/browser/Toolbar-inverted.png index 3532c33810498a452daf0681ec2fe13383f2c26e..eb7bdf1884dde414978f934c5d2310db00c5fa5b 100644 GIT binary patch literal 6344 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 k9C!0w6Wi;Ih>sHkgeYfDQ@uCA_%ii$fsJ9Tw+ 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 diff --git a/whitefox/browser/Toolbar.png b/whitefox/browser/Toolbar.png index 9fdbf7cd1434da4494a59bc6def23d13ce9d7a82..83f6cd3e33e91315362ff8f9373fcbc1f8fc4bd9 100644 GIT binary patch literal 3899 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 R-SOj$Zm4IfTc+b0{XfDV4k`cu diff --git a/whitefox/browser/browser-common.css b/whitefox/browser/browser-common.css index f0a0012..77d0438 100755 --- a/whitefox/browser/browser-common.css +++ b/whitefox/browser/browser-common.css @@ -575,12 +575,12 @@ menuitem.bookmark-item { /* Note that this file isn't used for HiDPI on OS X. */ -:-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, #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, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button), +:-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, #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, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button), #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { list-style-image: url("chrome://browser/skin/Toolbar.png"); } -toolbar[brighttext] :-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, #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, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button), +toolbar[brighttext] :-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, #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, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button), toolbar[brighttext] #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { list-style-image: url(chrome://browser/skin/Toolbar-inverted.png); } @@ -794,6 +794,14 @@ toolbar[brighttext] #loop-button > .toolbarbutton-badge-container { #webide-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 738px, 18px, 720px); } + +#pocket-button[cui-areatype="toolbar"] { + -moz-image-region: rect(0, 774px, 18px, 756px); +} + +#pocket-button[cui-areatype="toolbar"][open] { + -moz-image-region: rect(18px, 774px, 36px, 756px); +} /* Menu panel and palette styles */ /* Note that this file isn't used for HiDPI on OS X. */ @@ -803,8 +811,8 @@ toolbar[brighttext] #loop-button > .toolbarbutton-badge-container { } toolbaritem[sdkstylewidget="true"] > toolbarbutton, -:-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, #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, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-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, #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, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button) { +:-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, #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, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-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, #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, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button) { list-style-image: var(--menupanel-list-style-image); } @@ -866,6 +874,10 @@ toolbarpaletteitem[place="palette"] > #feed-button { -moz-image-region: rect(0px, 416px, 32px, 384px); } +#feed-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { + -moz-image-region: rect(32px, 416px, 64px, 384px); +} + #social-share-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #social-share-button { -moz-image-region: rect(0px, 448px, 32px, 416px); @@ -967,6 +979,15 @@ toolbarpaletteitem[place="palette"] > #webide-button { -moz-image-region: rect(0px, 960px, 32px, 928px); } +#pocket-button[cui-areatype="menu-panel"], +toolbarpaletteitem[place="palette"] > #pocket-button { + -moz-image-region: rect(0px, 992px, 32px, 960px); +} + +#pocket-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { + -moz-image-region: rect(32px, 992px, 64px, 960px); +} + toolbaritem[sdkstylewidget="true"] > toolbarbutton { -moz-image-region: rect(0, 832px, 32px, 800px); } @@ -1128,9 +1149,9 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > .toolbarbutton-1:-moz-an transition-duration: 150ms; } -#nav-bar .toolbarbutton-1:not(:-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, #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, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button)) > .toolbarbutton-icon, -#nav-bar .toolbarbutton-1:not(:-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, #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, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button)) > .toolbarbutton-badge-container, -#nav-bar .toolbarbutton-1:not(:-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, #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, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { +#nav-bar .toolbarbutton-1:not(:-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, #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, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1:not(:-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, #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, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-badge-container, +#nav-bar .toolbarbutton-1:not(:-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, #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, #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { padding: 3px 7px; } @@ -1987,12 +2008,16 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- /* Reading List button */ #urlbar:not([focused]):not(:hover) #readinglist-addremove-button { - display: none; + opacity: 0; + width: 0px; } #readinglist-addremove-button { list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage"); -moz-image-region: rect(0, 14px, 14px, 0); + transition: width 150ms ease-in-out, opacity 150ms ease-in-out 150ms; + opacity: 1; + width: 20px; } #readinglist-addremove-button:hover { @@ -2665,52 +2690,31 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { .popup-notification-icon[popupid="xpinstall-disabled"], .popup-notification-icon[popupid="addon-progress"], -.popup-notification-icon[popupid="addon-install-cancelled"], .popup-notification-icon[popupid="addon-install-blocked"], .popup-notification-icon[popupid="addon-install-failed"], +.popup-notification-icon[popupid="addon-install-confirmation"], .popup-notification-icon[popupid="addon-install-complete"] { list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png); width: 32px; height: 32px; } -.popup-notification-icon[popupid="click-to-play-plugins"] { - list-style-image: url(chrome://mozapps/skin/plugins/pluginBlocked-64.png); +.popup-notification-description[popupid="addon-progress"], +.popup-notification-description[popupid="addon-install-confirmation"] { + width: 27em; + max-width: 27em; } -.popup-notification-icon[popupid="web-notifications"] { - list-style-image: url(chrome://browser/skin/notification-64.png); -} - -.addon-progress-description { - width: 350px; - max-width: 350px; -} - -.popup-progress-label, -.popup-progress-meter { - -moz-margin-start: 0; - -moz-margin-end: 0; -} - -.popup-progress-cancel { - -moz-appearance: none; - background: transparent; - border: none; - padding: 0; - margin: 0; - min-height: 0; - min-width: 0; - list-style-image: url(chrome://mozapps/skin/downloads/downloadButtons.png); - -moz-image-region: rect(0px, 32px, 16px, 16px); +.addon-install-confirmation-name { + font-weight: bold; } -.popup-progress-cancel:hover { - -moz-image-region: rect(16px, 32px, 32px, 16px); +.popup-notification-icon[popupid="click-to-play-plugins"] { + list-style-image: url(chrome://mozapps/skin/plugins/pluginBlocked-64.png); } -.popup-progress-cancel:active { - -moz-image-region: rect(32px, 32px, 48px, 16px); +.popup-notification-icon[popupid="web-notifications"] { + list-style-image: url(chrome://browser/skin/notification-64.png); } .popup-notification-icon[popupid="indexedDB-permissions-prompt"], @@ -2719,8 +2723,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url(chrome://global/skin/icons/question-64.png); } -.popup-notification-icon[popupid="password-save"], -.popup-notification-icon[popupid="password-change"] { +.popup-notification-icon[popupid="password"] { list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png); } @@ -3137,6 +3140,12 @@ notification[value="loop-sharing-notification"] .messageImage { -moz-image-region: auto; } +#panelMenu_pocket, +#menu_pocket, +#BMB_pocket { + list-style-image: url("chrome://browser/content/pocket/panels/img/pocketmenuitem16.png"); +} + /* ::::: Keyboard UI Panel ::::: */ .KUI-panel { @@ -4754,14 +4763,26 @@ chatbox { #customization-titlebar-visibility-button { list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle.png"); -moz-image-region: rect(0, 24px, 24px, 0); +} + +#customization-lwtheme-button, +#customization-titlebar-visibility-button { padding: 2px 7px; } +#customization-lwtheme-button > .box-inherit > .box-inherit > .button-text, #customization-titlebar-visibility-button > .button-box > .button-text { /* Sadly, button.css thinks its margins are perfect for everyone. */ -moz-margin-start: 6px !important; } +#customization-lwtheme-button > .box-inherit > .box-inherit > .button-icon { + width: 20px; + height: 20px; + border-radius: 2px; + background-size: contain; +} + #customization-titlebar-visibility-button > .button-box > .button-icon { vertical-align: middle; } @@ -5329,9 +5350,14 @@ toolbarpaletteitem[place="toolbar"] { notification.heartbeat { background-color: #F1F1F1; - box-shadow: 0px 1px 0px 0px rgba(0,0,0,0.35); + border-bottom: 1px solid #C1C1C1; + height: 40px; } +/* In themes/osx/global/notification.css the close icon is inverted because notifications + on OSX are usually dark. Heartbeat is light, so override that behaviour. */ + + @keyframes pulse-onshow { 0% { opacity: 0; @@ -5366,17 +5392,17 @@ notification.heartbeat { .messageText.heartbeat { color: #333333; - font-weight: normal; - font-family: "Lucida Grande", Segoe, Ubuntu; - font-size: 14px; - line-height: 16px; text-shadow: none; + -moz-margin-start: 0px; + /* The !important is required to override OSX default style. */ + -moz-margin-end: 12px !important; } .messageImage.heartbeat { - width: 36px; - height: 36px; - -moz-margin-end: 10px; + width: 24px; + height: 24px; + -moz-margin-start: 8px; + -moz-margin-end: 8px; } .messageImage.heartbeat.pulse-onshow { @@ -5393,9 +5419,25 @@ notification.heartbeat { animation-timing-function: linear; } +/* Learn More link styles */ +.heartbeat > .text-link { + color: #0095DD; + -moz-margin-start: 0px; +} + +.heartbeat > .text-link:hover { + color: #008ACB; + text-decoration: none; +} + +.heartbeat > .text-link:hover:active { + color: #006B9D; +} + /* Heartbeat UI Rating Star Classes */ .heartbeat > #star-rating-container { display: -moz-box; + margin-bottom: 4px; } .heartbeat > #star-rating-container > #star5 { @@ -5417,8 +5459,10 @@ notification.heartbeat { .heartbeat > #star-rating-container > .star-x { background: url("chrome://browser/skin/heartbeat-star-off.svg"); cursor: pointer; - width: 24px; - height: 24px; + /* Overrides the -moz-margin-end for all platforms defined in the .plain class */ + -moz-margin-end: 4px !important; + width: 16px; + height: 16px; } .heartbeat > #star-rating-container > .star-x:hover, @@ -5590,7 +5634,7 @@ menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left { background-color: hsl(210,75%,92%); } - .tab-background-middle[selected=true]:not(:-moz-lwtheme) { + .tab-background-middle[visuallyselected=true]:not(:-moz-lwtheme) { background-color: hsl(210,75%,92%); } diff --git a/whitefox/browser/menuPanel-aero.png b/whitefox/browser/menuPanel-aero.png index 72bd7d9023736d87c78f9805530032395e3b3d2d..1dc60f0aaa1f293c93c3daa5270eddbc16ba508d 100644 GIT binary patch literal 7204 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 html|a { cursor: pointer; } +#fxaProfileImage { + width: 60px; + height: 60px; + border-radius: 50%; + border-width: 5px; + border-color: red; + background-image: url(chrome://browser/skin/preferences/in-content/default-profile-image.svg); + background-size: contain; + cursor: pointer; + -moz-margin-end: 15px; +} + +#fxaProfileImage:hover { + border-color: blue; +} + #noFxaAccount { /* Overriding the margins from the base preferences.css theme file. These overrides can be simplified by fixing bug 1027174 */ @@ -276,6 +297,9 @@ description > html|a { #telemetryLearnMore, #FHRLearnMore, #crashReporterLearnMore { + /* provide some margin between the links and the label text */ + /* !important is needed to override the rules defined in common.css */ + -moz-margin-start: 20px !important; /* center the links */ margin-top: 8px; margin-bottom: 8px; @@ -372,6 +396,17 @@ description > html|a { * End Dialog */ +/** + * Font dialog menulist fixes + */ + +#defaultFontType, +#serif, +#sans-serif, +#monospace { + min-width: 30ch; +} + /** * Sync migration */ diff --git a/whitefox/browser/reader-tour.png b/whitefox/browser/reader-tour.png new file mode 100644 index 0000000000000000000000000000000000000000..be346b3847928f94d7a0bbca019f40d86edd0899 GIT binary patch literal 2672 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 oNh!No;T8aHq)$ literal 0 HcmV?d00001 diff --git a/whitefox/browser/readinglist/icons.svg b/whitefox/browser/readinglist/icons.svg index c859ae2..6aa0159 100644 --- a/whitefox/browser/readinglist/icons.svg +++ b/whitefox/browser/readinglist/icons.svg @@ -4,7 +4,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> @@ -26,21 +26,21 @@ - - + + - + - + - + diff --git a/whitefox/browser/readinglist/sidebar.css b/whitefox/browser/readinglist/sidebar.css index 7d1c7d2..43ea464 100644 --- a/whitefox/browser/readinglist/sidebar.css +++ b/whitefox/browser/readinglist/sidebar.css @@ -4,7 +4,6 @@ :root, body { - height: 100%; overflow-x: hidden; } @@ -22,16 +21,14 @@ body { text-align: center; } -#list { - height: 100%; - overflow-x: auto; -} - .item { display: flex; flex-flow: row; cursor: pointer; padding: 6px; + opacity: 0; + max-height: 0; + transition: opacity 150ms ease-in-out, max-height 150ms ease-in-out 150ms; } .item.active { @@ -101,13 +98,21 @@ body { padding: 0; width: 16px; height: 16px; + min-width: 16px; + min-height: 16px; background-size: contain; background-color: transparent; border-width: 0; } +.item.visible { + opacity: 1; + max-height: 80px; + transition: max-height 250ms ease-in-out, opacity 250ms ease-in-out 250ms; +} html { + background-color: #EEF3FA; } .item { diff --git a/whitefox/browser/update-badge.svg b/whitefox/browser/update-badge.svg new file mode 100644 index 0000000..6a4c2a0 --- /dev/null +++ b/whitefox/browser/update-badge.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/whitefox/browser/yosemite/Toolbar.png b/whitefox/browser/yosemite/Toolbar.png index 9fdbf7cd1434da4494a59bc6def23d13ce9d7a82..83f6cd3e33e91315362ff8f9373fcbc1f8fc4bd9 100644 GIT binary patch literal 3899 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 R-SOj$Zm4IfTc+b0{XfDV4k`cu diff --git a/whitefox/browser/yosemite/menuPanel.png b/whitefox/browser/yosemite/menuPanel.png index 72bd7d9023736d87c78f9805530032395e3b3d2d..1dc60f0aaa1f293c93c3daa5270eddbc16ba508d 100644 GIT binary patch literal 7204 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 .container > .header > .domain { + border-bottom-color: #333333 !important; +} + +body.sepia > .container > .header > .domain { + border-bottom-color: #5b4636 !important; +} + +body.dark > .container > .header > .domain { + border-bottom-color: #eeeeee !important; +} + +body.sepia > .container > .footer { + background-color: #dedad4 !important; +} + +body.light blockquote { + -moz-border-start: 2px solid #333333 !important; +} + +body.sepia blockquote { + -moz-border-start: 2px solid #5b4636 !important; +} + +body.dark blockquote { + -moz-border-start: 2px solid #eeeeee !important; +} diff --git a/whitefox/global/aboutReaderContent.css b/whitefox/global/aboutReaderContent.css new file mode 100644 index 0000000..8412751 --- /dev/null +++ b/whitefox/global/aboutReaderContent.css @@ -0,0 +1,113 @@ +/* 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/. */ + +#moz-reader-content { + display: none; + font-size: 1em; + line-height: 1.6em; +} + +h1, +h2, +h3 { + font-weight: bold; +} + +h1 { + font-size: 1.6em; + line-height: 1.25em; +} + +h2 { + font-size: 1.2em; + line-height: 1.51em; +} + +h3 { + font-size: 1em; + line-height: 1.66em; +} + +a { + text-decoration: underline; + font-weight: normal; +} + +a, +a:visited, +a:hover, +a:active { + color: #0095dd; +} + +* { + max-width: 100%; + height: auto; +} + +p, +code, +pre, +blockquote, +ul, +ol, +li, +figure, +.wp-caption { + margin: 0 0 30px 0; +} + +p > img:only-child, +p > a:only-child > img:only-child, +.wp-caption img, +figure img { + display: block; +} + +img[moz-reader-center] { + margin-left: auto; + margin-right: auto; +} + +.caption, +.wp-caption-text, +figcaption { + font-size: 0.9em; + line-height: 1.48em; + font-style: italic; +} + +code, +pre { + white-space: pre-wrap; +} + +blockquote { + padding: 0; + -moz-padding-start: 16px; +} + +ul, +ol { + padding: 0; +} + +ul { + -moz-padding-start: 30px; + list-style: disc; +} + +ol { + -moz-padding-start: 30px; + list-style: decimal; +} + +/* Hide elements with common "hidden" class names */ +.visually-hidden, +.visuallyhidden, +.hidden, +.invisible, +.sr-only { + display: none; +} diff --git a/whitefox/global/aboutReaderControls.css b/whitefox/global/aboutReaderControls.css new file mode 100644 index 0000000..b71bd59 --- /dev/null +++ b/whitefox/global/aboutReaderControls.css @@ -0,0 +1,371 @@ +/* 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/. */ + +.light-button { + color: #333333; + background-color: #ffffff; +} + +.dark-button { + color: #eeeeee; + background-color: #333333; +} + +.sepia-button { + color: #5b4636; + background-color: #f4ecd8; +} + +.sans-serif-button { + font-family: Helvetica, Arial, sans-serif; +} + +.serif-button { + font-family: Georgia, "Times New Roman", serif; +} + +/* Loading/error message */ + +#reader-message { + margin-top: 40px; + display: none; + text-align: center; + width: 100%; + font-size: 0.9em; +} + +/* Header */ + +.header { + text-align: start; + display: none; +} + +.domain { + font-size: 0.9em; + line-height: 1.48em; + padding-bottom: 4px; + font-family: Helvetica, Arial, sans-serif; + text-decoration: none; + border-bottom: 1px solid; + color: #0095dd; +} + +.header > h1 { + font-size: 1.6em; + line-height: 1.25em; + width: 100%; + margin: 30px 0; + padding: 0; +} + +.header > .credits { + font-size: 0.9em; + line-height: 1.48em; + margin: 0 0 30px 0; + padding: 0; + font-style: italic; +} + +/*======= Controls toolbar =======*/ + +.toolbar { + font-family: Helvetica, Arial, sans-serif; + position: fixed; + height: 100%; + top: 0; + left: 0; + margin: 0; + padding: 0; + list-style: none; + background-color: #fbfbfb; + -moz-user-select: none; + border-right: 1px solid #b5b5b5; +} + +.button { + display: block; + background-size: 24px 24px; + background-repeat: no-repeat; + color: #333; + background-color: #fbfbfb; + height: 40px; + padding: 0; +} + +.toolbar .button { + width: 40px; + background-position: center; + margin-right: -1px; + border-top: 0; + border-left: 0; + border-right: 1px solid #b5b5b5; + border-bottom: 1px solid #c1c1c1; +} + +.button[hidden] { + display: none; +} + +.dropdown { + text-align: center; + list-style: none; + margin: 0; + padding: 0; +} + +.dropdown li { + margin: 0; + padding: 0; +} + +/*======= Font style popup =======*/ + +.dropdown-popup { + min-width: 300px; + text-align: start; + position: absolute; + left: 48px; /* offset to account for toolbar width */ + z-index: 1000; + background-color: #fbfbfb; + visibility: hidden; + border-radius: 4px; + border: 1px solid #b5b5b5; + border-bottom-width: 0; + box-shadow: 0 1px 12px #666; +} + +.dropdown-popup > hr { + display: none; +} + +.open > .dropdown-popup { + visibility: visible; +} + +.dropdown-arrow { + position: absolute; + top: 30px; /* offset arrow from top of popup */ + left: -16px; + width: 24px; + height: 24px; + background-image: url("chrome://global/skin/reader/RM-Type-Controls-Arrow.svg"); + display: block; +} + +#font-type-buttons, +#font-size-buttons, +#color-scheme-buttons { + display: flex; + flex-direction: row; +} + +#font-type-buttons > button:first-child { + border-top-left-radius: 3px; +} +#font-type-buttons > button:last-child { + border-top-right-radius: 3px; +} +#color-scheme-buttons > button:first-child { + border-bottom-left-radius: 3px; +} +#color-scheme-buttons > button:last-child { + border-bottom-right-radius: 3px; +} + +#font-type-buttons > button, +#font-size-buttons > button, +#color-scheme-buttons > button { + text-align: center; + border: 0; +} + +#font-type-buttons > button, +#font-size-buttons > button { + width: 50%; + background-color: transparent; + border-left: 1px solid #B5B5B5; + border-bottom: 1px solid #B5B5B5; +} + +#color-scheme-buttons > button { + width: 33.33%; + font-size: 14px; +} + +#color-scheme-buttons > .dark-button { + margin-top: -1px; + height: 61px; +} + +#font-type-buttons > button:first-child, +#font-size-buttons > button:first-child { + border-left: 0; +} + +#font-type-buttons > button { + display: inline-block; + font-size: 62px; + height: 100px; +} + +#font-size-buttons > button, +#color-scheme-buttons > button { + height: 60px; +} + +#font-type-buttons > button:active:hover, +#font-type-buttons > button.selected, +#color-scheme-buttons > button:active:hover, +#color-scheme-buttons > button.selected { + box-shadow: inset 0 -3px 0 0 #fc6420; +} + +#font-type-buttons > button:active:hover, +#font-type-buttons > button.selected { + border-bottom: 1px solid #FC6420; +} + +/* Make the serif button content the same size as the sans-serif button content. */ +#font-type-buttons > button > .description { + color: #666; + font-size: 12px; + margin-top: -5px; +} + +/* Font sizes are different per-platform, so we need custom CSS to line them up. */ +#font-type-buttons > .sans-serif-button > .name { + margin-top: 2px; +} + +#font-type-buttons > .sans-serif-button > .description { + margin-top: -4px; +} + +#font-type-buttons > .serif-button > .name { + font-size: 63px; +} + +.button:hover, +#font-size-buttons > button:hover, +#font-type-buttons > button:hover { + background-color: #ebebeb; +} + +.dropdown.open, +.button:active, +#font-size-buttons > button:active, +#font-size-buttons > button.selected { + background-color: #dadada; +} + +/* Only used on Android */ +#font-size-sample { + display: none; +} + +.minus-button, +.plus-button { + background-color: transparent; + border: 0; + background-size: 18px 18px; + background-repeat: no-repeat; + background-position: center; +} + +.footer { + height: 64px; + background-color: #ebebeb; + position: absolute; + left: 0; + width: 100%; + text-align: center; + padding: 12px 0; + box-sizing: border-box; + box-shadow: 0 3px 3px -3px rgba(0, 0, 0, 0.35) inset; +} + +.remove-button { + background-image: url("chrome://global/skin/reader/RM-Delete-24x24.svg"); + margin: 0 auto; + border: 1px solid #c1c1c1; + background-position: 10px 7px; + padding-left: 42px; + padding-right: 10px; + border-radius: 2px; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1); + font-size: 18px; +} + + +/*======= Toolbar icons =======*/ + +/* Android-only controls */ +.share-button { + display: none; +} + +.close-button { + background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg#close"); + height: 68px; + background-position: center 8px; +} + +.close-button:hover { + background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg#close-hover"); + background-color: #d94141; + border-bottom: 1px solid #d94141; + border-right: 1px solid #d94141; +} + +.close-button:hover:active { + background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg#close-hover"); + background-color: #AE2325; + border-bottom: 1px solid #AE2325; + border-right: 1px solid #AE2325; +} + +.style-button { + background-image: url("chrome://global/skin/reader/RM-Type-Controls-24x24.svg"); +} + +.toggle-button.on { + background-image: url("chrome://global/skin/reader/RM-Delete-24x24.svg"); +} + +.toggle-button { + background-image: url("chrome://global/skin/reader/RM-Add-24x24.svg"); +} + +.list-button { + background-image: url("chrome://global/skin/reader/RM-Reading-List-24x24.svg"); +} +.list-button.on { + background-color: #d9d9d9; +} + +.minus-button { + background-image: url("chrome://global/skin/reader/RM-Minus-24x24.svg"); +} + +.plus-button { + background-image: url("chrome://global/skin/reader/RM-Plus-24x24.svg"); +} + +#pocket-button { + background-image: url("chrome://global/skin/reader/pocket.svg#pocket-mark"); +} + +#pocket-button:hover:active { + background-image: url("chrome://global/skin/reader/pocket.svg#pocket-mark-added"); +} + +@media print { + .toolbar { + display: none !important; + } + .footer { + display: none !important; + } +} diff --git a/whitefox/global/reader/RM-Close-24x24.svg b/whitefox/global/reader/RM-Close-24x24.svg index 7436217..b0674b2 100644 --- a/whitefox/global/reader/RM-Close-24x24.svg +++ b/whitefox/global/reader/RM-Close-24x24.svg @@ -1,8 +1,31 @@ - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/whitefox/global/reader/RM-Close-hover-24x24.svg b/whitefox/global/reader/RM-Close-hover-24x24.svg deleted file mode 100644 index 425bd54..0000000 --- a/whitefox/global/reader/RM-Close-hover-24x24.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/whitefox/global/reader/pocket.svg b/whitefox/global/reader/pocket.svg new file mode 100644 index 0000000..63b22fa --- /dev/null +++ b/whitefox/global/reader/pocket.svg @@ -0,0 +1,28 @@ + + + + + + + + + diff --git a/whitefox/ostarget/darwin/panelUIOverlay.css b/whitefox/ostarget/darwin/panelUIOverlay.css index c2bc051..800ee78 100644 --- a/whitefox/ostarget/darwin/panelUIOverlay.css +++ b/whitefox/ostarget/darwin/panelUIOverlay.css @@ -92,11 +92,17 @@ background-size: var(--panel-ui-button-background-size); background-position: var(--panel-ui-button-background-position); background-repeat: var(--panel-ui-button-background-repeat); -} +}*/ #PanelUI-button:-moz-locale-dir(rtl) { background-position: 100% 0, calc(100% - 1px) 0, calc(100% - 2px) 0; -}*/ +} + +#PanelUI-menu-button[update-status="succeeded"] .toolbarbutton-badge::after { + content: url(chrome://browser/skin/update-badge.svg); + background-color: #74BF43; + height: 10px; +} .panel-subviews { padding: 4px; @@ -231,6 +237,11 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan max-width: 30em; } +/* Bug 1164419 - increase Pocket panel size to accomidate wider Russian text. */ +panelmultiview[mainViewId=PanelUI-pocketView] > .panel-viewcontainer > .panel-viewstack > .panel-mainview:not([panelid="PanelUI-popup"]) { + max-width: 33em; /* standaloneSubviewWidth + 3 */ +} + panelview:not([mainview]) .toolbarbutton-text, .cui-widget-panel toolbarbutton > .toolbarbutton-text { text-align: start; @@ -241,6 +252,11 @@ panelview:not([mainview]) .toolbarbutton-text, padding: 4px 0; } +.cui-widget-panel[viewId="PanelUI-pocketView"] > .panel-arrowcontainer > .panel-arrowcontent { + padding-top: 0; + padding-bottom: 0; +} + .cui-widget-panel.cui-widget-panelWithFooter > .panel-arrowcontainer > .panel-arrowcontent { padding-bottom: 0; } @@ -497,7 +513,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { min-height: 40px; -moz-appearance: none; box-shadow: none; - border: none; + border: none; border-radius: 0; transition: background-color; -moz-box-orient: horizontal; @@ -788,7 +804,7 @@ panelview .toolbarbutton-1:not(:-moz-any([disabled],[open],:active)):hover, toolbarbutton.subviewbutton:not(:-moz-any([disabled],[open],:active)):hover, menu.subviewbutton:not(:-moz-any([disabled],:active))[_moz-menuactive], menuitem.subviewbutton:not(:-moz-any([disabled],:active))[_moz-menuactive], -.share-provider-button:not(:-moz-any([disabled],[open],:active)):hover, +.share-provider-button:not(:-moz-any([disabled],[open],:active)):hover:not([checked="true"]), .widget-overflow-list .toolbarbutton-1:not(:-moz-any([disabled],[open],:active)):hover, .toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton:not(:-moz-any([disabled],[open],:active)):hover { background-color: hsla(210,4%,10%,.08); @@ -1158,7 +1174,9 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left { #customizationui-widget-multiview > .panel-viewcontainer, #customizationui-widget-multiview > .panel-viewcontainer > .panel-viewstack, #PanelUI-panicView > .panel-subview-body, -#PanelUI-panicView { +#PanelUI-panicView, +#PanelUI-pocketView > .panel-subview-body, +#PanelUI-pocketView { overflow: visible; } diff --git a/whitefox/ostarget/general/panelUIOverlay.css b/whitefox/ostarget/general/panelUIOverlay.css index 776f2be..69a64b1 100644 --- a/whitefox/ostarget/general/panelUIOverlay.css +++ b/whitefox/ostarget/general/panelUIOverlay.css @@ -102,6 +102,12 @@ background-position: 100% 0, calc(100% - 1px) 0, calc(100% - 2px) 0; }*/ +#PanelUI-menu-button[update-status="succeeded"] .toolbarbutton-badge::after { + content: url(chrome://browser/skin/update-badge.svg); + background-color: #74BF43; + height: 10px; +} + .panel-subviews { padding: 4px; background-clip: padding-box; @@ -235,6 +241,11 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan max-width: 30em; } +/* Bug 1164419 - increase Pocket panel size to accomidate wider Russian text. */ +panelmultiview[mainViewId=PanelUI-pocketView] > .panel-viewcontainer > .panel-viewstack > .panel-mainview:not([panelid="PanelUI-popup"]) { + max-width: 33em; /* standaloneSubviewWidth + 3 */ +} + panelview:not([mainview]) .toolbarbutton-text, .cui-widget-panel toolbarbutton > .toolbarbutton-text { text-align: start; @@ -245,6 +256,11 @@ panelview:not([mainview]) .toolbarbutton-text, padding: 4px 0; } +.cui-widget-panel[viewId="PanelUI-pocketView"] > .panel-arrowcontainer > .panel-arrowcontent { + padding-top: 0; + padding-bottom: 0; +} + .cui-widget-panel.cui-widget-panelWithFooter > .panel-arrowcontainer > .panel-arrowcontent { padding-bottom: 0; } @@ -501,7 +517,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { min-height: 40px; -moz-appearance: none; box-shadow: none; - border: none; + border: none; border-radius: 0; transition: background-color; -moz-box-orient: horizontal; @@ -792,7 +808,7 @@ panelview .toolbarbutton-1:not(:-moz-any([disabled],[open],:active)):hover, toolbarbutton.subviewbutton:not(:-moz-any([disabled],[open],:active)):hover, menu.subviewbutton:not(:-moz-any([disabled],:active))[_moz-menuactive], menuitem.subviewbutton:not(:-moz-any([disabled],:active))[_moz-menuactive], -.share-provider-button:not(:-moz-any([disabled],[open],:active)):hover, +.share-provider-button:not(:-moz-any([disabled],[open],:active)):hover:not([checked="true"]), .widget-overflow-list .toolbarbutton-1:not(:-moz-any([disabled],[open],:active)):hover, .toolbaritem-combined-buttons:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton:not(:-moz-any([disabled],[open],:active)):hover { background-color: hsla(210,4%,10%,.08); @@ -1162,7 +1178,9 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left { #customizationui-widget-multiview > .panel-viewcontainer, #customizationui-widget-multiview > .panel-viewcontainer > .panel-viewstack, #PanelUI-panicView > .panel-subview-body, -#PanelUI-panicView { +#PanelUI-panicView, +#PanelUI-pocketView > .panel-subview-body, +#PanelUI-pocketView { overflow: visible; } @@ -1578,13 +1596,13 @@ menu.subviewbutton > .menu-right:-moz-locale-dir(rtl) { color: ButtonText; } - .subviewbutton:not(:-moz-any([disabled],:active))[_moz-menuactive], + .subviewbutton:not([disabled])[_moz-menuactive], menuitem.panel-subview-footer:not(:-moz-any([disabled],:active))[_moz-menuactive], .subviewbutton.panel-subview-footer:not(:-moz-any([disabled],[open],:active)):hover, .subviewbutton.panel-subview-footer:not([disabled]):-moz-any([open],:hover:active), .subviewbutton:not(:-moz-any([disabled],:active))[_moz-menuactive] > .menu-accel-container, .PanelUI-subView .subviewbutton[shortcut]:not(:-moz-any([disabled],[open],:active)):hover::after, - #BMB_bookmarksPopup .panel-subview-footer:not(:-moz-any([disabled],:active))[_moz-menuactive] > .menu-text { + #BMB_bookmarksPopup .panel-subview-footer:not([disabled])[_moz-menuactive] > .menu-text { background-color: Highlight; color: highlighttext !important; }