From 7f9973b65c64ef037e6c05dd81e71fd50d7af900 Mon Sep 17 00:00:00 2001
From: Jonathan la Cour <jon@lacour.me>
Date: Tue, 15 Dec 2015 21:34:02 -0700
Subject: [PATCH] Support new preferences modal

---
 scss/modules/modals/_base.scss        | 23 +++++++++
 scss/modules/modals/_preferences.scss | 73 ++++++++++++++++-----------
 2 files changed, 66 insertions(+), 30 deletions(-)

diff --git a/scss/modules/modals/_base.scss b/scss/modules/modals/_base.scss
index 23cfd489..97384158 100644
--- a/scss/modules/modals/_base.scss
+++ b/scss/modules/modals/_base.scss
@@ -38,6 +38,29 @@
 #fs_modal {
   background: $color-base;
 
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    color: $base-font-color;
+  }
+
+  #fs_modal_sidebar a {
+    color: $base-link-color;
+
+    &:hover {
+      background: $color-shade-dark;
+    }
+
+    &.active {
+      background: $color-shade-darkest;
+      color: $base-link-color-active;
+      text-shadow: 0 1px 0 $color-shadow-light;
+    }
+  }
+
   .fs_modal_btn {
     color: $color-shade-light;
 
diff --git a/scss/modules/modals/_preferences.scss b/scss/modules/modals/_preferences.scss
index c3417a70..eef2f0ae 100644
--- a/scss/modules/modals/_preferences.scss
+++ b/scss/modules/modals/_preferences.scss
@@ -1,42 +1,55 @@
-#new_prefs_dialog:not(.higher):not(.precedence) {
-  background: $color-shade-mid;
+#fs_modal.prefs_modal {
+  .prefs_rollup {
+    border-bottom: 1px solid $color-shade-dark;
 
-  .modal-header {
-    border-bottom: 1px solid $color-base;
+    &:first-of-type {
+      border-top: 1px solid $color-shade-dark;
+    }
+
+    &:hover:not(.active) {
+      background: $color-shade-darkest;
+      color: $base-font-color;
+    }
   }
 
-  .modal-nav {
-    background: padding-box $color-shade-light;
-    border-right: 1px solid $color-base;
+  label.sound_option {
+    &:hover:not(.disabled) ts-icon {
+      color: $color-highlight;
+    }
+  }
 
-    a {
-      color: $base-font-color;
-      text-shadow: 0 1px 0 $color-shadow-light;
+  #debug_prefs_dialog {
+    background: $color-shade-mid;
+  }
 
-      &:hover {
-        background: $color-shade-lightest;
-        color: $base-font-color;
+  #prefs_themes {
+    .theme_thumb {
+      box-shadow: 0 1px 1px $color-shadow-medium;
+    }
+
+    #prefs_themes_customize {
+      .custom_theme_label {
+        border: 1px solid $color-shade-dark;
+
+        .color_swatch {
+          border: 1px solid $color-shade-dark;
+        }
       }
 
-      &.active {
+      .colpick {
         background: $color-shade-mid;
-        color: $base-font-color;
-        text-shadow: 0 1px 0 $color-shadow-light;
+        border: 1px solid $color-shade-dark;
       }
     }
-  }
-}
 
-#debug_prefs_dialog {
-  background: $color-shade-mid;
-}
-
-#prefs_themes .monkey_scroller:before {
-  background: $color-red;
-  border-radius: 3px;
-  content: "Light sidebar themes (e.g. Hoth) will break this Stylish theme.";
-  display: block;
-  margin-bottom: 6px;
-  padding: 2px 4px 4px;
-  width: 100%;
+    &:before {
+      background: $color-red;
+      border-radius: 3px;
+      content: "Light sidebar themes (e.g. Hoth) will break this Stylish theme.";
+      display: block;
+      margin-bottom: 6px;
+      padding: 2px 4px 4px;
+      width: 100%;
+    }
+  }
 }