Merge tag 'v2.3.3' into fiksgatami-dev

1 files changed, 13 insertions, 4 deletions

diff --git a/web/cobrands/sass/_admin.scss b/web/cobrands/sass/_admin.scss
index 11536882b..0a9789161 100644
--- a/web/cobrands/sass/_admin.scss
+++ b/web/cobrands/sass/_admin.scss
@@ -69,6 +69,10 @@ $button_bg_col: #a1a1a1;  // also search bar (tables)
     }
 }
 
+.js #admin_contacts tr.is-deleted {
+  display: none;
+}
+
 .admin-box { // for delimiting forms, etc
     border:1px solid #999;
     padding:0.5em 1em;
@@ -111,6 +115,11 @@ $button_bg_col: #a1a1a1;  // also search bar (tables)
     margin: 1em 0;
 }
 
+.admin-open311-section {
+    padding-#{$left}: 1em;
+    border-#{$left}: 1px solid #ccc;
+}
+
 .admin-hint {
     font-size: 80%; // little question marks are small
     cursor: pointer;
@@ -156,11 +165,11 @@ $button_bg_col: #a1a1a1;  // also search bar (tables)
 .admin-index-search {
     width: 27em;
     form {
-        clear: left;
+        clear: #{$left};
     }
     select {
         max-width: 65%;
-        float: left;
+        float: #{$left};
     }
 }
 
@@ -198,10 +207,10 @@ $button_bg_col: #a1a1a1;  // also search bar (tables)
     .js-metadata-item-remove {
         position: absolute;
         top: 0.25em;
-        right: 0.25em;
+        #{$right}: 0.25em;
     }
 }
 
 .danger-zone {
-    text-align: right;
+    text-align: #{$right};
 }