summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webapp/components/admin_console/user_item.jsx2
-rw-r--r--webapp/sass/components/_modal.scss4
-rw-r--r--webapp/sass/components/_webrtc.scss9
-rw-r--r--webapp/sass/layout/_post-right.scss2
-rw-r--r--webapp/sass/layout/_post.scss1
-rw-r--r--webapp/sass/responsive/_mobile.scss9
6 files changed, 24 insertions, 3 deletions
diff --git a/webapp/components/admin_console/user_item.jsx b/webapp/components/admin_console/user_item.jsx
index 1e6f523b3..ac548afe0 100644
--- a/webapp/components/admin_console/user_item.jsx
+++ b/webapp/components/admin_console/user_item.jsx
@@ -551,6 +551,7 @@ export default class UserItem extends React.Component {
{authServiceText}
{mfaActiveText}
</div>
+ {serverError}
</div>
<div className='more-modal__actions'>
<div className='dropdown member-drop'>
@@ -580,7 +581,6 @@ export default class UserItem extends React.Component {
</div>
</div>
{makeDemoteModal}
- {serverError}
</div>
);
}
diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss
index 737a8f98f..e4d2b9da7 100644
--- a/webapp/sass/components/_modal.scss
+++ b/webapp/sass/components/_modal.scss
@@ -24,6 +24,10 @@
min-height: 8em;
}
+ .suggestion-list {
+ bottom: -149px;
+ }
+
.suggestion-list__content {
max-height: 150px;
}
diff --git a/webapp/sass/components/_webrtc.scss b/webapp/sass/components/_webrtc.scss
index b8fc64442..b925d0d0f 100644
--- a/webapp/sass/components/_webrtc.scss
+++ b/webapp/sass/components/_webrtc.scss
@@ -20,7 +20,7 @@
.webrtc__notification--rhs {
background: $button--ready;
border-radius: 3px 0 0 3px;
- bottom: 10px;
+ bottom: -5px;
color: $white;
cursor: pointer;
padding: 10px 15px;
@@ -41,6 +41,13 @@
padding: 0 20px;
text-align: center;
+ .form-group {
+ padding: 0 20px;
+ position: relative;
+ text-align: center;
+ z-index: 9999;
+ }
+
.control-label {
@include border-radius(3px);
background: #f2f2f2;
diff --git a/webapp/sass/layout/_post-right.scss b/webapp/sass/layout/_post-right.scss
index 9ca9149fa..15e9c2d9d 100644
--- a/webapp/sass/layout/_post-right.scss
+++ b/webapp/sass/layout/_post-right.scss
@@ -82,7 +82,7 @@
}
.post-create-footer {
- padding: 5px 0 10px;
+ padding: 5px 0 30px;
width: 100%;
}
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss
index 41033a67c..680c05f84 100644
--- a/webapp/sass/layout/_post.scss
+++ b/webapp/sass/layout/_post.scss
@@ -964,6 +964,7 @@ body.ios {
ul,
ol {
+ font-size: .97em;
margin-bottom: .4em;
padding-left: 20px;
diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss
index c55713058..1715d2b40 100644
--- a/webapp/sass/responsive/_mobile.scss
+++ b/webapp/sass/responsive/_mobile.scss
@@ -1,6 +1,15 @@
@charset 'UTF-8';
@media screen and (max-width: 768px) {
+ .app__body {
+ .edit-modal-body {
+
+ .custom-textarea {
+ max-height: 30vh;
+ }
+ }
+ }
+
.tutorial-steps__container {
.tutorial__content {
.tutorial__steps {