From bdf5bceb4c2c5c562bc1be82adc133047cfa7fba Mon Sep 17 00:00:00 2001 From: Jared Wein Date: Tue, 2 Sep 2014 11:20:39 -0400 Subject: [PATCH] Bug 1055239 - SVG icons and theming for SocialAPI/Loop. r=MattN --- browser/base/content/socialchat.xml | 4 +- browser/components/loop/MozLoopService.jsm | 2 + browser/themes/linux/jar.mn | 2 +- browser/themes/linux/social/chat-icons.png | Bin 4407 -> 0 bytes browser/themes/osx/jar.mn | 3 +- browser/themes/osx/social/chat-icons.png | Bin 4407 -> 0 bytes browser/themes/osx/social/chat-icons@2x.png | Bin 7536 -> 0 bytes browser/themes/shared/social/chat-icons.svg | 45 +++++++ browser/themes/shared/social/chat.inc.css | 132 ++++++------------- browser/themes/windows/jar.mn | 4 +- browser/themes/windows/social/chat-icons.png | Bin 4407 -> 0 bytes 11 files changed, 91 insertions(+), 101 deletions(-) delete mode 100644 browser/themes/linux/social/chat-icons.png delete mode 100644 browser/themes/osx/social/chat-icons.png delete mode 100644 browser/themes/osx/social/chat-icons@2x.png create mode 100644 browser/themes/shared/social/chat-icons.svg delete mode 100644 browser/themes/windows/social/chat-icons.png diff --git a/browser/base/content/socialchat.xml b/browser/base/content/socialchat.xml index 409c86d43b4..9979da1901f 100644 --- a/browser/base/content/socialchat.xml +++ b/browser/base/content/socialchat.xml @@ -137,7 +137,9 @@ *&-QB8bY?zkR`sx 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 RFZ7E85X`M{C0OUX{|A1?OJM*2 diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn index 166a0c31fb3..a80f983b0aa 100644 --- a/browser/themes/osx/jar.mn +++ b/browser/themes/osx/jar.mn @@ -260,8 +260,7 @@ browser.jar: skin/classic/browser/social/services-16@2x.png (social/services-16@2x.png) skin/classic/browser/social/services-64.png (social/services-64.png) skin/classic/browser/social/services-64@2x.png (social/services-64@2x.png) - skin/classic/browser/social/chat-icons.png (social/chat-icons.png) - skin/classic/browser/social/chat-icons@2x.png (social/chat-icons@2x.png) + skin/classic/browser/social/chat-icons.svg (../shared/social/chat-icons.svg) skin/classic/browser/social/gear_default.png (../shared/social/gear_default.png) skin/classic/browser/social/gear_clicked.png (../shared/social/gear_clicked.png) skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon.png (tabbrowser/alltabs-box-bkgnd-icon.png) diff --git a/browser/themes/osx/social/chat-icons.png b/browser/themes/osx/social/chat-icons.png deleted file mode 100644 index cc895f93c29f2b3601ddd1af3bf3a9a042eda15c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4407 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 RFZ7E85X`M{C0OUX{|A1?OJM*2 diff --git a/browser/themes/osx/social/chat-icons@2x.png b/browser/themes/osx/social/chat-icons@2x.png deleted file mode 100644 index 4afab888b14686c8856f651928f20bc6776f92aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7536 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 Kx*YZ3+5Z42=SBno diff --git a/browser/themes/shared/social/chat-icons.svg b/browser/themes/shared/social/chat-icons.svg new file mode 100644 index 00000000000..272fe5b0da0 --- /dev/null +++ b/browser/themes/shared/social/chat-icons.svg @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/browser/themes/shared/social/chat.inc.css b/browser/themes/shared/social/chat.inc.css index 502de06c2ee..8ff9c22e637 100644 --- a/browser/themes/shared/social/chat.inc.css +++ b/browser/themes/shared/social/chat.inc.css @@ -47,10 +47,17 @@ .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 { @@ -58,113 +65,37 @@ } .chat-toolbarbutton > .toolbarbutton-icon { - width: inherit; + 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 { - -moz-image-region: rect(0, 32px, 16px, 16px); -} - -.chat-close-button:hover:active { - -moz-image-region: rect(0, 48px, 16px, 32px); +.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 { - -moz-image-region: rect(16px, 32px, 32px, 16px); -} - -.chat-minimize-button:hover:active { - -moz-image-region: rect(16px, 48px, 32px, 32px); +.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 { - -moz-image-region: rect(48px, 32px, 64px, 16px); -} - -.chat-swap-button:hover:active { - -moz-image-region: rect(48px, 48px, 64px, 32px); +.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 { - -moz-image-region: rect(32px, 32px, 48px, 16px); -} - -chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover:active { - -moz-image-region: rect(32px, 48px, 48px, 32px); -} - -@media (min-resolution: 2dppx) { - .chat-close-button { - list-style-image: url('chrome://browser/skin/social/chat-icons@2x.png'); - -moz-image-region: rect(0, 32px, 32px, 0); - } - - .chat-close-button:hover { - -moz-image-region: rect(0, 64px, 32px, 32px); - } - - .chat-close-button:hover:active { - -moz-image-region: rect(0, 96px, 32px, 64px); - } - - .chat-minimize-button { - list-style-image: url('chrome://browser/skin/social/chat-icons@2x.png'); - -moz-image-region: rect(32px, 32px, 64px, 0); - } - - .chat-minimize-button:hover { - -moz-image-region: rect(32px, 64px, 64px, 32px); - } - - .chat-minimize-button:hover:active { - -moz-image-region: rect(32px, 96px, 64px, 64px); - } - - .chat-swap-button { - list-style-image: url('chrome://browser/skin/social/chat-icons@2x.png'); - -moz-image-region: rect(96px, 32px, 128px, 0); - } - - .chat-swap-button:hover { - -moz-image-region: rect(96px, 64px, 128px, 32px); - } - - .chat-swap-button:hover:active { - -moz-image-region: rect(96px, 96px, 128px, 64px); - } - - chatbar > chatbox > .chat-titlebar > .chat-swap-button { - list-style-image: url('chrome://browser/skin/social/chat-icons@2x.png'); - -moz-image-region: rect(64px, 32px, 96px, 0); - } - - chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover { - -moz-image-region: rect(64px, 64px, 96px, 32px); - } - - chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover:active { - -moz-image-region: rect(64px, 96px, 96px, 64px); - } + transform: none; } .chat-title { @@ -175,12 +106,11 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover:active { } .chat-titlebar { - height: 20px; - min-height: 20px; + height: 30px; + min-height: 30px; width: 100%; margin: 0; - padding: 2px; - -moz-padding-start: 6px; + padding: 7px 6px; border: none; border-bottom: 1px solid #ccc; cursor: pointer; @@ -202,6 +132,18 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover:active { background-position: 0 -10px; } +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; diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn index 0027d41d1ef..6b6424e7ca1 100644 --- a/browser/themes/windows/jar.mn +++ b/browser/themes/windows/jar.mn @@ -182,7 +182,7 @@ browser.jar: skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css) skin/classic/browser/social/services-16.png (social/services-16.png) skin/classic/browser/social/services-64.png (social/services-64.png) - skin/classic/browser/social/chat-icons.png (social/chat-icons.png) + skin/classic/browser/social/chat-icons.svg (../shared/social/chat-icons.svg) skin/classic/browser/social/gear_default.png (../shared/social/gear_default.png) skin/classic/browser/social/gear_clicked.png (../shared/social/gear_clicked.png) skin/classic/browser/tabbrowser/newtab.png (tabbrowser/newtab.png) @@ -601,7 +601,7 @@ browser.jar: skin/classic/aero/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css) skin/classic/aero/browser/social/services-16.png (social/services-16.png) skin/classic/aero/browser/social/services-64.png (social/services-64.png) - skin/classic/aero/browser/social/chat-icons.png (social/chat-icons.png) + skin/classic/aero/browser/social/chat-icons.svg (../shared/social/chat-icons.svg) skin/classic/aero/browser/social/gear_default.png (../shared/social/gear_default.png) skin/classic/aero/browser/social/gear_clicked.png (../shared/social/gear_clicked.png) skin/classic/aero/browser/tabbrowser/newtab.png (tabbrowser/newtab.png) diff --git a/browser/themes/windows/social/chat-icons.png b/browser/themes/windows/social/chat-icons.png deleted file mode 100644 index cc895f93c29f2b3601ddd1af3bf3a9a042eda15c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4407 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 RFZ7E85X`M{C0OUX{|A1?OJM*2