summaryrefslogtreecommitdiffstats
path: root/webapp/sass
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/sass')
-rw-r--r--webapp/sass/layout/_post-right.scss234
-rw-r--r--webapp/sass/responsive/_mobile.scss54
-rw-r--r--webapp/sass/routes/_settings.scss11
3 files changed, 165 insertions, 134 deletions
diff --git a/webapp/sass/layout/_post-right.scss b/webapp/sass/layout/_post-right.scss
index f1fe0cac3..3ee4fe025 100644
--- a/webapp/sass/layout/_post-right.scss
+++ b/webapp/sass/layout/_post-right.scss
@@ -1,156 +1,154 @@
@charset 'UTF-8';
-.app__body {
- .post-right__container {
- @include display-flex;
- @include flex-direction(column);
- height: 100%;
-
- .post-right-root-message {
- padding: 1em 1em 0;
- }
-
- .post-right-comments-container {
- position: relative;
+.post-right__container {
+ @include display-flex;
+ @include flex-direction(column);
+ height: 100%;
- .post {
- &:first-child {
- padding-top: 15px;
- }
- }
- }
+ .post-right-root-message {
+ padding: 1em 1em 0;
+ }
+ .post-right-comments-container {
+ position: relative;
- .help_format_text {
- bottom: -63px;
- right: auto;
+ .post {
+ &:first-child {
+ padding-top: 15px;
+ }
}
+ }
- .post {
- &.post--root {
- border-bottom: 1px solid #ddd;
- padding-bottom: 1em;
- .post__body {
- background: transparent !important;
- }
- }
+ .help_format_text {
+ bottom: -63px;
+ right: auto;
+ }
- .post__header {
- .col__reply {
- background: transparent !important;
- border: none !important;
- text-align: right;
- top: 0;
- }
- }
+ .post {
+ &.post--root {
+ border-bottom: 1px solid #ddd;
+ padding-bottom: 1em;
.post__body {
- width: 100%;
+ background: transparent !important;
}
}
- hr {
- border: none;
- margin-bottom: 0;
+ .post__header {
+ .col__reply {
+ background: transparent !important;
+ border: none !important;
+ text-align: right;
+ top: 0;
+ }
}
- .post-create__container {
+ .post__body {
width: 100%;
+ }
+ }
- .textarea-wrapper {
- min-height: 100px;
- }
-
- .btn {
- margin-bottom: 10px;
- }
+ hr {
+ border: none;
+ margin-bottom: 0;
+ }
- .custom-textarea {
- min-height: 100px;
- }
+ .post-create__container {
+ width: 100%;
- .msg-typing {
- @include opacity(.7);
- display: block;
- float: left;
- font-size: 13px;
- height: 20px;
- line-height: 20px;
- margin-top: 3px;
- max-width: 230px;
- min-width: 1px;
- }
+ .textarea-wrapper {
+ min-height: 100px;
+ }
- .post-create-footer {
- padding: 5px 0 10px;
- width: 100%;
- }
+ .btn {
+ margin-bottom: 10px;
+ }
- .post-right-comments-upload-in-progress {
- color: #a8adb7;
- margin-right: 10px;
- padding: 6px 0;
- }
+ .custom-textarea {
+ min-height: 100px;
}
- }
- .post-right-header {
- border-bottom: $border-gray;
- color: #999;
- font-size: 1em;
- font-weight: 400;
- height: 39px;
- padding: 10px 10px 0 15px;
- text-transform: uppercase;
- }
+ .msg-typing {
+ @include opacity(.7);
+ display: block;
+ float: left;
+ font-size: 13px;
+ height: 20px;
+ line-height: 20px;
+ margin-top: 3px;
+ max-width: 230px;
+ min-width: 1px;
+ }
- .post-right-root-container {
- border-bottom: $border-gray;
- padding: 5px 10px;
+ .post-create-footer {
+ padding: 5px 0 10px;
+ width: 100%;
+ }
- ul {
- margin-bottom: 2px;
- padding-left: 0;
+ .post-right-comments-upload-in-progress {
+ color: #a8adb7;
+ margin-right: 10px;
+ padding: 6px 0;
}
}
+}
- .post-right-channel__name {
- font-weight: 600;
- margin: 0 0 15px;
- }
+.post-right-header {
+ border-bottom: $border-gray;
+ color: #999;
+ font-size: 1em;
+ font-weight: 400;
+ height: 39px;
+ padding: 10px 10px 0 15px;
+ text-transform: uppercase;
+}
- .post-right-root-container li {
- display: inline;
- list-style-type: none;
- padding-right: 3px;
- }
+.post-right-root-container {
+ border-bottom: $border-gray;
+ padding: 5px 10px;
- .post-right-root-time {
- color: #a8adb7;
+ ul {
+ margin-bottom: 2px;
+ padding-left: 0;
}
+}
- .post-right-create-comment-container {
- bottom: 0;
- left: 0;
- margin-bottom: 18px;
- padding: 5px;
- position: absolute;
- width: 100%;
- }
+.post-right-channel__name {
+ font-weight: 600;
+ margin: 0 0 15px;
+}
- .post-right__scroll {
- @include flex(1 1 auto);
- -webkit-overflow-scrolling: touch;
- overflow: auto;
- position: relative;
+.post-right-root-container li {
+ display: inline;
+ list-style-type: none;
+ padding-right: 3px;
+}
- .file-preview__container {
- margin-top: 5px;
- }
- }
+.post-right-root-time {
+ color: #a8adb7;
+}
+
+.post-right-create-comment-container {
+ bottom: 0;
+ left: 0;
+ margin-bottom: 18px;
+ padding: 5px;
+ position: absolute;
+ width: 100%;
+}
- .post-right-comment-time {
- color: #a8adb7;
+.post-right__scroll {
+ -webkit-overflow-scrolling: touch;
+ @include flex(1 1 auto);
+ overflow: auto;
+ position: relative;
+
+ .file-preview__container {
+ margin-top: 5px;
}
}
+
+.post-right-comment-time {
+ color: #a8adb7;
+}
diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss
index 9db962ec1..fcbf23b1c 100644
--- a/webapp/sass/responsive/_mobile.scss
+++ b/webapp/sass/responsive/_mobile.scss
@@ -493,14 +493,6 @@
}
.post-create__container {
- .post-right__container & {
- padding: 0 1em;
-
- .msg-typing {
- display: none;
- }
- }
-
form {
padding: .5em 0;
}
@@ -524,6 +516,7 @@
.post-body__cell {
display: table-cell;
padding-left: 45px;
+
.sidebar--right & {
padding-left: 0;
}
@@ -531,12 +524,12 @@
.app__content & {
.btn-file {
- width: 45px;
- padding: 0;
- line-height: 36px;
bottom: -2px;
left: 0;
+ line-height: 36px;
+ padding: 0;
top: auto;
+ width: 45px;
}
}
@@ -576,6 +569,24 @@
}
}
+ // Since system console is not responsive we're overriding bootstrap styles for it
+ .admin-sidebar {
+ .navbar-nav {
+ margin-top: 0;
+
+ > li {
+ float: left;
+ }
+
+ .dropdown-menu {
+ background: $white;
+ left: auto;
+ position: absolute;
+ right: 0;
+ }
+ }
+ }
+
#navbar {
.navbar-default {
.navbar-header {
@@ -802,6 +813,25 @@
right: 0;
width: 100%;
+ .post-create__container {
+ form {
+ padding: .5em 1em;
+ }
+
+ .msg-typing:empty {
+ display: none;
+ }
+
+ .post-create-footer {
+ padding: 1em 0;
+
+ .control-label {
+ margin: .5em 0;
+ top: 0;
+ }
+ }
+ }
+
.sidebar__collapse,
.sidebar__search-icon {
display: block;
@@ -871,8 +901,8 @@
}
.app__content {
- padding-top: 45px;
margin: 0;
+ padding-top: 45px;
.channel__wrap & {
padding-top: 45px;
diff --git a/webapp/sass/routes/_settings.scss b/webapp/sass/routes/_settings.scss
index 501c20e20..36a1acf76 100644
--- a/webapp/sass/routes/_settings.scss
+++ b/webapp/sass/routes/_settings.scss
@@ -171,6 +171,9 @@
.theme-label {
font-weight: 400;
margin-top: 5px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
img {
@@ -343,7 +346,10 @@
a {
border-radius: 0;
color: $gray;
- padding: 8px 5px 8px 15px;
+ overflow: hidden;
+ padding: 8px 15px;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.icon {
@@ -382,10 +388,7 @@
@include alpha-property(background-color, $black, .1);
border-radius: 0;
font-weight: 400;
- overflow: hidden;
position: relative;
- text-overflow: ellipsis;
- white-space: nowrap;
}
}
}
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-08 12:37:32 +0000