about summary refs log tree commit diff
path: root/app/javascript/styles
diff options
context:
space:
mode:
authorOndřej Hruška <ondra@ondrovo.com>2017-07-18 18:58:47 +0200
committerOndřej Hruška <ondra@ondrovo.com>2017-07-18 18:58:47 +0200
commitd69fa9e1f40124279ec9d772e5f54d1e11724e2d (patch)
treeef0462e5fcc8cc7962ef42d80f7dd520a574a7c5 /app/javascript/styles
parentc727eae4412ac9e4f1bafdc68fe89dcd46d602ca (diff)
parent0b4006fc47dcd3d57ffdd0b95c95ad4c40a4918f (diff)
Merge changes from upstream with the CSS reload fix
Diffstat (limited to 'app/javascript/styles')
-rw-r--r--app/javascript/styles/admin.scss45
1 files changed, 43 insertions, 2 deletions
diff --git a/app/javascript/styles/admin.scss b/app/javascript/styles/admin.scss
index 3bc713566..4c3bbdfc5 100644
--- a/app/javascript/styles/admin.scss
+++ b/app/javascript/styles/admin.scss
@@ -253,7 +253,8 @@
   }
 }
 
-.report-status {
+.report-status,
+.account-status {
   display: flex;
   margin-bottom: 10px;
 
@@ -263,7 +264,8 @@
   }
 }
 
-.report-status__actions {
+.report-status__actions,
+.account-status__actions {
   flex: 0 0 auto;
   display: flex;
   flex-direction: column;
@@ -275,3 +277,42 @@
     margin-bottom: 10px;
   }
 }
+
+.batch-form-box {
+  display: flex;
+  margin-bottom: 10px;
+
+  #form_status_batch_action {
+    margin-right: 5px;
+    font-size: 14px;
+  }
+
+  .media-spoiler-toggle-buttons {
+    margin-left: auto;
+
+    .button {
+      overflow: visible;
+    }
+  }
+}
+
+.batch-checkbox,
+.batch-checkbox-all {
+  display: flex;
+  align-items: center;
+  margin-right: 5px;
+}
+
+.back-link {
+  margin-bottom: 10px;
+  font-size: 14px;
+
+  a {
+    color: $classic-highlight-color;
+    text-decoration: none;
+
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+}