[bug 991291] Fix css files

We had bits of css in a bunch of places it shouldn't have been. This moves things around so they're easier to find since they're in places related to the things that use them.
mozilla · May 22, 2014 · 2555f55 · 2555f55
1 parent 2eda162
commit 2555f55
Show file tree

Hide file tree

Showing 6 changed files with 119 additions and 111 deletions.
diff --git a/fjord/base/static/css/dashboard.less → fjord/analytics/static/css/dashboard.less b/fjord/base/static/css/dashboard.less → fjord/analytics/static/css/dashboard.less
@@ -1,3 +1,81 @@
+.block.count {
+  font-weight: bold;
+
+  strong, em {
+    &:not(:first-child) {
+      margin-left: 1em;
+    }
+  }
+  strong {
+    font-size: 3em;
+    display: block;
+  }
+  em {
+    font-size: 1.75em;
+    font-style: normal;
+  }
+}
+
+.block.feedback {
+  ul {
+    padding: 0;
+  }
+
+  .opinion {
+    @opinion_border: 1px dotted #B6BCC0;
+    border-top: @opinion_border;
+    display: block;
+    list-style: none;
+    padding: 10px 40px;
+    position: relative;
+
+    &:last-child {
+      border-bottom: @opinion_border;
+    }
+
+    .sprite {
+      position: absolute;
+      top: 15px;
+      left: 5px;
+    }
+
+    p {
+      margin: 0 0 3px 0;
+      font-size: 14px;
+      line-height: 18px;
+      word-wrap: break-word;
+      word-break: normal;
+      white-space: normal;
+    }
+
+    ul.meta {
+      padding: 0;
+
+      li {
+        display: inline;
+        font-size: 11px;
+        color: #888;
+
+        &:not(:first-child):before {
+          content: "•";
+          padding-right: 0.5em;
+        }
+      }
+    }
+  }
+
+  #feedback_search {
+    position: absolute;
+    top: 15px;
+    right: 15px;
+
+    .search_box {
+      background: url('../img/search.png') no-repeat scroll 4px center transparent;
+      padding-left: 16px;
+    }
+  }
+}
+
 .filter {
   padding: 15px 0;
 
@@ -258,6 +336,13 @@ ul.bars {
   }
 }
 
+#whentext {
+  margin-top: 5px;
+  input[type=date] {
+    width: 75px;
+  }
+}
+
 #permalink {
   margin: 0px 0px 15px 0px;
 
@@ -347,3 +432,15 @@ ul.bars {
     }
   }
 }
+
+.sprite {
+  background: url("../img/sprites.png") no-repeat scroll 0 0 transparent;
+  font-size: 0;
+  width: 24px;
+  height: 24px;
+  display: inline-block;
+  vertical-align: top;
+
+  &.sad { background-position: 0 0; }
+  &.happy { background-position: 0 -30px; }
+}
diff --git a/fjord/feedback/static/img/sprites.png → fjord/analytics/static/img/sprites.png b/fjord/feedback/static/img/sprites.png → fjord/analytics/static/img/sprites.png
diff --git a/fjord/base/static/css/fjord.less b/fjord/base/static/css/fjord.less
@@ -253,78 +253,6 @@ header {
   }
 }
 
-.block.monitor {
-  .notification-box {
-    margin: 1em;
-    padding: 1em;
-  }
-  .info {
-    border: 2px solid green;
-  }
-  .error {
-    border: 3px solid red;
-  }
-}
-
-.block.feedback {
-  ul {
-    padding: 0;
-  }
-
-  .opinion {
-    @opinion_border: 1px dotted #B6BCC0;
-    border-top: @opinion_border;
-    display: block;
-    list-style: none;
-    padding: 10px 40px;
-    position: relative;
-
-    &:last-child {
-      border-bottom: @opinion_border;
-    }
-
-    .sprite {
-      position: absolute;
-      top: 15px;
-      left: 5px;
-    }
-
-    p {
-      margin: 0 0 3px 0;
-      font-size: 14px;
-      line-height: 18px;
-      word-wrap: break-word;
-      word-break: normal;
-      white-space: normal;
-    }
-
-    ul.meta {
-      padding: 0;
-
-      li {
-        display: inline;
-        font-size: 11px;
-        color: #888;
-
-        &:not(:first-child):before {
-          content: "•";
-          padding-right: 0.5em;
-        }
-      }
-    }
-  }
-
-  #feedback_search {
-    position: absolute;
-    top: 15px;
-    right: 15px;
-
-    .search_box {
-      background: url('../img/search.png') no-repeat scroll 4px center transparent;
-      padding-left: 16px;
-    }
-  }
-}
 .block.feedback.uc {
     background: #fff url(../img/uc.png) 101% 0 no-repeat;
     width: 100%;
@@ -367,24 +295,6 @@ header {
     }
 }
 
-.block.count {
-  font-weight: bold;
-
-  strong, em {
-    &:not(:first-child) {
-      margin-left: 1em;
-    }
-  }
-  strong {
-    font-size: 3em;
-    display: block;
-  }
-  em {
-    font-size: 1.75em;
-    font-style: normal;
-  }
-}
-
 .pager {
   min-height: 16px;
   padding-top: 4px;
@@ -406,20 +316,6 @@ header {
   }
 }
 
-// Sprites
-
-.sprite {
-  background: url("../img/sprites.png") no-repeat scroll 0 0 transparent;
-  font-size: 0;
-  width: 24px;
-  height: 24px;
-  display: inline-block;
-  vertical-align: top;
-
-  &.sad { background-position: 0 0; }
-  &.happy { background-position: 0 -30px; }
-}
-
 // Footer formatting
 .html-rtl #footer-contents {
   text-align: right;
@@ -517,10 +413,3 @@ a.button {
     left: 0.5px;
   }
 }
-
-#whentext {
-  margin-top: 5px;
-  input[type=date] {
-    width: 75px;
-  }
-}
diff --git a/fjord/base/static/css/monitor.less b/fjord/base/static/css/monitor.less
@@ -0,0 +1,12 @@
+.block.monitor {
+  .notification-box {
+    margin: 1em;
+    padding: 1em;
+  }
+  .info {
+    border: 2px solid green;
+  }
+  .error {
+    border: 3px solid red;
+  }
+}
diff --git a/fjord/base/templates/services/monitor.html b/fjord/base/templates/services/monitor.html
@@ -1,5 +1,9 @@
 {% extends 'base.html' %}
 
+{% block site_css %}
+  {{ css('monitor') }}
+{% endblock %}
+
 {% block page_title %}{{ _('Input Services Monitor') }}{% endblock %}
 
 {% macro status(b) %}

diff --git a/fjord/settings/base.py b/fjord/settings/base.py
@@ -250,6 +250,12 @@
             'css/fjord.less',
             'css/dashboard.less',
         ),
+        'monitor': (
+            'css/ui-lightness/jquery-ui.css',
+            'css/lib/normalize.css',
+            'css/fjord.less',
+            'css/monitor.less',
+        ),
         'stage': (
             'css/stage.less',
         ),