From 4c220ea420fba53bd0df4c512bcf36466a0cdd1b Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@btalbot.local>
Date: Thu, 15 Nov 2012 16:45:16 -0500
Subject: [PATCH] in progress discussion work

---
 cms/static/sass/_settings.scss | 22 +++++++++++++---------
 cms/templates/settings.html    | 17 -----------------
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/cms/static/sass/_settings.scss b/cms/static/sass/_settings.scss
index a809c76973..9897043bd4 100644
--- a/cms/static/sass/_settings.scss
+++ b/cms/static/sass/_settings.scss
@@ -170,15 +170,23 @@
       }
 
       .ui-status-input-checkbox ~ label, .ui-status-input-radio ~ label {
+        position: relative;
+        left: -30px;
         display: inline-block;
+        z-index: 100;
         margin: 0 0 0 5px;
+        padding-left: 30px;
         color: $offBlack;
         opacity: 0.50;
         cursor: pointer;
         @include transition(opacity 0.25s ease-in-out);
 
+        &:before {
+          display: inline-block;
+          margin-right: 10px;
+        }
+
         &:after {
-         content: "(Off)";
          display: inline-block;
          margin-left: 10px;
         }
@@ -192,6 +200,7 @@
       .ui-status-indic {
         position: relative;
         top: 2px;
+        z-index: 10;
         display: inline-block;
         height: 15px;
         width: 15px;
@@ -207,7 +216,9 @@
          opacity: 0.99;
 
          &:after {
-          content: "(On)";
+         }
+
+         &:before {
          }
 
          ~ .tip {
@@ -476,13 +487,6 @@
 
     }
 
-    .settings-discussions-exceptions, .settings-problems-exceptions {
-
-      p, ul {
-        font-size: 15px;
-      }
-    }
-
     // states
     label.is-focused {
       color: $blue;
diff --git a/cms/templates/settings.html b/cms/templates/settings.html
index bbfcbc6dbd..102e57ebec 100644
--- a/cms/templates/settings.html
+++ b/cms/templates/settings.html
@@ -819,10 +819,6 @@
                 </div>
               </div>
             </section><!-- .settings-problems-exams -->
-
-            <section class="settings-problems-exceptions">
-
-            </section><!-- .settings-problems-exceptions -->
           </section><!-- .settings-problems -->
 
           <section class="settings-discussions">
@@ -853,19 +849,6 @@
                   </div>
               </div>
             </section><!-- .settings-discussions-general -->
-
-            <section class="settings-discussions-exceptions">
-              <header>
-                <h3>Discussion Settings Elsewhere</h3>
-                <span class="detail">More specific settings for particular discussions</span>
-              </header>
-
-              <p>The following discussions have had their settings specified elsewhere and will follow those rules.</p>
-
-              <ul class="settings-discussions-exceptions-list">
-                Discussion
-              </ul>
-            </section><!-- .settings-discussions-exceptions -->
           </section><!-- .settings-discussions -->
         </div>
       </article>