summaryrefslogtreecommitdiffstats
path: root/webapp/sass
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/sass')
-rw-r--r--webapp/sass/components/_emoticons.scss9
-rw-r--r--webapp/sass/layout/_headers.scss2
-rw-r--r--webapp/sass/layout/_navigation.scss11
-rw-r--r--webapp/sass/layout/_post-right.scss4
-rw-r--r--webapp/sass/layout/_sidebar-right.scss4
-rw-r--r--webapp/sass/responsive/_tablet.scss3
6 files changed, 9 insertions, 24 deletions
diff --git a/webapp/sass/components/_emoticons.scss b/webapp/sass/components/_emoticons.scss
index ebbd222d9..210c8620b 100644
--- a/webapp/sass/components/_emoticons.scss
+++ b/webapp/sass/components/_emoticons.scss
@@ -143,15 +143,16 @@
}
.emoji-picker {
+ @include user-select(none);
+ border-radius: 3px;
+ border: 1px solid;
display: flex;
flex-direction: column;
- @include user-select(none);
position: absolute;
+ right: 0;
top: -361px;
- right: 0px;
width: 278px;
- border: 1px solid;
- border-radius: 3px;
+ z-index: 8;
.emoji-picker__search-container {
position: relative;
diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss
index e4325c149..cb4512ac1 100644
--- a/webapp/sass/layout/_headers.scss
+++ b/webapp/sass/layout/_headers.scss
@@ -7,7 +7,7 @@
line-height: 56px;
position: relative;
width: 100%;
- z-index: 5;
+ z-index: 9;
.member-popover__trigger,
.pinned-posts-button {
diff --git a/webapp/sass/layout/_navigation.scss b/webapp/sass/layout/_navigation.scss
index 30d5264af..8f0977eba 100644
--- a/webapp/sass/layout/_navigation.scss
+++ b/webapp/sass/layout/_navigation.scss
@@ -41,14 +41,6 @@
width: 43px;
z-index: 5;
- > span {
- > svg {
- position: relative;
- top: 13px;
- vertical-align: top;
- }
- }
-
.icon-bar {
background: $white;
width: 21px;
@@ -57,8 +49,7 @@
.icon-search {
font-size: 17px;
position: relative;
- top: 11px;
- vertical-align: top;
+ top: -2px;
}
.icon--white {
diff --git a/webapp/sass/layout/_post-right.scss b/webapp/sass/layout/_post-right.scss
index 48fc57629..531638ec7 100644
--- a/webapp/sass/layout/_post-right.scss
+++ b/webapp/sass/layout/_post-right.scss
@@ -39,10 +39,6 @@
}
}
- .post__img {
- width: 43px;
- }
-
.post__body {
width: 100%;
}
diff --git a/webapp/sass/layout/_sidebar-right.scss b/webapp/sass/layout/_sidebar-right.scss
index 9a6f2be41..a1698b3a1 100644
--- a/webapp/sass/layout/_sidebar-right.scss
+++ b/webapp/sass/layout/_sidebar-right.scss
@@ -48,10 +48,6 @@
}
}
- .post__img {
- width: 43px;
- }
-
.post__content {
padding: 0 10px 0 0;
}
diff --git a/webapp/sass/responsive/_tablet.scss b/webapp/sass/responsive/_tablet.scss
index 7bf1efe2f..da99cc8e9 100644
--- a/webapp/sass/responsive/_tablet.scss
+++ b/webapp/sass/responsive/_tablet.scss
@@ -105,7 +105,7 @@
right: -1px;
}
- .send-button {
+ .send-button {
display: table-cell;
}
}
@@ -126,6 +126,7 @@
.sidebar--right {
@include single-transition(all, .35s, ease);
@include translateX(100%);
+ z-index: 10;
&.move--left,
&.webrtc--show {