Merge branch 'fixed-top-bar-2' into 'develop'

Fixed duplicated/wrong scoped CSS

See merge request funkwhale/funkwhale!341

front/src/App.vue

@@ -198,6 +198,38 @@ html, body {
   }
   transform: none !important;
 }
+
+
+.main.pusher > .ui.secondary.menu {
+  margin-left: 0;
+  margin-right: 0;
+  border: none;
+  box-shadow: inset 0px -2px 0px 0px rgba(34, 36, 38, 0.15);
+  .ui.item {
+    border: none;
+    border-bottom-style: none;
+    margin-bottom: 0px;
+    &.active {
+      box-shadow: inset 0px -2px 0px 0px #000;
+    }
+  }
+  @include media(">tablet") {
+    padding: 0 2.5rem;
+  }
+  @include media(">desktop") {
+    position: fixed;
+    left: 350px;
+    right: 0px;
+    top: 0px;
+    z-index: 1;
+  }
+  background-color: white;
+  .item {
+    padding-top: 1.5em;
+    padding-bottom: 1.5em;
+  }
+}
+
 .service-messages {
   position: fixed;
   bottom: 1em;

front/src/components/library/Library.vue

@@ -40,16 +40,6 @@ export default {
 <style lang="scss">
 @import '../../style/vendor/media';
 
-.library.pusher > .ui.secondary.menu {
-  @include media(">tablet") {
-    padding: 0 2.5rem;
-  }
-  .item {
-    padding-top: 1.5em;
-    padding-bottom: 1.5em;
-  }
-}
-
 .library {
   .ui.segment.head {
     background-size: cover;
@@ -77,28 +67,5 @@ export default {
   }
 }
 
-.ui.secondary.pointing.menu {
-  border: none;
-  box-shadow: inset 0px -2px 0px 0px rgba(34, 36, 38, 0.15);
-  .ui.item {
-    border: none;
-    border-bottom-style: none;
-    margin-bottom: 0px;
-    &.active {
-      box-shadow: inset 0px -2px 0px 0px #000;
-    }
-  }
-}
-
-.secondary.pointing.menu {
-  @include media(">desktop") {
-    position: fixed;
-    left: 350px;
-    right: 0px;
-    top: 0px;
-    z-index: 1;
-  }
-  background-color: white;
-}
 
 </style>

front/src/views/admin/library/Base.vue

@@ -32,17 +32,3 @@ export default {
   }
 }
 </script>
-
-<style lang="scss">
-@import '../../../style/vendor/media';
-
-.main.pusher > .ui.secondary.menu {
-  @include media(">tablet") {
-    margin: 0 2.5rem;
-  }
-  .item {
-    padding-top: 1.5em;
-    padding-bottom: 1.5em;
-  }
-}
-</style>

front/src/views/admin/users/Base.vue

@@ -23,17 +23,3 @@ export default {
   }
 }
 </script>
-
-<style lang="scss">
-@import '../../../style/vendor/media';
-
-.main.pusher > .ui.secondary.menu {
-  @include media(">tablet") {
-    margin: 0 2.5rem;
-  }
-  .item {
-    padding-top: 1.5em;
-    padding-bottom: 1.5em;
-  }
-}
-</style>

front/src/views/federation/Base.vue

@@ -50,16 +50,3 @@ export default {
   }
 }
 </script>
-<style lang="scss">
-@import '../../style/vendor/media';
-
-.main.pusher > .ui.secondary.menu {
-  @include media(">tablet") {
-    margin: 0 2.5rem;
-  }
-  .item {
-    padding-top: 1.5em;
-    padding-bottom: 1.5em;
-  }
-}
-</style>