Style changes and scrollerwrap props

This commit is contained in:
Jiiks 2018-01-20 14:51:30 +02:00
parent 9492bb0bc2
commit ff1510dbcc
9 changed files with 100 additions and 55 deletions

View File

@ -1,2 +1,2 @@
<template src="./templates/ScrollerWrap.html"></template>
<script>export default {}</script>
<script>export default { props: ['dark'] }</script>

View File

@ -1,5 +1,3 @@
<div class="bd-scroller-wrap">
<div class="bd-scroller">
<slot/>
</div>
<div class="bd-scroller-wrap" :class="{'bd-dark': dark}">
<slot/>
</div>

View File

@ -6,6 +6,7 @@
/*<= Imports*/
export default {
components
components,
props: ['dark']
}
</script>

View File

@ -1,3 +1,3 @@
<div class="bd-sidebar">
<div class="bd-sidebar bd-scroller">
<slot/>
</div>

View File

@ -1,13 +1,13 @@
<div class="bd-sidebar-view">
<div class="bd-sidebar-region">
<div class="bd-settingsWrap">
<ScrollerWrap>
<ScrollerWrap dark="dark">
<slot name="sidebar"/>
</ScrollerWrap>
</div>
</div>
<div class="bd-content-region">
<ScrollerWrap>
<ScrollerWrap dark="dark">
<slot name="content"/>
</ScrollerWrap>
</div>

View File

@ -1,5 +1,5 @@
<div class="bd-settings" :class="{active: active}">
<SidebarView>
<SidebarView dark="true">
<Sidebar slot="sidebar">
<div class="bd-settings-x" @click="close">
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 12 12"><g fill="none" fill-rule="evenodd"><path d="M0 0h12v12H0"></path><path class="fill" fill="#dcddde" d="M9.5 3.205L8.795 2.5 6 5.295 3.205 2.5l-.705.705L5.295 6 2.5 8.795l.705.705L6 6.705 8.795 9.5l.705-.705L6.705 6"></path></g></svg>

View File

@ -0,0 +1,48 @@
.bd-scroller-wrap {
display: flex;
width: 100%;
.bd-scroller {
display: flex;
flex-grow: 1;
flex-direction: column;
overflow-y: auto;
overflow-x: hidden;
&::-webkit-scrollbar {
width: 14px;
}
&::-webkit-scrollbar-thumb {
background-color: #1e2124;
border-color: #36393e;
}
&::-webkit-scrollbar-thumb,
&::-webkit-scrollbar-track-piece {
background-clip: padding-box;
border-width: 3px;
border-style: solid;
border-radius: 7px;
}
&::-webkit-scrollbar-track-piece {
background-color: #2f3136;
border-color: #36393e;
}
}
&.bd-dark {
.bd-scroller {
&::-webkit-scrollbar-thumb {
background-color: #36393e;
border-color: transparent;
}
&::-webkit-scrollbar-track-piece {
background-color: #2b2e31;
border-color: transparent;
}
}
}
}

View File

@ -3,5 +3,6 @@
@import './animations.scss';
@import './bdsettings.scss';
@import './sidebarview.scss';
@import './generic.scss';
@import './discordoverrides.scss';

View File

@ -26,58 +26,55 @@
flex: 1;
min-height: 1px;
box-sizing: border-box;
padding: 50px 15px 15px 15px;
padding: 80px 15px 15px 15px;
.bd-scroller {
.bd-scroller.bd-sidebar {
width: 100%;
padding-right: 20px;
padding: 0;
.bd-sidebar {
padding: 0;
.bd-header {
padding: 6px 0;
margin-left: 10px;
margin-top: 15px;
color: rgba(255, 255, 255, 0.15);
font-size: 14px;
font-weight: 700;
line-height: 16px;
text-transform: uppercase;
font-weight: 600;
flex-shrink: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-family: Whitney, Helvetica Neue, Helvetica, Arial, sans-serif;
}
.bd-header {
padding: 6px 0;
margin-left: 10px;
margin-top: 15px;
color: rgba(255, 255, 255, 0.15);
font-size: 14px;
font-weight: 700;
line-height: 16px;
text-transform: uppercase;
font-weight: 600;
flex-shrink: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-family: Whitney, Helvetica Neue, Helvetica, Arial, sans-serif;
.bd-item {
border-radius: 3px;
margin-bottom: 2px;
padding-bottom: 6px;
padding-top: 6px;
padding: 6px 10px;
color: $coldimwhite;
cursor: pointer;
font-size: 17px;
line-height: 20px;
position: relative;
flex-shrink: 0;
font-weight: 500;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-family: Whitney, Helvetica Neue, Helvetica, Arial, sans-serif;
&:hover,
&.active {
background: $colbdblue;
}
.bd-item {
border-radius: 3px;
margin-bottom: 2px;
padding-bottom: 6px;
padding-top: 6px;
padding: 6px 10px;
color: $coldimwhite;
cursor: pointer;
font-size: 17px;
line-height: 20px;
position: relative;
flex-shrink: 0;
font-weight: 500;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-family: Whitney, Helvetica Neue, Helvetica, Arial, sans-serif;
&:hover,
&.active {
background: $colbdblue;
}
&.active {
color: #FFF;
}
&.active {
color: #FFF;
}
}
}