Merge pull request #3067 from evazion/fix-3065

Fix #3065: <div> id incorrect for certain controllers

app/assets/stylesheets/common/diffs.scss

@@ -0,0 +1,21 @@
+.diff-list {
+  ins, ins a {
+    color: green;
+    text-decoration: none;
+    margin-right: 0.5em;
+  }
+
+  ins.obsolete, ins.obsolete a {
+    color: darkGreen;
+  }
+
+  del, del a {
+    color: red;
+    text-decoration: line-through;
+    margin-right: 0.5em;
+  }
+
+  del.obsolete, del.obsolete a {
+    color: darkRed;
+  }
+}

app/assets/stylesheets/specific/post_events.scss

@@ -0,0 +1,11 @@
+div#c-post-events {
+  #a-index {
+    tr.resolved-true {
+      background: #DDD;
+    }
+
+    tr.resolved-false {
+      background: #FFF;
+    }
+  }
+}

app/assets/stylesheets/specific/post_versions.scss

@@ -0,0 +1,9 @@
+@import "../common/000_vars.scss";
+
+div#c-post-versions {
+  div#a-index {
+    tr.hilite {
+      background: $highlight_color;
+    }
+  }
+}

app/assets/stylesheets/specific/posts.scss

@@ -482,30 +482,6 @@ div#c-post-versions, div#c-artist-versions {
     a {
       word-wrap: break-word
     }
-
-    tr.hilite {
-      background: $highlight_color;
-    }
-
-    ins, ins a {
-      color: green;
-      text-decoration: none;
-      margin-right: 0.5em;
-    }
-
-    ins.obsolete, ins.obsolete a {
-      color: darkGreen;
-    }
-
-    del, del a {
-      color: red;
-      text-decoration: line-through;
-      margin-right: 0.5em;
-    }
-
-    del.obsolete, del.obsolete a {
-      color: darkRed;
-    }
   }
 }
 

app/assets/stylesheets/specific/terms_of_service.scss

@@ -1,6 +1,6 @@
 @import "../common/000_vars.scss";
 
-div#terms-of-service {
+div#c-static div#a-terms-of-service {
   width: 40em;
 
   h1 {

app/assets/stylesheets/specific/user_upgrades.scss

@@ -0,0 +1,56 @@
+div#c-user-upgrades {
+  div#a-new {
+    max-width: 40em;
+    font-size: 1.2em;
+
+    form.stripe {
+      display: inline;
+    }
+
+    div.section {
+      margin-bottom: 2em;
+    }
+
+    div#feature-comparison {
+      overflow: hidden;
+      margin-bottom: 1em;
+
+      table {
+        width: 100%;
+
+        colgroup {
+          width: 10em;
+        }
+
+        colgroup#basic {
+        }
+
+        colgroup#gold  {
+          background-color: #FFF380;
+        }
+
+        colgroup#platinum {
+          background-color: #eee;
+        }
+
+        td, th {
+          text-align: center;
+          vertical-align: top;
+          padding: 0.5em 0;
+        }
+
+        tbody {
+          tr:hover {
+            background-color: #FEF;
+          }
+        }
+
+        p.cost-footnote {
+          font-size: 80%;
+          color: gray;
+          margin: 0;
+        }
+      }
+    }
+  }
+}

app/assets/stylesheets/specific/users.scss

@@ -86,59 +86,4 @@ div#c-users {
       margin-bottom: 2em;
     }
   }
-
-  div#a-upgrade-information {
-    max-width: 40em;
-    font-size: 1.2em;
-
-    form.stripe {
-      display: inline;
-    }
-
-    div.section {
-      margin-bottom: 2em;
-    }
-
-    div#feature-comparison {
-      overflow: hidden;
-      margin-bottom: 1em;
-
-      table {
-        width: 100%;
-
-        colgroup {
-          width: 10em;
-        }
-
-        colgroup#basic {
-        }
-
-        colgroup#gold  {
-          background-color: #FFF380;
-        }
-
-        colgroup#platinum {
-          background-color: #eee;
-        }
-
-        td, th {
-          text-align: center;
-          vertical-align: top;
-          padding: 0.5em 0;
-        }
-
-        tbody {
-          tr:hover {
-            background-color: #FEF;
-          }
-        }
-
-        p.cost-footnote {
-          font-size: 80%;
-          color: gray;
-          margin: 0;
-        }
-      }
-    }
-  }
 }

app/assets/stylesheets/specific/wiki_page_versions.scss

@@ -0,0 +1,25 @@
+div#c-wiki-page-versions {
+  #a-diff {
+    del {
+      background: #FCC;
+      text-decoration: none;
+    }
+
+    ins {
+      background: #CFC;
+      text-decoration: none;
+    }
+  }
+
+  #a-index {
+    table {
+      margin-bottom: 1em;
+    }
+  }
+
+  #a-show {
+    span.version {
+      color: #AAA;
+    }
+  }
+}

app/assets/stylesheets/specific/wiki_pages.scss

@@ -1,40 +1,19 @@
-div#c-wiki-pages, div#excerpt {
-  span.version {
-    color: #AAA;
-  }
-
-  div.notice {
-    font-size: 0.8em;
-    padding: 1em;
-    margin: 1em 0;
-  }
-  
-  del {
-    background: #FCC;
-    text-decoration: none;
-  }
-
-  ins {
-    background: #CFC;
-    text-decoration: none;
-  }
-
-  table {
-    margin-bottom: 1em;
-  }
-
-  #content {
-    margin-left: 15em;
-    padding-left: 1em;
-  }
-
-  .hint {
+div#c-wiki-pages {
+  form span.hint {
     display: block;
   }
 
-  .other-name {
-    background-color: #EEE;
-    padding: 3px;
-    border-radius: 3px;
+  #a-new {
+    div.notice {
+      font-size: 0.8em;
+      padding: 1em;
+      margin: 1em 0;
+    }
   }
 }
+
+.wiki-other-name {
+  background-color: #EEE;
+  padding: 3px;
+  border-radius: 3px;
+}