From ba80e921d910af5bb87e8fe668d04150a4318444 Mon Sep 17 00:00:00 2001
From: Sai Kurogetsu <kurogetsusai@gmail.com>
Date: Fri, 15 Dec 2017 17:42:13 +0000
Subject: [PATCH] reorganize CSD config, issue #3

- selectors are not allowed before @import declarations, moved them to separate
  files
---
 ui/csd-1-button.css  |  5 +++++
 ui/csd-2-buttons.css |  5 +++++
 ui/csd-3-buttons.css |  5 +++++
 userChrome.css       | 45 ++++++++++++++++++++++----------------------
 4 files changed, 37 insertions(+), 23 deletions(-)
 create mode 100644 ui/csd-1-button.css
 create mode 100644 ui/csd-2-buttons.css
 create mode 100644 ui/csd-3-buttons.css

diff --git a/ui/csd-1-button.css b/ui/csd-1-button.css
new file mode 100644
index 0000000..f2d1a36
--- /dev/null
+++ b/ui/csd-1-button.css
@@ -0,0 +1,5 @@
+@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#nav-bar {
+	margin-right: 43px;
+}
diff --git a/ui/csd-2-buttons.css b/ui/csd-2-buttons.css
new file mode 100644
index 0000000..75195f4
--- /dev/null
+++ b/ui/csd-2-buttons.css
@@ -0,0 +1,5 @@
+@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#nav-bar {
+	margin-right: 83px;
+}
diff --git a/ui/csd-3-buttons.css b/ui/csd-3-buttons.css
new file mode 100644
index 0000000..7531a31
--- /dev/null
+++ b/ui/csd-3-buttons.css
@@ -0,0 +1,5 @@
+@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#nav-bar {
+	margin-right: 123px;
+}
diff --git a/userChrome.css b/userChrome.css
index 9b181ba..46c73ce 100644
--- a/userChrome.css
+++ b/userChrome.css
@@ -26,34 +26,33 @@
 /*@import "ui/gnome-3.26-dark.css"; /**/
 
 /*******************************************************************************
- * Optional features
+/* Client-side decorations (optional)
+ * This feature is currently only available on Firefox Nightly (59) and Firefox
+ * 57 on Fedora, which includes a CSD patch. You can enable Firefox' CSD support
+ * in the app menu → Customize... → uncheck "Title Bar" at the bottom of the
+ * window. Fedora's version also requires enabling a key in about:config —
+ * widget.allow-client-side-decoration.
+ */
+
+/* Enable CSD for Firefox 59 */
+/*@import "ui/csd.css"; /**/
+/* Enable CSD for Firefox 57 (Fedora only) */
+/*@import "ui/fedora-csd.css"; /**/
+
+/* Window controls: just 1 button */
+/*@import "ui/csd-1-button.css" /**/
+/* Window controls: 2 buttons */
+/*@import "ui/csd-2-buttons.css" /**/
+/* Window controls: 3 buttons */
+/*@import "ui/csd-3-buttons.css" /**/
+
+/*******************************************************************************
+ * Other features (optional)
  */
 
 /* Make all tab icons look kinda like symbolic icons */
 /*@import "ui/symbolic-tab-icons.css"; /**/
 
-/* Enable client-side decorations Firefox Nightly */
-/*@import "ui/csd.css"; /**/
-
-/* Enable client-side decorations (Fedora only)
- * WARNING: This setting is experimental and doesn't work exactly as it should.
- * Don't forget to enable widget.allow-client-side-decoration in about:config
- * if you're using it. */
-/*@import "ui/fedora-csd.css"; /**/
-
-/* Client-side decorations window buttons options (Fedora & Nightly)*/
-#nav-bar {
-	/* Close window button only
-	margin-right: 43px;
-	*/
-	/* Two window buttons
-	margin-right: 83px;
-	*/
-	/* Three window buttons
-	margin-right: 123px;
-	*/
-}
-
 /* Import a custom stylesheet
  * Everything you add in your customChrome.css file (it doesn't exist by
  * default) will be included here and preserved between updates, so you can move