-
+
diff --git a/components/ui/Scroll/Scroll.html b/components/ui/Scroll/Scroll.html
deleted file mode 100644
index 1ad38312d4..0000000000
--- a/components/ui/Scroll/Scroll.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
diff --git a/components/ui/Scroll/Scroll.less b/components/ui/Scroll/Scroll.less
deleted file mode 100644
index 9fd36c6dac..0000000000
--- a/components/ui/Scroll/Scroll.less
+++ /dev/null
@@ -1,15 +0,0 @@
-.scroll-area {
- margin: auto;
- position: relative;
- &:extend(.full-width);
- height: @full;
- white-space: nowrap;
-}
-
-.padded {
- padding: 0 @normal-spacing;
-}
-
-.enable-wrap {
- white-space: normal !important;
-}
diff --git a/components/ui/Scroll/Scroll.vue b/components/ui/Scroll/Scroll.vue
deleted file mode 100644
index 1d19fc7264..0000000000
--- a/components/ui/Scroll/Scroll.vue
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
-
-
-
diff --git a/components/ui/SimpleScroll/SimpleScroll.less b/components/ui/SimpleScroll/SimpleScroll.less
index 5088d7a02d..8c8524f908 100644
--- a/components/ui/SimpleScroll/SimpleScroll.less
+++ b/components/ui/SimpleScroll/SimpleScroll.less
@@ -5,7 +5,8 @@
.wrapper {
pointer-events: auto;
width: @full;
- height: @full;
+ height: fit-content;
+ height: -moz-fit-content;
margin: auto;
position: relative;
white-space: normal;
diff --git a/components/ui/VerticalRule/VerticalRule.vue b/components/ui/VerticalRule/VerticalRule.vue
index 685199b35c..d1ad37d208 100644
--- a/components/ui/VerticalRule/VerticalRule.vue
+++ b/components/ui/VerticalRule/VerticalRule.vue
@@ -1,6 +1,6 @@
-
-
+
diff --git a/components/views/marketplace/Marketplace.html b/components/views/marketplace/Marketplace.html
index e409e86b50..9c1fc22057 100644
--- a/components/views/marketplace/Marketplace.html
+++ b/components/views/marketplace/Marketplace.html
@@ -45,16 +45,11 @@
-
+
-
+
diff --git a/components/views/navigation/mobile/sidebar/sidebar.vue b/components/views/navigation/mobile/sidebar/sidebar.vue
index aadd481b2f..8b8ecb039d 100644
--- a/components/views/navigation/mobile/sidebar/sidebar.vue
+++ b/components/views/navigation/mobile/sidebar/sidebar.vue
@@ -95,7 +95,11 @@
v-scroll-lock="true"
class="scrolling hidden-scroll users"
>
-
+
-
+
diff --git a/components/views/navigation/slimbar/Slimbar.less b/components/views/navigation/slimbar/Slimbar.less
index 3ccfa06cca..4c52a58590 100644
--- a/components/views/navigation/slimbar/Slimbar.less
+++ b/components/views/navigation/slimbar/Slimbar.less
@@ -2,13 +2,11 @@
height: @full;
width: @slimbar-size;
min-width: @slimbar-size;
- display: inline-flex;
+ display: flex;
+ flex-direction: column;
justify-content: flex-start;
pointer-events: none;
- padding-left: 0.6rem;
- padding-top: @normal-spacing;
-
- &:extend(.first-layer);
+ box-sizing: border-box;
.circle-group {
margin: @normal-spacing 0;
@@ -27,16 +25,15 @@
margin-bottom: unset;
}
- .servers {
- .circle {
- margin: 0.25rem 0;
- }
+ .circle {
+ margin: @xlight-spacing 0;
+ &:extend(.first-layer);
}
.unreads {
position: relative;
.unread {
- margin: 0.5rem 0;
+ padding: @xlight-spacing 0;
}
}
@@ -47,16 +44,21 @@
&:extend(.first-layer);
}
- .scroll-area {
- height: auto;
- max-height: calc(@full - 10rem);
- width: 200px;
- overflow: hidden;
+ #list-container-vertical {
display: flex;
+ flex-direction: column;
+ height: @full;
+ pointer-events: auto;
+ box-sizing: border-box;
+ padding-left: @light-spacing;
+ padding-top: @normal-spacing;
+
+ #simple-scrollbar {
+ height: auto;
+ }
}
#list-container {
height: fit-content;
- max-height: calc(@full - 10rem);
position: relative;
pointer-events: auto;
}
@@ -70,6 +72,10 @@
justify-content: center;
text-align: center;
}
+
+ .horizontal-rule-padding {
+ margin-right: @scroll-bar-size * 2;
+ }
}
#servers-horizontal-list {
@@ -88,6 +94,10 @@
margin-bottom: unset;
}
+ .circle {
+ margin: 0 @light-spacing;
+ }
+
.servers {
&::-webkit-scrollbar {
display: none;
@@ -97,7 +107,6 @@
align-items: center;
}
.circle {
- margin: 0 @light-spacing;
position: relative;
}
display: inline-flex;
diff --git a/components/views/settings/modal/Modal.html b/components/views/settings/modal/Modal.html
index 5500a3de61..2a575e5cd2 100644
--- a/components/views/settings/modal/Modal.html
+++ b/components/views/settings/modal/Modal.html
@@ -16,10 +16,10 @@
diff --git a/components/views/settings/modal/Modal.less b/components/views/settings/modal/Modal.less
index f4223fa95b..d9f18c4a19 100644
--- a/components/views/settings/modal/Modal.less
+++ b/components/views/settings/modal/Modal.less
@@ -56,6 +56,20 @@ p {
width: 100%;
box-sizing: border-box;
&:extend(.background-semitransparent-dark);
+
+ #simple-scrollbar.modal-container {
+ width: calc(@full - @sidebar-size);
+ height: @full;
+ padding: @xlarge-spacing;
+ box-sizing: border-box;
+ }
+
+ @media only screen and (max-width: @mobile-breakpoint) {
+ #simple-scrollbar.modal-container {
+ width: @full;
+ padding-bottom: @mobile-nav-size;
+ }
+ }
}
}
diff --git a/components/views/settings/pages/info/index.vue b/components/views/settings/pages/info/index.vue
index 0e50c0092c..7f288d6b91 100644
--- a/components/views/settings/pages/info/index.vue
+++ b/components/views/settings/pages/info/index.vue
@@ -39,3 +39,13 @@ export default Vue.extend({
},
})
+
diff --git a/package.json b/package.json
index e270c75f74..f07ccb8e24 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,6 @@
"v-scroll-lock": "^1.3.1",
"vue-awesome-swiper": "^4.1.1",
"vue-croppie": "^2.0.2",
- "vue-custom-scrollbar": "^1.4.3",
"vue-emoji-picker": "git+https://git@github.com/Satellite-im/vue-emoji-picker#build-satellite",
"vue-markdown": "^2.2.4",
"vue-multiselect": "^2.1.6",