From ed1a91c660e33123a3167af0806d58e00845240b Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sun, 30 Jun 2013 22:28:57 +0200 Subject: [PATCH] first part of sync for LCARStrek with browser windows theme in Firefox 23 cycle --- LCARStrek/browser/browser.css | 51 +++++++++++++++------ LCARStrek/browser/devtools/checkbox.png | Bin 0 -> 605 bytes LCARStrek/browser/devtools/commandline.css | 8 ++++ LCARStrek/browser/devtools/common.css | 28 +++++++++++ LCARStrek/browser/devtools/dark-theme.css | 15 +++--- LCARStrek/browser/devtools/debugger.css | 28 +++++------ LCARStrek/browser/devtools/light-theme.css | 15 +++--- LCARStrek/browser/devtools/ruleview.css | 8 +++- LCARStrek/browser/devtools/webconsole.css | 34 +++++++++----- LCARStrek/browser/downloads/downloads.css | 1 + LCARStrek/browser/social/services-16.png | Bin 0 -> 205 bytes LCARStrek/browser/social/services-64.png | Bin 0 -> 385 bytes LCARStrek/browser/social/social.png | Bin 172 -> 0 bytes 13 files changed, 127 insertions(+), 61 deletions(-) create mode 100644 LCARStrek/browser/devtools/checkbox.png create mode 100644 LCARStrek/browser/social/services-16.png create mode 100644 LCARStrek/browser/social/services-64.png delete mode 100644 LCARStrek/browser/social/social.png diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index a25e08aa..419ad189 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -2850,16 +2850,6 @@ html|*#gcli-output-frame { display: none; } -#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar #social-toolbar-item { - margin-left: 2px; - margin-right: 2px; -} - -#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar #social-toolbar-item > .toolbarbutton-1 { - padding-left: 0; - padding-right: 0; -} - .toolbarbutton-badge-container { margin: 0; padding: 0; @@ -2867,7 +2857,7 @@ html|*#gcli-output-frame { } #navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container { - padding: 2px 5px; + padding: 2px 2px; } .toolbarbutton-1 > .toolbarbutton-badge-container > .toolbar-icon { @@ -2930,6 +2920,36 @@ html|*#gcli-output-frame { border: 0; } +.popup-notification-icon[popupid="servicesInstall"] { + list-style-image: url("chrome://browser/skin/social/services-64.png"); +} +#servicesInstall-notification-icon { + list-style-image: url("chrome://browser/skin/social/services-16.png"); +} +#social-undoactivation-button, +#servicesInstall-learnmore-link { + -moz-margin-start: 0; /* override default label margin to match description margin */ +} + +#socialActivatedNotification .popup-notification-button-container { + margin-left: 6px; +} + +.social-activation-icon { + width: auto; + height: auto; + max-height: 64px; + max-width: 64px; +} + +#social-activation-message { + max-width: 250px; +} + +#social-activation-message > label { + margin: 0; +} + /* social toolbar provider menu */ .social-statusarea-popup { margin-top: 0; @@ -3041,8 +3061,7 @@ html|*#gcli-output-frame { } .chatbar-button { - /* XXX get a real image for this */ - list-style-image: url("chrome://browser/skin/social/social.png"); + list-style-image: url("chrome://browser/skin/social/services-16.png"); background-color: #000000; border: none; margin: 0; @@ -3053,6 +3072,12 @@ html|*#gcli-output-frame { -moz-border-end: 1px solid #008484; } +@media (min-resolution: 2dppx) { + .chatbar-button { + list-style-image: url("chrome://browser/skin/social/services-16@2x.png"); + } +} + .chatbar-button > menupopup > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon { width: auto; height: auto; diff --git a/LCARStrek/browser/devtools/checkbox.png b/LCARStrek/browser/devtools/checkbox.png new file mode 100644 index 0000000000000000000000000000000000000000..60207190f0af6f45adefac84293667f3a5518792 GIT binary patch literal 605 zcmV-j0;2tiP)CDe7fT;m3>L(U(om3M3JzAJohsDLK@f3qjSa=2xY&Re z6}t$ESZPzl!DJ9|5t?Lh5eJbP%@mY2CF#q%*CBn0?R!b>AMhJL?)lEW=bm$~=mMJk zR7?v1McEhL1c;7DBoqpDT__^d>vc{J46vAby^Sn79+A&4zXEV-A{vNw9EV1u!IxLx z0JI5^7#U&W@+6M42?8KAbE($62he!p!KkHbT2(- zPhh_r{^8sMt`FVt`M}tVA#`U008pt^sMTt%c4ldjt7opYV2?h|$wD%-cjAs4QVNQq z?@XsyUS0yAP{=cCU($c4Kx@6-)dwx56aaT8@9FcmK1pxyG0q+t*1qWNjMG8OG}~j| z%;YrW+G?CuA_17gky;0zs&sT!WC!io?F)xT?AdPPM7728e(jwc@9XRSa_#nNd1YA^ z5+Iz14~N72j{K5xxy(>38i@B2U;<>bZ&_Qf;<}A488#{A^C;~PRW6rhy}E(xx)_Fm rh~O%B>kiuZXTS literal 0 HcmV?d00001 diff --git a/LCARStrek/browser/devtools/commandline.css b/LCARStrek/browser/devtools/commandline.css index 14bfc921..1163245e 100644 --- a/LCARStrek/browser/devtools/commandline.css +++ b/LCARStrek/browser/devtools/commandline.css @@ -144,3 +144,11 @@ opacity: 0.6; text-decoration: line-through; } + +.gcli-breakpoint-label { + font-weight: bold; +} + +.gcli-breakpoint-lineText { + font-family: "Liberation Mono", Consolas, "Courier New", monospace; +} diff --git a/LCARStrek/browser/devtools/common.css b/LCARStrek/browser/devtools/common.css index b226c7e2..7831a2b7 100644 --- a/LCARStrek/browser/devtools/common.css +++ b/LCARStrek/browser/devtools/common.css @@ -178,7 +178,10 @@ devtools-menulist:-moz-focusring, #devtools-side-splitter { min-width: 0; width: 3px; + border: none; + margin: 0 3px; position: relative; + cursor: e-resize; } /* In-tools sidebar */ @@ -341,3 +344,28 @@ devtools-menulist:-moz-focusring, /* color: #666;*/ } +/* Responsive container */ + +.devtools-responsive-container { + -moz-box-orient: horizontal; +} + +@media (max-width: 700px) { + .devtools-responsive-container { + -moz-box-orient: vertical; + } + + .devtools-responsive-container > .devtools-side-splitter { + border: 0; + margin: 3px 0; + min-height: 3px; + height: 3px; + /* In some edge case the cursor is not changed to n-resize */ + cursor: n-resize; + } + + .devtools-responsive-container > .devtools-sidebar-tabs { + min-height: 35vh; + max-height: 75vh; + } +} diff --git a/LCARStrek/browser/devtools/dark-theme.css b/LCARStrek/browser/devtools/dark-theme.css index 9e19bb37..a931ce6f 100644 --- a/LCARStrek/browser/devtools/dark-theme.css +++ b/LCARStrek/browser/devtools/dark-theme.css @@ -37,19 +37,16 @@ .theme-checkbox { display: inline-block; - border: 1px solid #FF9F00; - width: 6px; - height: 6px; - padding: 2px; - background-color: transparent; - background-repeat: no-repeat; + border: 0; + width: 14px; + height: 14px; + padding: 0; outline: none; + background: url("chrome://browser/skin/devtools/checkbox.png") no-repeat; } .theme-checkbox[checked] { - background-clip: content-box; - background-image: linear-gradient(to bottom right, transparent 48%, #FF9F00 48%, #FF9F00 52%, transparent 52%), - linear-gradient(to bottom left, transparent 48%, #FF9F00 48%, #FF9F00 52%, transparent 52%); + background: url("chrome://browser/skin/devtools/checkbox.png") 14px 0; } .theme-selected { diff --git a/LCARStrek/browser/devtools/debugger.css b/LCARStrek/browser/devtools/debugger.css index 20079ae2..7e2523c0 100644 --- a/LCARStrek/browser/devtools/debugger.css +++ b/LCARStrek/browser/devtools/debugger.css @@ -20,20 +20,6 @@ window { -moz-border-start-color: transparent; } -/* Watch expressions, variables and other instruments pane */ - -#instruments-pane { - min-width: 50px; - -moz-margin-start: 0px !important; - /* Unfortunately, transitions don't work properly with locale-aware properties, - so both the left and right margins are set via js, while the start margin - is always overridden here. */ -} - -#instruments-pane[animated] { - transition: margin 0.25s ease-in-out; -} - /* ListWidget items */ .list-widget-item { @@ -277,6 +263,14 @@ window { -moz-image-region: rect(0px, 32px, 16px, 16px); } +#resumption-panel-desc { + width: 200px; +} + +#resumption-order-panel { + -moz-margin-start: -8px; +} + #resume { list-style-image: url("chrome://browser/skin/devtools/debugger-play.png"); -moz-image-region: rect(0px, 16px, 16px, 0px); @@ -324,12 +318,12 @@ window { background: none; box-shadow: none; border: none; - list-style-image: url("chrome://browser/skin/devtools/debugger-expand.png"); + list-style-image: url("chrome://browser/skin/devtools/debugger-collapse.png"); -moz-image-region: rect(0px,16px,16px,0px); } -#instruments-pane-toggle:not([toggled]) { - list-style-image: url("chrome://browser/skin/devtools/debugger-collapse.png"); +#instruments-pane-toggle[pane-collapsed] { + list-style-image: url("chrome://browser/skin/devtools/debugger-expand.png"); } #instruments-pane-toggle:hover, diff --git a/LCARStrek/browser/devtools/light-theme.css b/LCARStrek/browser/devtools/light-theme.css index 9e19bb37..a931ce6f 100644 --- a/LCARStrek/browser/devtools/light-theme.css +++ b/LCARStrek/browser/devtools/light-theme.css @@ -37,19 +37,16 @@ .theme-checkbox { display: inline-block; - border: 1px solid #FF9F00; - width: 6px; - height: 6px; - padding: 2px; - background-color: transparent; - background-repeat: no-repeat; + border: 0; + width: 14px; + height: 14px; + padding: 0; outline: none; + background: url("chrome://browser/skin/devtools/checkbox.png") no-repeat; } .theme-checkbox[checked] { - background-clip: content-box; - background-image: linear-gradient(to bottom right, transparent 48%, #FF9F00 48%, #FF9F00 52%, transparent 52%), - linear-gradient(to bottom left, transparent 48%, #FF9F00 48%, #FF9F00 52%, transparent 52%); + background: url("chrome://browser/skin/devtools/checkbox.png") 14px 0; } .theme-selected { diff --git a/LCARStrek/browser/devtools/ruleview.css b/LCARStrek/browser/devtools/ruleview.css index eaf44147..f19670a3 100644 --- a/LCARStrek/browser/devtools/ruleview.css +++ b/LCARStrek/browser/devtools/ruleview.css @@ -28,10 +28,16 @@ text-decoration: underline; } -.ruleview-rule { +.ruleview-rule, +#noResults { padding: 2px 4px; } +#noResults { + font: message-box; + color: #8050B0; +} + .ruleview-rule + .ruleview-rule { border-top-width: 1px; border-top-style: dotted; diff --git a/LCARStrek/browser/devtools/webconsole.css b/LCARStrek/browser/devtools/webconsole.css index db745405..be6686a6 100644 --- a/LCARStrek/browser/devtools/webconsole.css +++ b/LCARStrek/browser/devtools/webconsole.css @@ -6,16 +6,6 @@ window { padding: 0; } -.hud-outer-wrapper { - width: 100%; - height: 100%; -} - -.hud-console-wrapper { - width: 100%; - overflow: auto; -} - /* General output styles */ .webconsole-timestamp { @@ -104,7 +94,6 @@ window { .hud-output-node { -moz-appearance: none; border-bottom: 1px solid #9C9CFF; - border-top: 1px solid #9C9CFF; margin: 0; } @@ -115,7 +104,7 @@ window { /* WebConsole colored drops */ -.webconsole-filter-button[checked=true] { +.webconsole-filter-button[checked] { /* color: white !important; */ } @@ -278,3 +267,24 @@ webconsole-mixed-content { .hud-filter-box { width: 200px; } + +.webconsole-msg-inspector iframe { + height: 7em; + margin-bottom: 15px; + -moz-margin-end: 15px; + border-radius: 4px; +} + +#webconsole-sidebar > tabs { + height: 0; + border: none; +} + +.webconsole-msg-security > .webconsole-msg-icon-container { + -moz-border-start: solid #FF0000 6px; +} + +.webconsole-filter-button[category="security"] > .toolbarbutton-menubutton-button:before { + background-color: #FF0000; + border-color: #FFCF00; +} diff --git a/LCARStrek/browser/downloads/downloads.css b/LCARStrek/browser/downloads/downloads.css index 19b2594f..9fef1597 100644 --- a/LCARStrek/browser/downloads/downloads.css +++ b/LCARStrek/browser/downloads/downloads.css @@ -144,6 +144,7 @@ richlistitem[type="download"]:first-child { /*** Highlighted list items ***/ +/* #downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover { */ #downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"]:hover { border-radius: 3px; background-color: #794900; diff --git a/LCARStrek/browser/social/services-16.png b/LCARStrek/browser/social/services-16.png new file mode 100644 index 0000000000000000000000000000000000000000..11eaa2f6b70b054bc3613a1ab15e4b7af997e34c GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|t_%$6bLRa2Kc7K0McErD z$XF8O7tG-B>_!@hljQC0!qCAg>j6?;;1OBOz`!jG!i)^F=12eq*-JcqUD@xl$q6yB zGVo0F0}9!Cx;Tb#Tu)9ANM&eR!@$ONEY$nKky8w8+d>_dU0D^XExAc4IFY48n{`sc qSuWPBlPoWN83i5qm=`lMGc$Ov6W&sK@#8k2K@6U*elF{r5}E)dAv3H1 literal 0 HcmV?d00001 diff --git a/LCARStrek/browser/social/services-64.png b/LCARStrek/browser/social/services-64.png new file mode 100644 index 0000000000000000000000000000000000000000..ae3c9f03ab820a4f26c3952ee1bbeb8fd55db2bf GIT binary patch literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSoB=)|t_%$6bLRa2Kc7K0McErD z$XF8O7tG-B>_!@hljQC0!qCAg>j6?;;1OBOz`!jG!i)^F=12eq*-JcqUD@xl$qBI; zufBEgGEnHFr;B5V#p%75ZTSu>@USLGJYaiy;c`I>PiebM{5wSHTK4dzGJ@9qGwdL_d~=(4Mh$)<$cbd)dR;XW?S*27oOSA7U-ATUp`Y#18 zby3-Vee~bp9zYIffk$L90|U1(2s1Lwnj--eWH0gbb!ET9A;m1fULdnM z6(}U{>Eal|aXmSKf%zFT&l`RLjuWj43bX$+H~--mU}9$YvWROhYx2EWK&1?xu6{1- HoD!M<%zY?A -- 2.43.0