summaryrefslogtreecommitdiffstats
path: root/browser/themes/osx
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-05-25 20:45:48 +0000
committerGitHub <noreply@github.com>2018-05-25 20:45:48 +0000
commit72bab89cf6c77c9ee95a977c306e6ce317b84835 (patch)
treeca3fcaa2a72700b85221b2fe75bb7d46d5d424ce /browser/themes/osx
parentd5459982f0d1bab08b751dc140c4cbe047032617 (diff)
downloadUXP-72bab89cf6c77c9ee95a977c306e6ce317b84835.tar
UXP-72bab89cf6c77c9ee95a977c306e6ce317b84835.tar.gz
UXP-72bab89cf6c77c9ee95a977c306e6ce317b84835.tar.lz
UXP-72bab89cf6c77c9ee95a977c306e6ce317b84835.tar.xz
UXP-72bab89cf6c77c9ee95a977c306e6ce317b84835.zip
Revert "Remove the Social API"
Diffstat (limited to 'browser/themes/osx')
-rw-r--r--browser/themes/osx/browser.css88
-rw-r--r--browser/themes/osx/jar.mn4
2 files changed, 92 insertions, 0 deletions
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 5a83c74b2..e8ac9163e 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -808,6 +808,10 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-ic
-moz-image-region: rect(18px, 288px, 36px, 270px);
}
+ #social-share-button@toolbarButtonPressed@ {
+ -moz-image-region: rect(18px, 306px, 36px, 288px);
+ }
+
#characterencoding-button@toolbarButtonPressed@ {
-moz-image-region: rect(18px, 324px, 36px, 306px);
}
@@ -963,6 +967,10 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-ic
-moz-image-region: rect(36px, 576px, 72px, 540px);
}
+ #social-share-button@toolbarButtonPressed@ {
+ -moz-image-region: rect(36px, 612px, 72px, 576px);
+ }
+
#characterencoding-button@toolbarButtonPressed@ {
-moz-image-region: rect(36px, 648px, 72px, 612px);
}
@@ -2021,6 +2029,59 @@ html|span.ac-emphasize-text-url {
-moz-image-region: rect(0, 48px, 16px, 32px);
}
+/* social share panel */
+.social-share-frame {
+ border-top: 1px solid #f8f8f8;
+ min-width: 756px;
+ height: 150px;
+ /* we resize our panels dynamically, make it look nice */
+}
+
+#share-container {
+ min-width: 756px;
+ background-repeat: no-repeat;
+ background-position: center center;
+}
+#share-container[loading] {
+ background-image: url(chrome://browser/skin/tabbrowser/pendingpaint.png);
+}
+#share-container > browser {
+ transition: opacity 150ms ease-in-out;
+ opacity: 1;
+}
+#share-container[loading] > browser {
+ opacity: 0;
+}
+
+#manage-share-providers {
+ -moz-image-region: rect(18px, 468px, 36px, 450px);
+}
+
+.social-share-toolbar {
+ border-bottom: 1px solid #dedede;
+ padding: 2px;
+}
+
+#social-share-provider-buttons {
+ padding: 0;
+ margin: 0;
+}
+
+.share-provider-button {
+ padding: 5px;
+ margin: 2px;
+}
+
+.share-provider-button > .toolbarbutton-text {
+ display: none;
+}
+
+.share-provider-button > .toolbarbutton-icon {
+ width: 16px;
+ min-height: 16px;
+ max-height: 16px;
+}
+
/* BOOKMARKING PANEL */
#editBookmarkPanelStarIcon {
list-style-image: url("chrome://browser/skin/places/starred48.png");
@@ -3121,6 +3182,33 @@ menulist.translate-infobar-element > .menulist-dropmarker {
border-radius: 1px;
}
+/* Share */
+%include ../shared/social/social.inc.css
+
+#social-share-panel {
+ min-height: 100px;
+ min-width: 300px;
+ transition: height .3s ease-in-out, width .3s ease-in-out;
+}
+
+#share-container,
+.social-share-frame {
+ border-top-left-radius: 0;
+ border-bottom-left-radius: inherit;
+ border-top-right-radius: 0;
+ border-bottom-right-radius: inherit;
+}
+
+#social-share-panel > .social-share-toolbar {
+ border-top-left-radius: inherit;
+ border-top-right-radius: inherit;
+}
+
+#social-share-provider-buttons {
+ border-top-left-radius: inherit;
+ border-top-right-radius: inherit;
+}
+
/* Customization mode */
%include ../shared/customizableui/customizeMode.inc.css
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index 27802843d..98ba4e6ea 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -124,6 +124,10 @@ browser.jar:
* skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css)
* skin/classic/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css)
skin/classic/browser/preferences/applications.css (preferences/applications.css)
+ skin/classic/browser/social/services-16.png (social/services-16.png)
+ 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/tabbrowser/alltabs-box-bkgnd-icon.png (tabbrowser/alltabs-box-bkgnd-icon.png)
skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon-inverted.png (tabbrowser/alltabs-box-bkgnd-icon-inverted.png)
skin/classic/browser/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png (tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png)