From 1b13529a8907a5520788e317aee6205bc32d1fbe Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sun, 24 Nov 2013 21:02:54 +0100 Subject: [PATCH] part 1 of syncing LCARStrek with browser windows/shared theme changes in FIrefox 26 cycle --- LCARStrek/browser/aboutTabCrashed.css | 77 +++++++++++++++++++ LCARStrek/browser/browser.css | 1 + LCARStrek/browser/devtools/dark-theme.css | 2 +- LCARStrek/browser/devtools/debugger.css | 31 +++++--- LCARStrek/browser/devtools/font-inspector.css | 4 +- LCARStrek/browser/devtools/light-theme.css | 2 +- LCARStrek/browser/devtools/markup-view.css | 28 ------- LCARStrek/browser/devtools/netmonitor.css | 5 -- LCARStrek/browser/devtools/ruleview.css | 5 +- LCARStrek/browser/devtools/webconsole.css | 13 ++-- LCARStrek/browser/devtools/widgets.css | 31 ++------ .../preferences/in-content/preferences.css | 5 -- 12 files changed, 116 insertions(+), 88 deletions(-) create mode 100644 LCARStrek/browser/aboutTabCrashed.css diff --git a/LCARStrek/browser/aboutTabCrashed.css b/LCARStrek/browser/aboutTabCrashed.css new file mode 100644 index 00000000..7d9d92a5 --- /dev/null +++ b/LCARStrek/browser/aboutTabCrashed.css @@ -0,0 +1,77 @@ +body { + background-color: #000000; + margin-top: 2em; + font: 11px "Liberation Sans",Arial,Tahoma,Helvetica,sans-serif; +} + +p { + font-size: .8em; +} + +#error-box { + border: 2px solid #FFCF00; + border-radius: 10px; + 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: #A09090; + font-weight: bold; +} + +#report-box { + text-align: center; + width: 75%; + margin: 0 auto; + display: none; +} + +.crashDumpAvaible #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 { + border-radius: 10px; + background: #C09070; + color: #000000; + border: none; + padding: 0 .5em; +} + +button:hover, +button:hover:active { + background-color: #FFCF00; + color: #000000; +} diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 8fc1b261..2301ee6b 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -2342,6 +2342,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url("chrome://mozapps/skin/passwordmgr/key-64.png"); } +.popup-notification-icon[popupid="webapps-install-progress"], .popup-notification-icon[popupid="webapps-install"] { list-style-image: url("chrome://global/skin/icons/webapps-64.png"); } diff --git a/LCARStrek/browser/devtools/dark-theme.css b/LCARStrek/browser/devtools/dark-theme.css index caea039d..83ec47c3 100644 --- a/LCARStrek/browser/devtools/dark-theme.css +++ b/LCARStrek/browser/devtools/dark-theme.css @@ -48,7 +48,7 @@ } .theme-bg-darker { - background-color: rgba(0,0,0,0.1); + background-color: rgba(0,0,0,0.5); } .theme-link { /* original: blue */ diff --git a/LCARStrek/browser/devtools/debugger.css b/LCARStrek/browser/devtools/debugger.css index cee7b6c6..0802089e 100644 --- a/LCARStrek/browser/devtools/debugger.css +++ b/LCARStrek/browser/devtools/debugger.css @@ -21,11 +21,10 @@ window { } .side-menu-widget-item-checkbox { - -moz-appearance: none; + -moz-margin-end: -6px; padding: 0; - margin: 0 -4px 0 4px; opacity: 0; - transition: opacity .25s ease 0s; + transition: opacity .15s ease 0s; } /* Only show the checkbox when the source is hovered over, is selected, or if it @@ -34,7 +33,7 @@ window { .side-menu-widget-item.selected > .side-menu-widget-item-checkbox, .side-menu-widget-item-checkbox:not([checked]) { opacity: 1; - transition: opacity .25s ease-out 0s; + transition: opacity .15s ease-out 0s; } .side-menu-widget-item-checkbox > .checkbox-check { @@ -43,9 +42,10 @@ window { background-image: url("itemToggle.png"); background-repeat: no-repeat; background-clip: content-box; - background-position: -24px 0; - width: 24px; - height: 24px; + background-position: -16px 0; + background-size: 32px 16px; + width: 16px; + height: 16px; border: 0; } @@ -53,6 +53,10 @@ window { background-position: 0 0; } +.side-menu-widget-item-checkbox:not([checked]) ~ .side-menu-widget-item-contents { + color: #8050B0; +} + .side-menu-widget-item-checkbox:not([checked]) ~ .side-menu-widget-item-contents > .dbg-breakpoint { display: none; } @@ -127,7 +131,7 @@ window { /* Sources and breakpoints view */ .dbg-breakpoint { - font-family: "Liberation Mono", Consolas, "Courier New", monospace; + -moz-margin-start: -14px; } .dbg-breakpoint-line { @@ -137,6 +141,13 @@ window { .dbg-breakpoint-text { -moz-margin-start: 10px !important; font-style: italic; + font-size: 90%; +} + +.dbg-breakpoint-checkbox { + width: 16px; + height: 16px; + margin: 2px; } /* Watch expressions view */ @@ -158,7 +169,6 @@ window { .dbg-expression-input { -moz-padding-start: 2px !important; - font-family: "Liberation Mono", Consolas, "Courier New", monospace; } /* Searchbox and the search operations help panel */ @@ -185,7 +195,6 @@ window { -moz-margin-start: 2px; -moz-margin-end: 6px; text-align: center; - font-family: "Liberation Mono", Consolas, "Courier New", monospace; } .searchbox-panel-operator-label { @@ -279,7 +288,6 @@ window { -moz-padding-end: 4px; padding-top: 2px; text-align: end; - font-family: "Liberation Mono", Consolas, "Courier New", monospace; color: #FF9F00; } @@ -287,7 +295,6 @@ window { -moz-padding-start: 4px; padding-top: 1px; padding-bottom: 1px; - font-family: "Liberation Mono", Consolas, "Courier New", monospace; } .dbg-results-line-contents-string { diff --git a/LCARStrek/browser/devtools/font-inspector.css b/LCARStrek/browser/devtools/font-inspector.css index 5d02dca6..f873b2c4 100644 --- a/LCARStrek/browser/devtools/font-inspector.css +++ b/LCARStrek/browser/devtools/font-inspector.css @@ -31,8 +31,7 @@ body { } .font { - padding: 10px 5px; - font-size: 0; + padding: 10px 10px; } .theme-dark .font { @@ -59,7 +58,6 @@ body { } .font-info { - font-size: 1rem; display: block; } diff --git a/LCARStrek/browser/devtools/light-theme.css b/LCARStrek/browser/devtools/light-theme.css index caea039d..83ec47c3 100644 --- a/LCARStrek/browser/devtools/light-theme.css +++ b/LCARStrek/browser/devtools/light-theme.css @@ -48,7 +48,7 @@ } .theme-bg-darker { - background-color: rgba(0,0,0,0.1); + background-color: rgba(0,0,0,0.5); } .theme-link { /* original: blue */ diff --git a/LCARStrek/browser/devtools/markup-view.css b/LCARStrek/browser/devtools/markup-view.css index 0b3d9378..c6b965f8 100644 --- a/LCARStrek/browser/devtools/markup-view.css +++ b/LCARStrek/browser/devtools/markup-view.css @@ -19,10 +19,6 @@ color: #E7ADE7; } -.newattr { - cursor: pointer; -} - .comment { color: #8050B0; } @@ -31,30 +27,6 @@ background-color: #008484; } -/* Give some padding to focusable elements to match the editor input - * that will replace them. */ -span[tabindex] { - display: inline-block; - padding: 1px 0; -} - -li.container { - padding: 2px 0 0 2px; -} - -.codebox { - padding-left: 14px; -} - -.codebox > * { - vertical-align: middle; -} - -.expander { - display: inline-block; - margin-left: -14px; -} - .more-nodes { padding-left: 16px; } diff --git a/LCARStrek/browser/devtools/netmonitor.css b/LCARStrek/browser/devtools/netmonitor.css index 07e5d078..844a384b 100644 --- a/LCARStrek/browser/devtools/netmonitor.css +++ b/LCARStrek/browser/devtools/netmonitor.css @@ -301,10 +301,6 @@ window { background: rgba(255,159,0,0.1); } -.side-menu-widget-item-contents { - padding: 0; -} - /* Network request details */ #details-pane { @@ -346,7 +342,6 @@ window { .tabpanel-summary-value { -moz-padding-start: 3px; - font-family: "Liberation Mono", Consolas, "Courier New", monospace; } /* Headers tabpanel */ diff --git a/LCARStrek/browser/devtools/ruleview.css b/LCARStrek/browser/devtools/ruleview.css index f19670a3..4a248be8 100644 --- a/LCARStrek/browser/devtools/ruleview.css +++ b/LCARStrek/browser/devtools/ruleview.css @@ -14,7 +14,7 @@ -moz-user-select: none; } -.ruleview-rule-inheritance { +.ruleview-header { border-top-width: 1px; border-bottom-width: 1px; border-top-style: solid; @@ -46,7 +46,8 @@ .ruleview-warning { background: url("chrome://browser/skin/devtools/alerticon-warning.png"); -moz-margin-start: 5px; - vertical-align: middle; + display: inline-block; + vertical-align: top; width: 13px; height: 12px; } diff --git a/LCARStrek/browser/devtools/webconsole.css b/LCARStrek/browser/devtools/webconsole.css index fe5a3aca..0f80962d 100644 --- a/LCARStrek/browser/devtools/webconsole.css +++ b/LCARStrek/browser/devtools/webconsole.css @@ -6,13 +6,6 @@ window { padding: 0; } -.webconsole-timestamp, -.webconsole-msg-body, -.jsterm-input-node, -.jsterm-complete-node { - font-family: "Liberation Mono", Consolas, "Courier New", monospace; -} - /* * This hardcoded width likely due to a toolkit Windows specific bug. * See http://hg.mozilla.org/mozilla-central/annotate/f38d6df93cad/toolkit/themes/winstripe/global/textbox-aero.css#l7 @@ -54,7 +47,6 @@ window { -moz-margin-start: 3px; -moz-margin-end: 6px; white-space: pre-wrap; - font-family: "Liberation Mono", Consolas, "Courier New", monospace; } .webconsole-msg-body-piece { @@ -101,6 +93,11 @@ window { margin: 0; } +.webconsole-learn-more-link { + color: #9C9CFF; + margin: 0 0 0 4px; +} + .hud-msg-node[selected="true"] > .webconsole-timestamp, .hud-msg-node[selected="true"] > .webconsole-location { color: inherit; diff --git a/LCARStrek/browser/devtools/widgets.css b/LCARStrek/browser/devtools/widgets.css index 741b1e1a..fe3157f6 100644 --- a/LCARStrek/browser/devtools/widgets.css +++ b/LCARStrek/browser/devtools/widgets.css @@ -328,6 +328,8 @@ .side-menu-widget-item { border-top: 1px solid #9C9CFF; + margin-top: -1px; + margin-bottom: -1px; cursor: pointer; } @@ -355,19 +357,16 @@ background-position: center left, top left; } +.side-menu-widget-item-label { + padding: 4px 0px; + cursor: inherit; +} + .side-menu-widget-item-arrow { -moz-margin-start: -8px; width: 8px; } -.side-menu-widget-item-contents { - padding: 4px; -} - -.side-menu-widget-item label { - cursor: inherit; -} - .side-menu-widget-item-other { background-color: #000000; margin: 0 -4px; @@ -379,17 +378,8 @@ color: #000000; } -.side-menu-widget-item.selected .side-menu-widget-item-other:first-of-type { - border-top: 1px dotted #9C9CFF; - margin-top: 3px; -} - .side-menu-widget-item-other:first-of-type { - margin-top: 4px; -} - -.side-menu-widget-item-other:last-of-type { - margin-bottom: -4px; +/* border-top-left-radius: 4px; */ } .side-menu-widget-item-other:not(.selected) > label { @@ -425,15 +415,10 @@ } .variables-view-scope > .variables-view-element-details:not(:empty) { - margin-top: 1px; -moz-margin-start: 2px; -moz-margin-end: 1px; } -.variables-view-scope > .variables-view-element-details.enum:not(:empty) { - border-bottom: 1px solid #9C9CFF; -} - /* Generic traits applied to both variables and properties */ .variable-or-property { diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index 826f9c48..17774335 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -53,11 +53,6 @@ background-position: 0 0; } -.preference-icon[type="tabs"], -.landingButton-icon[type="tabs"] { - background-position: -32px 0; -} - .preference-icon[type="content"], .landingButton-icon[type="content"] { background-position: -64px 0; -- 2.35.3