MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Fixed duplicated/wrong scoped CSS

See merge request funkwhale/funkwhale!341
This commit is contained in:
Eliot Berriot 2018-07-22 11:44:53 +00:00
parent 1a1572f7de a58b9c3eb1
commit 8a88b4cc0f
5 changed files with 32 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
front/src/App.vue
View File

@ -198,6 +198,38 @@ html, body {
} }
transform: none !important; 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 { .service-messages {
position: fixed; position: fixed;
bottom: 1em; bottom: 1em;

33
front/src/components/library/Library.vue
View File

@ -40,16 +40,6 @@ export default {
<style lang="scss"> <style lang="scss">
@import '../../style/vendor/media'; @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 { .library {
.ui.segment.head { .ui.segment.head {
background-size: cover; 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> </style>

14
front/src/views/admin/library/Base.vue
View File

@ -32,17 +32,3 @@ export default {
} }
} }
</script> </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>

14
front/src/views/admin/users/Base.vue
View File

@ -23,17 +23,3 @@ export default {
} }
} }
</script> </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>

13
front/src/views/federation/Base.vue
View File

@ -50,16 +50,3 @@ export default {
} }
} }
</script> </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>