Merge branch 'master' into moderation

[rails.git] / app / assets / stylesheets / common.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 2410c210adf9eb11c2cee9a575280b2b266428ea..4e89c04c9b6d1924b301338f1f253fd4cab0eb2d 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1664,6 +1664,10 @@ tr.turn:hover {
   display: inline;
 }
 
+.pagination {
+  padding-top: $lineheight;
+}
+
 /* Rules for the diary entry page */
 
 .diary_entry {
@@ -2776,12 +2780,30 @@ input.richtext_title[type="text"] {
     vertical-align: middle;
     background: 40px 40px image-url('about/sprite.png') no-repeat;
 
-    &.local        { background-position: 0px    0px; }
-    &.community    { background-position: 0px  -40px; }
-    &.open         { background-position: 0px  -80px; }
-    &.partners     { background-position: 0px -120px; }
-    &.infringement { background-position: 0px -160px; }
-    &.legal        { background-position: -45px -160px; }
+    &.local {
+      /* no-r2 */
+      background-position: 0px 0px;
+    }
+    &.community {
+      /* no-r2 */
+      background-position: 0px -40px;
+    }
+    &.open {
+      /* no-r2 */
+      background-position: 0px -80px;
+    }
+    &.partners {
+      /* no-r2 */
+      background-position: 0px -120px;
+    }
+    &.infringement {
+      /* no-r2 */
+      background-position: 0px -160px;
+    }
+    &.legal {
+      /* no-r2 */
+      background-position: -45px -160px;
+    }
   }
 }
 
@@ -2817,12 +2839,6 @@ input.richtext_title[type="text"] {
   width:475px;
 }
 
-.new-report-form {
-  border:1px solid #ccc;
-  border-radius:4px;
-  display:block-inline;
-}
-
 .new-report-checkbox{
   float:left;
   margin-left:10px;