From bf11d749c7b869bc626430efac01dcc5602a184a Mon, 8 Aug 2011 15:28:32 +0200
From: Bram Goffings <bramgoffings@gmail.com>
Date: Mon, 8 Aug 2011 15:28:25 +0200
Subject: [PATCH] color module css cleanup

diff --git a/modules/color/color-rtl.css b/modules/color/color-rtl.css
deleted file mode 100644
index bfbcd49..0000000
--- a/modules/color/color-rtl.css
+++ /dev/null
@@ -1,44 +0,0 @@
-
-#placeholder {
-  left: 0;
-  right: auto;
-}
-
-/* Palette */
-.color-form .form-item {
-  padding-left: 0;
-  padding-right: 1em;
-}
-.color-form label {
-  float: right;
-  clear: right;
-}
-.color-form .form-text,
-.color-form .form-select {
-  float: right;
-}
-.color-form .form-text {
-  margin-right: 0;
-  margin-left: 5px;
-}
-#palette .hook {
-  float: right;
-}
-#palette .down,
-#palette .up,
-#palette .both {
-  background: url(images/hook-rtl.png) no-repeat 0 0;
-}
-#palette .up {
-  background-position: 0 -27px;
-}
-#palette .both {
-  background-position: 0 -54px;
-}
-#palette .lock {
-  float: right;
-  right: -10px;
-}
-html.js #preview {
-  float: right;
-}
diff --git a/modules/color/color.base-rtl.css b/modules/color/color.base-rtl.css
new file mode 100644
index 0000000..c797755
--- /dev/null
+++ b/modules/color/color.base-rtl.css
@@ -0,0 +1,36 @@
+/* Farbtastic placement */
+#placeholder {
+  left: 0;
+  right: auto;
+}
+
+/* Palette */
+.color-form label {
+  float: right;
+  clear: right;
+}
+.color-form .form-text,
+.color-form .form-select {
+  float: right;
+}
+#palette .hook {
+  float: right;
+}
+#palette .down,
+#palette .up,
+#palette .both {
+  background: url(images/hook-rtl.png) no-repeat 0 0;
+}
+#palette .up {
+  background-position: 0 -27px;
+}
+#palette .both {
+  background-position: 0 -54px;
+}
+#palette .lock {
+  float: right;
+  right: -10px;
+}
+html.js #preview {
+  float: right;
+}
diff --git a/modules/color/color.base.css b/modules/color/color.base.css
new file mode 100644
index 0000000..7080a4b
--- /dev/null
+++ b/modules/color/color.base.css
@@ -0,0 +1,54 @@
+/* Farbtastic placement */
+#placeholder {
+  right: 0; /* LTR */
+}
+
+/* Palette */
+.color-form label {
+  float: left; /* LTR */
+  clear: left; /* LTR */
+}
+.color-form .form-text,
+.color-form .form-select {
+  float: left; /* LTR */
+}
+.color-form .form-text {
+  cursor: pointer;
+}
+#palette .hook {
+  float: left; /* LTR */
+  margin-top: 3px;
+  width: 16px;
+  height: 16px;
+}
+#palette .down,
+#palette .up,
+#palette .both {
+  background: url(images/hook.png) no-repeat 100% 0; /* LTR */
+}
+#palette .up {
+  background-position: 100% -27px; /* LTR */
+}
+#palette .both {
+  background-position: 100% -54px; /* LTR */
+}
+#palette .lock {
+  float: left; /* LTR */
+  position: relative;
+  top: -1.4em;
+  left: -10px; /* LTR */
+  width: 20px;
+  height: 25px;
+  background: url(images/lock.png) no-repeat 50% 2px;
+  cursor: pointer;
+}
+#palette .unlocked {
+  background-position: 50% -22px;
+}
+
+/* Preview */
+html.js #preview {
+  display: block;
+  position: relative;
+  float: left; /* LTR */
+}
diff --git a/modules/color/color.css b/modules/color/color.css
deleted file mode 100644
index e513dad..0000000
--- a/modules/color/color.css
+++ /dev/null
@@ -1,81 +0,0 @@
-
-/* Farbtastic placement */
-.color-form {
-  max-width: 50em;
-  position: relative;
-}
-#placeholder {
-  position: absolute;
-  top: 0;
-  right: 0; /* LTR */
-}
-
-/* Palette */
-.color-form .form-item {
-  height: 2em;
-  line-height: 2em;
-  padding-left: 1em; /* LTR */
-  margin: 0.5em 0;
-}
-.color-form label {
-  float: left; /* LTR */
-  clear: left; /* LTR */
-  width: 10em;
-}
-.color-form .form-text,
-.color-form .form-select {
-  float: left; /* LTR */
-}
-.color-form .form-text {
-  text-align: center;
-  margin-right: 5px; /* LTR */
-  cursor: pointer;
-}
-
-#palette .hook {
-  float: left; /* LTR */
-  margin-top: 3px;
-  width: 16px;
-  height: 16px;
-}
-#palette .down,
-#palette .up,
-#palette .both {
-  background: url(images/hook.png) no-repeat 100% 0; /* LTR */
-}
-#palette .up {
-  background-position: 100% -27px; /* LTR */
-}
-#palette .both {
-  background-position: 100% -54px; /* LTR */
-}
-
-#palette .lock {
-  float: left; /* LTR */
-  position: relative;
-  top: -1.4em;
-  left: -10px; /* LTR */
-  width: 20px;
-  height: 25px;
-  background: url(images/lock.png) no-repeat 50% 2px;
-  cursor: pointer;
-}
-#palette .unlocked {
-  background-position: 50% -22px;
-}
-#palette .form-item {
-  width: 20em;
-}
-#palette .item-selected {
-  background: #eee;
-}
-
-/* Preview */
-#preview {
-  display: none;
-}
-html.js #preview {
-  display: block;
-  position: relative;
-  float: left; /* LTR */
-}
diff --git a/modules/color/color.module b/modules/color/color.module
index 09eb82b..a897a75 100644
--- a/modules/color/color.module
+++ b/modules/color/color.module
@@ -189,7 +189,8 @@
       ),
       // Add custom CSS.
       'css' => array(
-        $base . '/color.css' => array(),
+        $base . '/color.base.css' => array(),
+        $base . '/color.theme.css' => array(),
       ),
       // Add custom JavaScript.
       'js' => array(
diff --git a/modules/color/color.theme.css b/modules/color/color.theme.css
new file mode 100644
index 0000000..07cbc63
--- /dev/null
+++ b/modules/color/color.theme.css
@@ -0,0 +1,13 @@
+/* Palette */
+.color-form label {
+  width: 10em;
+}
+.color-form .form-item {
+  height: 2em;
+}
+#palette .form-item {
+  width: 20em;
+}
+#palette .item-selected {
+  background: #eee;
+}
diff --git a/themes/bartik/color/preview-rtl.css b/themes/bartik/color/preview-rtl.css
new file mode 100644
index 0000000..e8c080e
--- /dev/null
+++ b/themes/bartik/color/preview-rtl.css
@@ -0,0 +1,9 @@
+/* ---------- Color form ----------- */
+.color-form .form-text {
+  margin-right: 0;
+  margin-left: 5px;
+}
+.color-form .form-item {
+  padding-left: 0;
+  padding-right: 1em;
+}
\ No newline at end of file
diff --git a/themes/bartik/color/preview.css b/themes/bartik/color/preview.css
index 48a4a83..7f499f9 100644
--- a/themes/bartik/color/preview.css
+++ b/themes/bartik/color/preview.css
@@ -1,5 +1,16 @@
-
 /* ---------- Color form ----------- */
