From a58b9c3eb1055317b9ad87361e0d42518ec7d4bc Mon Sep 17 00:00:00 2001 From: Eliot Berriot <contact@eliotberriot.com> Date: Sun, 22 Jul 2018 13:39:33 +0200 Subject: [PATCH] Fixed duplicated/wrong scoped CSS --- front/src/App.vue | 32 +++++++++++++++++++++++ front/src/components/library/Library.vue | 33 ------------------------ front/src/views/admin/library/Base.vue | 14 ---------- front/src/views/admin/users/Base.vue | 14 ---------- front/src/views/federation/Base.vue | 13 ---------- 5 files changed, 32 insertions(+), 74 deletions(-) diff --git a/front/src/App.vue b/front/src/App.vue index 382ff78e48..7e02e4f301 100644 --- a/front/src/App.vue +++ b/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; diff --git a/front/src/components/library/Library.vue b/front/src/components/library/Library.vue index 6be7e758b7..d860ab6dc6 100644 --- a/front/src/components/library/Library.vue +++ b/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> diff --git a/front/src/views/admin/library/Base.vue b/front/src/views/admin/library/Base.vue index 08277a24ee..65cd1a667e 100644 --- a/front/src/views/admin/library/Base.vue +++ b/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> diff --git a/front/src/views/admin/users/Base.vue b/front/src/views/admin/users/Base.vue index bbdf443241..7486d02d74 100644 --- a/front/src/views/admin/users/Base.vue +++ b/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> diff --git a/front/src/views/federation/Base.vue b/front/src/views/federation/Base.vue index 908ab7908a..417b3f3f7b 100644 --- a/front/src/views/federation/Base.vue +++ b/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> -- GitLab