set global margin on the main app grid

+ refactor margins and paddings in some components
This commit is contained in:
geoffrey45
2022-08-02 02:43:06 +03:00
parent 8fa0516b56
commit 9e1f73e281
13 changed files with 28 additions and 61 deletions
-1
View File
@@ -4,7 +4,6 @@
.grid { .grid {
background-color: $primary; background-color: $primary;
display: grid;
height: 100%; height: 100%;
padding-right: $small; padding-right: $small;
+19 -13
View File
@@ -1,6 +1,6 @@
@import "../css/ProgressBar.scss"; @import "../css/ProgressBar.scss";
@import "mixins.scss"; @import "mixins.scss";
@import "./moz.scss"; // @import "./moz.scss";
:root { :root {
--separator: #ffffff46; --separator: #ffffff46;
@@ -71,32 +71,37 @@ a {
display: none; display: none;
} }
input[type="search"] {
height: 2.25rem;
}
.l-container { .l-container {
display: grid; display: grid;
grid-template-columns: min-content 1fr min-content; grid-template-columns: min-content 1fr min-content;
grid-template-rows: 3.5rem 1fr 1fr; grid-template-rows: 2.5rem 1fr 4rem;
grid-auto-flow: row;
grid-template-areas: grid-template-areas:
"l-sidebar nav search-input" "l-sidebar nav search-input"
"l-sidebar content r-sidebar" "l-sidebar content r-sidebar"
"l-sidebar content r-sidebar" "l-sidebar content r-sidebar"
"l-sidebar content tabs"; "l-sidebar content tabs";
width: 100%;
align-content: center; align-content: center;
max-width: 2720px; max-width: 2720px;
height: 100vh; height: calc(100vh - 1rem);
margin: 0 auto; margin: 0 auto;
gap: $small; gap: 1rem;
margin: $small;
}
#tabs {
grid-area: tabs;
height: 3.5rem;
} }
#acontent { #acontent {
grid-area: content; grid-area: content;
width: calc(100% + $small);
max-width: 1955px; max-width: 1955px;
overflow: hidden auto; overflow: hidden auto;
margin: 0 auto; margin-top: -$small;
padding-right: $medium;
margin-bottom: $small;
.nav { .nav {
margin: $small; margin: $small;
@@ -124,7 +129,6 @@ a {
width: 17rem; width: 17rem;
grid-area: l-sidebar; grid-area: l-sidebar;
background-color: $black; background-color: $black;
margin: $small;
padding: 1rem; padding: 1rem;
} }
@@ -155,7 +159,8 @@ a {
.r-sidebar { .r-sidebar {
grid-area: r-sidebar; grid-area: r-sidebar;
// border-left: solid 1px $gray3; margin-top: -$small;
width: 29rem;
} }
.image { .image {
@@ -194,7 +199,7 @@ a {
/* Track */ /* Track */
::-webkit-scrollbar-track { ::-webkit-scrollbar-track {
background: rgba(51, 51, 51, 0.459); background: transparent;
border-radius: 1rem; border-radius: 1rem;
} }
@@ -244,6 +249,7 @@ a {
background-position: 0 38%; background-position: 0 38%;
} }
} }
@keyframes similarAlbums { @keyframes similarAlbums {
0% { 0% {
background-position: 0 38%; background-position: 0 38%;
+1 -1
View File
@@ -26,7 +26,7 @@ defineProps<{
gap: $medium; gap: $medium;
border-bottom: 1px solid $gray3; border-bottom: 1px solid $gray3;
padding: 1rem 0; padding: 1rem 0;
padding-top: $small; padding-top: 0;
margin-bottom: 1rem; margin-bottom: 1rem;
} }
</style> </style>
@@ -8,8 +8,6 @@
<style lang="scss"> <style lang="scss">
.r-home { .r-home {
height: calc(100% - 1rem); height: calc(100% - 1rem);
padding: 0 $small $small 0;
margin-top: $small;
} }
</style> </style>
+1 -15
View File
@@ -27,9 +27,7 @@ const tabs = useTabStore();
<style lang="scss"> <style lang="scss">
.r-sidebar { .r-sidebar {
width: 29em;
background-color: rgba(4, 12, 34, 0.103);
padding: 0 $small;
@include phone-only { @include phone-only {
display: none; display: none;
@@ -64,18 +62,6 @@ const tabs = useTabStore();
height: 100%; height: 100%;
} }
} }
.tab-keys {
display: none;
width: 3rem;
right: 0;
height: 100%;
position: absolute;
grid-area: tabs;
border-radius: 0;
overflow: hidden;
border-left: solid 1px $gray;
}
} }
} }
</style> </style>
@@ -36,7 +36,6 @@ function loadMore() {
} }
.grid { .grid {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(8rem, 1fr)); grid-template-columns: repeat(auto-fill, minmax(8rem, 1fr));
flex-wrap: wrap; flex-wrap: wrap;
gap: 0.75rem; gap: 0.75rem;
@@ -35,7 +35,6 @@ function loadMore() {
} }
.grid { .grid {
display: grid;
grid-template-columns: repeat(3, 1fr); grid-template-columns: repeat(3, 1fr);
gap: 0.75rem; gap: 0.75rem;
} }
@@ -36,7 +36,6 @@ function loadMore() {
} }
.grid { .grid {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(8rem, 1fr)); grid-template-columns: repeat(auto-fill, minmax(8rem, 1fr));
flex-wrap: wrap; flex-wrap: wrap;
gap: 0.75rem; gap: 0.75rem;
+1 -2
View File
@@ -32,8 +32,8 @@ function unfocusThis() {
<style lang="scss"> <style lang="scss">
#gsearch-input { #gsearch-input {
padding: $small;
display: flex; display: flex;
margin-bottom: $small;
@include tablet-landscape { @include tablet-landscape {
display: none; display: none;
@@ -46,7 +46,6 @@ function unfocusThis() {
display: flex; display: flex;
gap: $small; gap: $small;
background-color: $gray4; background-color: $gray4;
height: 2.25rem;
.icon { .icon {
width: 2rem; width: 2rem;
+3 -4
View File
@@ -1,5 +1,5 @@
<template> <template>
<div class="tabs"> <div class="tabs" id="tabs">
<div class="cont rounded"> <div class="cont rounded">
<div <div
v-for="tab in tabs.tabs" v-for="tab in tabs.tabs"
@@ -22,8 +22,8 @@ const tabs = useTabStore();
<style lang="scss"> <style lang="scss">
.tabs { .tabs {
padding: $small; grid-area: tabs;
height: 4.25rem; height: 100%;
.cont { .cont {
background-color: $black; background-color: $black;
@@ -58,7 +58,6 @@ const tabs = useTabStore();
.t-item { .t-item {
background-color: transparent; background-color: transparent;
} }
} }
.search { .search {
+2 -17
View File
@@ -16,7 +16,6 @@
<Loader /> <Loader />
</div> </div>
<div class="right"> <div class="right">
<div class="more image"></div>
<Search /> <Search />
</div> </div>
</div> </div>
@@ -78,16 +77,12 @@ watch(
); );
</script> </script>
<!-- !!use nav store to sync the title component!! -->
<style lang="scss"> <style lang="scss">
.topnav { .topnav {
display: grid; display: grid;
grid-template-columns: 1fr min-content max-content; grid-template-columns: 1fr min-content max-content;
padding-bottom: 1rem; // border-bottom: 1px solid $gray3;
margin: $small $small 0 0; // padding-bottom: $small;
border-bottom: 1px solid $gray3;
height: 3rem;
.left { .left {
display: grid; display: grid;
@@ -115,16 +110,6 @@ watch(
width: 100%; width: 100%;
display: flex; display: flex;
gap: $small; gap: $small;
.more {
width: 2.25rem;
aspect-ratio: 1;
height: 100%;
background-color: $gray5;
background-image: url("../../assets/icons/more.svg");
transform: rotate(90deg);
border-radius: $small;
}
} }
} }
</style> </style>
-1
View File
@@ -51,7 +51,6 @@ onBeforeRouteUpdate((to, from) => {
#scrollable { #scrollable {
overflow-y: auto; overflow-y: auto;
height: calc(100% - $small);
scrollbar-color: grey transparent; scrollbar-color: grey transparent;
@include phone-only { @include phone-only {
-1
View File
@@ -25,7 +25,6 @@ const pStore = usePStore();
scrollbar-color: $gray2 transparent; scrollbar-color: $gray2 transparent;
.grid { .grid {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(10rem, 1fr)); grid-template-columns: repeat(auto-fill, minmax(10rem, 1fr));
gap: 1rem; gap: 1rem;
} }