+.color-form {
+  max-width: 50em;
+}
+.color-form .form-text {
+  text-align: center;
+  margin-right: 5px; /* LTR */
+}
+.color-form .form-item {
+  line-height: 2em;
+  padding-left: 1em; /* LTR */
+  margin: 0.5em 0;
+}
 #color_scheme_form #palette .form-item {
   width: 25em;
 }
diff --git a/themes/bartik/css/style.css b/themes/bartik/css/style.css
index 872e733..8614eba 100644
--- a/themes/bartik/css/style.css
+++ b/themes/bartik/css/style.css
@@ -1584,6 +1584,13 @@
 div.admin-panel .description {
   margin: 0 0 14px 7px;
 }
+.color-form {
+  position: relative;
+}
+#placeholder {
+  position: absolute;
+  top: 0;
+}
 
 /* ---------- Overlay layout styles ----------- */
 
diff --git a/themes/garland/color/preview-rtl.css b/themes/garland/color/preview-rtl.css
new file mode 100644
index 0000000..f8d431a
--- /dev/null
+++ b/themes/garland/color/preview-rtl.css
@@ -0,0 +1,9 @@
+/* Color form */
+.color-form .form-text {
+  margin-right: 0;
+  margin-left: 5px;
+}
+.color-form .form-item {
+  padding-left: 0;
+  padding-right: 1em;
+}
diff --git a/themes/garland/color/preview.css b/themes/garland/color/preview.css
index cf32438..6a71b60 100644
--- a/themes/garland/color/preview.css
+++ b/themes/garland/color/preview.css
@@ -1,3 +1,16 @@
+/* Color form */
+.color-form {
+  max-width: 50em;
+}
+.color-form .form-text {
+  text-align: center;
+  margin-right: 5px; /* LTR */
+}
+.color-form .form-item {
+  line-height: 2em;
+  padding-left: 1em;
+  margin: 0.5em 0;
+}
 
 /* Positioning */
 #preview {
diff --git a/themes/garland/style.css b/themes/garland/style.css
index c770b2b..e757cd5 100644
--- a/themes/garland/style.css
+++ b/themes/garland/style.css
@@ -855,7 +855,6 @@
 .comment-unpublished {
   background-color: #fff4f4;
 }
-
 .comment-preview {
   background-color: #ffffea;
 }
@@ -1176,6 +1175,13 @@
 .theme-selector .operations li {
   list-style-image: none;
 }
+.color-form {
+  position: relative;
+}
+#placeholder {
+  position: absolute;
+  top: 0;
+}
 
 /**
  * CSS support
diff --git a/themes/seven/style.css b/themes/seven/style.css
index 711d4bc..315cf2d 100644
--- a/themes/seven/style.css
+++ b/themes/seven/style.css
@@ -1029,3 +1029,11 @@
   text-decoration: underline;
 }
 
+/* Color module */
+.color-form {
+  position: relative;
+}
+#placeholder {
+  position: absolute;
+  top: 0;
+}