From 8837ac2c455d0efc3537a6b21880a0811be05aef Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Sat, 13 Dec 2014 13:07:53 -0800 Subject: [PATCH] fourth part of syncing LCARStrek with Firefox 34 windows theme changes --- LCARStrek/browser/Fxtheme-switcher-icon.png | Bin 0 -> 250 bytes LCARStrek/browser/browser.css | 105 +++++++++++------- .../browser/customizableui/panelUIOverlay.css | 5 +- LCARStrek/browser/newtab/newTab.css | 1 + LCARStrek/browser/social/chat-icons.png | Bin 357 -> 0 bytes LCARStrek/browser/social/chat-icons.svg | 45 ++++++++ 6 files changed, 117 insertions(+), 39 deletions(-) create mode 100644 LCARStrek/browser/Fxtheme-switcher-icon.png delete mode 100644 LCARStrek/browser/social/chat-icons.png create mode 100644 LCARStrek/browser/social/chat-icons.svg diff --git a/LCARStrek/browser/Fxtheme-switcher-icon.png b/LCARStrek/browser/Fxtheme-switcher-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f574a7202a72056133e043e1216a7efc605c646a GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnL3?x0byx0z;*aCb)T$MN0|3A-gB5pw_P=v80 z$S;_|;n|He5GTpo-G!lpRn`N@;VkfoEM{Qf76xHPhFNnYfP(BLp1!W^_jq_kStT!Y z-?s${<$Ag}hHzXrJ-3mU$xy)MV!q&vH$hA)+Z`A^@^~1R=4$F4T-bb-cei?8le({w zl*Ojr1=Sm*L{=aB8pigWeX?2P$?k3Je-Bh%3jZ*3&;JOcbGJ-wHY};&QHh)Do68y% nl36sdN2%8Fl=SaPjZe&%n=CA%e#S2YTFl_->gTe~DWM4f^;l3W literal 0 HcmV?d00001 diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index a681345e..d648f6f3 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -3330,6 +3330,31 @@ notification[value="translation"] menulist > .menulist-dropmarker { width: 70px; } +.translation-welcome-panel { + width: 305px; +} + +.translation-welcome-logo { + height: 32px; + width: 32px; + list-style-image: url(chrome://browser/skin/translation-16@2x.png); + -moz-image-region: rect(0, 64px, 32px, 32px); +} + +.translation-welcome-content { + -moz-margin-start: 16px; +} + +.translation-welcome-headline { + font-size: larger; + font-weight: bold; +} + +.translation-welcome-body { + padding: 1em 0; + margin: 0 0; +} + /* === END infobar.inc.css === */ notification[value="translation"] { @@ -4431,10 +4456,17 @@ html|*#gcli-output-frame { .chat-toolbarbutton { -moz-appearance: none; border: none; - padding: 0; + padding: 0 3px; margin: 0; background: none; - width: 16px; +} + +.chat-toolbarbutton:hover { +/* background-color: rgba(255,255,255,.35);*/ +} + +.chat-toolbarbutton:hover:active { +/* background-color: rgba(255,255,255,.5);*/ } .chat-toolbarbutton > .toolbarbutton-text { @@ -4442,52 +4474,37 @@ html|*#gcli-output-frame { } .chat-toolbarbutton > .toolbarbutton-icon { - width: inherit; -} - -.chat-toolbarbutton.notification-anchor-icon > .toolbarbutton-icon { - width: inherit; - margin-top: -2px; + width: 16px; + height: 16px; } .chat-close-button { - list-style-image: url('chrome://browser/skin/social/chat-icons.png'); - -moz-image-region: rect(0, 16px, 16px, 0); + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close"); } -.chat-close-button:hover, -.chat-close-button:hover:active { - -moz-image-region: rect(0, 32px, 16px, 16px); +.chat-close-button:-moz-any(:hover,:hover:active) { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close-active"); } .chat-minimize-button { - list-style-image: url('chrome://browser/skin/social/chat-icons.png'); - -moz-image-region: rect(16px, 16px, 32px, 0); + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize"); } -.chat-minimize-button:hover:active, -.chat-minimize-button:hover { - -moz-image-region: rect(16px, 32px, 32px, 16px); +.chat-minimize-button:-moz-any(:hover,:hover:active) { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-active"); } .chat-swap-button { - list-style-image: url('chrome://browser/skin/social/chat-icons.png'); - -moz-image-region: rect(48px, 16px, 64px, 0); + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand"); + transform: rotate(180deg); } -.chat-swap-button:hover:active, -.chat-swap-button:hover { - -moz-image-region: rect(48px, 32px, 64px, 16px); +.chat-swap-button:-moz-any(:hover,:hover:active) { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-active"); } chatbar > chatbox > .chat-titlebar > .chat-swap-button { - list-style-image: url('chrome://browser/skin/social/chat-icons.png'); - -moz-image-region: rect(32px, 16px, 48px, 0); -} - -chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover:active, -chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover { - -moz-image-region: rect(32px, 32px, 48px, 16px); + transform: none; } .chat-title { @@ -4500,12 +4517,11 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover { .chat-titlebar { background-color: #9C9CFF; color: #000000; - height: 20px; - min-height: 16px; + height: 30px; + min-height: 30px; width: 100%; margin: 0; - padding: 2px; - -moz-padding-start: 6px; + padding: 7px 6px; border: none; border-bottom: 1px solid #008484; cursor: pointer; @@ -4528,6 +4544,18 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover { background-color: #E7ADE7; } +chatbox[dark=true] > .chat-titlebar, +chatbox[dark=true] > .chat-titlebar[selected] { +/* border-bottom: none; + background-color: #000; + background-image: none;*/ +} + +chatbox[dark=true] > .chat-titlebar > hbox > .chat-title { +/* font-weight: normal; + color: #c1c1c1;*/ +} + .chat-frame { padding: 0; margin: 0; @@ -5053,6 +5081,10 @@ toolbarpaletteitem[place="toolbar"] { -moz-padding-start: 0; } +.customization-lwtheme-menu-theme[defaulttheme] { + list-style-image: url(chrome://browser/skin/Fxtheme-switcher-icon.png); +} + .customization-lwtheme-menu-theme[active="true"] { background-color: #008484; } @@ -5110,10 +5142,7 @@ toolbarpaletteitem[place="toolbar"] { background-color: #FFCF00; } -#customization-lwtheme-menu-footer:not(:hover) > .customization-lwtheme-menu-footeritem:first-child { -} - -#customization-lwtheme-menu-footer:hover > .customization-lwtheme-menu-footeritem:first-child { +.customization-lwtheme-menu-footeritem:first-child { } /* === END customizeMode.inc.css === */ diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css index ebf9e32d..685da6c8 100644 --- a/LCARStrek/browser/customizableui/panelUIOverlay.css +++ b/LCARStrek/browser/customizableui/panelUIOverlay.css @@ -83,7 +83,6 @@ .panel-subviews { padding: 4px; - background-color: #000000; -moz-margin-start: 38px; } @@ -1212,6 +1211,10 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left { /* === END panelUIOverlay.inc.css === */ +.panel-subviews { + background-color: #000000; +} + #PanelUI-contents #zoom-out-btn { padding-left: 12px; padding-right: 12px; diff --git a/LCARStrek/browser/newtab/newTab.css b/LCARStrek/browser/newtab/newTab.css index ab7ef715..1e86ac88 100644 --- a/LCARStrek/browser/newtab/newTab.css +++ b/LCARStrek/browser/newtab/newTab.css @@ -145,6 +145,7 @@ } /* TITLES */ +#newtab-intro-what, .newtab-sponsored, .newtab-title { padding: 0 8px; diff --git a/LCARStrek/browser/social/chat-icons.png b/LCARStrek/browser/social/chat-icons.png deleted file mode 100644 index 901b6db8b579a1f7d8de5375ad20904c789b221c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>FdgVmxG5@S(}GP_7PC%lc$SgNXEUlGZVR56$DyB@3rpw zuV{7Y+jG{XudQ~evVC?GNIP?F*5fFSmMJIxJKTOh_nX3|>3_4{t`zJj>$5%T>LYB| z*cS!}7oVLYq#gTe~DWM4fH4Bc( diff --git a/LCARStrek/browser/social/chat-icons.svg b/LCARStrek/browser/social/chat-icons.svg new file mode 100644 index 00000000..c8e71359 --- /dev/null +++ b/LCARStrek/browser/social/chat-icons.svg @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + -- 2.35.3