pleroma-fe

commit: a621382a3ff46fa00499c2b2196042cc4d4d9e33
parent: c2c48ec25c076d2d24b75b7ca3db5b6fd060e540
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Thu, 12 Dec 2019 12:23:01 +0000

Merge branch 'load-button-fix' into 'develop'

Fix css runtime loading issue

Closes #734

See merge request pleroma/pleroma-fe!1030
Diffstat:
M
src/App.scss
13
+++++++++++++
M
src/components/timeline/timeline.vue
13
-------------

2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/App.scss b/src/App.scss
@@ -870,3 +870,16 @@ nav {
     transform: rotate(359deg);
   }
 }
+
+.new-status-notification {
+  position:relative;
+  margin-top: -1px;
+  font-size: 1.1em;
+  border-width: 1px 0 0 0;
+  border-style: solid;
+  border-color: var(--border, $fallback--border);
+  padding: 10px;
+  z-index: 1;
+  background-color: $fallback--fg;
+  background-color: var(--panel, $fallback--fg);
+}
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
@@ -93,17 +93,4 @@
     opacity: 1;
   }
 }
-
-.new-status-notification {
-  position:relative;
-  margin-top: -1px;
-  font-size: 1.1em;
-  border-width: 1px 0 0 0;
-  border-style: solid;
-  border-color: var(--border, $fallback--border);
-  padding: 10px;
-  z-index: 1;
-  background-color: $fallback--fg;
-  background-color: var(--panel, $fallback--fg);
-}
 </style>