summaryrefslogtreecommitdiffstats
path: root/web/sass-files
diff options
context:
space:
mode:
Diffstat (limited to 'web/sass-files')
-rw-r--r--web/sass-files/sass/partials/_admin-console.scss9
-rw-r--r--web/sass-files/sass/partials/_base.scss11
-rw-r--r--web/sass-files/sass/partials/_command-box.scss1
-rw-r--r--web/sass-files/sass/partials/_files.scss1
-rw-r--r--web/sass-files/sass/partials/_markdown.scss1
-rw-r--r--web/sass-files/sass/partials/_modal.scss50
-rw-r--r--web/sass-files/sass/partials/_post_right.scss7
-rw-r--r--web/sass-files/sass/partials/_responsive.scss12
-rw-r--r--web/sass-files/sass/partials/_search.scss2
-rw-r--r--web/sass-files/sass/partials/_settings.scss7
-rw-r--r--web/sass-files/sass/partials/_sidebar--left.scss5
-rw-r--r--web/sass-files/sass/partials/_videos.scss7
12 files changed, 87 insertions, 26 deletions
diff --git a/web/sass-files/sass/partials/_admin-console.scss b/web/sass-files/sass/partials/_admin-console.scss
index 4b4fc1664..14f1d9c2f 100644
--- a/web/sass-files/sass/partials/_admin-console.scss
+++ b/web/sass-files/sass/partials/_admin-console.scss
@@ -15,12 +15,11 @@
.nav {
li {
padding: 0;
+ @include opacity(1);
.icon {
width: 17px;
}
> a {
- padding: 9px 15px;
- display: block;
&:hover, &.active, &:focus {
background-color: #EAEAEA;
}
@@ -117,8 +116,10 @@
.form-group {
margin-bottom: 25px;
}
- ul, ol {
- padding-left: 23px;
+ .help-text {
+ ul, ol {
+ padding-left: 23px;
+ }
}
.help-text {
margin: 10px 0 0 15px;
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index 44a474213..cb5ff67b5 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -39,10 +39,6 @@ img {
height: auto;
}
-.input-group-addon {
- background: transparent;
-}
-
.popover {
color: #333;
&.bottom, &.right, &.top, &.left {
@@ -53,6 +49,9 @@ img {
.popover-title {
background: rgba(black, 0.05);
}
+ .popover-content {
+ white-space: pre-wrap;
+ }
}
.dropdown-menu {
@@ -182,6 +181,10 @@ a:focus, a:hover {
background-color: white !important;
}
+.alert {
+ padding: 8px 12px;
+}
+
.emoji {
width: 1.5em;
height: 1.5em;
diff --git a/web/sass-files/sass/partials/_command-box.scss b/web/sass-files/sass/partials/_command-box.scss
index f1aa4dca2..184fb55eb 100644
--- a/web/sass-files/sass/partials/_command-box.scss
+++ b/web/sass-files/sass/partials/_command-box.scss
@@ -5,6 +5,7 @@
border: $border-gray;
bottom: 38px;
overflow: auto;
+ z-index: 100;
@extend %popover-box-shadow;
.sidebar--right & {
bottom: 100px;
diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss
index 6dbb82810..01057423d 100644
--- a/web/sass-files/sass/partials/_files.scss
+++ b/web/sass-files/sass/partials/_files.scss
@@ -194,6 +194,7 @@
vertical-align: top;
.file-details__name {
+ color: #333;
font-size: 16px;
}
.file-details__info {
diff --git a/web/sass-files/sass/partials/_markdown.scss b/web/sass-files/sass/partials/_markdown.scss
index 1aa942ad0..70c99f504 100644
--- a/web/sass-files/sass/partials/_markdown.scss
+++ b/web/sass-files/sass/partials/_markdown.scss
@@ -1,5 +1,6 @@
.markdown__heading {
font-weight: 700;
+ line-height: 1.5;
}
.markdown__paragraph-inline {
display: inline;
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 90ea8ce2c..0e474a1e2 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -140,7 +140,7 @@
padding: 0;
}
}
- .more-channel-table {
+ .more-table {
margin: 0;
table-layout: fixed;
p {
@@ -150,9 +150,11 @@
@include opacity(0.8);
margin: 5px 0;
}
- .more-channel-name {
+ .more-name {
font-weight: 600;
font-size: 0.95em;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
tbody {
> tr {
@@ -175,6 +177,9 @@
padding: 8px 15px 8px 8px;
width: 80px;
vertical-align: middle;
+ &.lg {
+ width: 110px;
+ }
}
}
}
@@ -329,3 +334,44 @@
}
}
}
+
+.modal-direct-channels {
+
+ .user-list {
+ margin-top: 20px;
+ overflow: auto;
+ -webkit-overflow-scrolling: touch;
+ max-height: 500px;
+ position: relative;
+ }
+
+ .table {
+ margin-top: 10px;
+ }
+
+ .modal-body {
+ padding: 20px 0 0;
+ @include clearfix;
+ }
+
+ .filter-row {
+ padding: 0 15px;
+ }
+
+ .member-count {
+ margin-top: 5px;
+ float: right;
+ @include opacity(0.8);
+ }
+
+ .more-description {
+ @include opacity(0.7);
+ }
+
+ .profile-img {
+ -moz-border-radius: 50px;
+ -webkit-border-radius: 50px;
+ border-radius: 50px;
+ margin-right: 8px;
+ }
+}
diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss
index e4860b286..91f9355de 100644
--- a/web/sass-files/sass/partials/_post_right.scss
+++ b/web/sass-files/sass/partials/_post_right.scss
@@ -36,6 +36,11 @@
.post-create-footer {
padding-top: 10px;
}
+ .post-right-comments-upload-in-progress {
+ padding: 6px 0;
+ color: #a8adb7;
+ margin-right: 10px;
+ }
}
}
@@ -88,6 +93,8 @@
.post-right__scroll {
position: relative;
+ overflow: scroll;
+ -webkit-overflow-scrolling: touch;
}
.post-right-comment-time {
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index dbe6029ec..c41199cac 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -270,6 +270,13 @@
height: auto;
}
}
+ .modal-direct-channels {
+ .member-count {
+ float: none;
+ margin-top: 10px;
+ display: block;
+ }
+ }
.center-file-overlay {
font-size: 1.3em;
}
@@ -586,11 +593,14 @@
&.move--right {
@include translate3d(0, 0, 0);
}
+ .nav-pills__unread-indicator-bottom {
+ bottom: 10px;
+ }
.badge {
top: 13px;
}
> div {
- padding-bottom: 105px;
+ padding-bottom: 65px;
}
.team__header {
display: none;
diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss
index 2de1b5380..2f15a445f 100644
--- a/web/sass-files/sass/partials/_search.scss
+++ b/web/sass-files/sass/partials/_search.scss
@@ -68,6 +68,8 @@
.search-items-container {
position: relative;
+ overflow: scroll;
+ -webkit-overflow-scrolling: touch;
}
.search-results-header {
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index 0c2f25eab..3146c16d5 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -230,13 +230,6 @@
font-weight:500;
}
-.profile-img {
- width:128px;
- height:128px;
- margin-bottom: 10px;
- @include border-radius(128px);
-}
-
.sel-btn {
margin-right:5px;
}
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index 24aaef059..585a51f08 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -47,7 +47,8 @@
.nav-pills__container {
height: 100%;
position: relative;
- overflow: auto;
+ overflow: scroll;
+ -webkit-overflow-scrolling: touch;
}
.nav-pills__unread-indicator {
@@ -69,7 +70,7 @@
top: 66px;
}
.nav-pills__unread-indicator-bottom {
- bottom: 10px;
+ bottom: 20px;
}
.nav {
diff --git a/web/sass-files/sass/partials/_videos.scss b/web/sass-files/sass/partials/_videos.scss
index 9e1ce29b7..6ae5b488b 100644
--- a/web/sass-files/sass/partials/_videos.scss
+++ b/web/sass-files/sass/partials/_videos.scss
@@ -26,11 +26,6 @@
padding:0px;
}
-.video-uploader {
- font-size: 13px;
- margin: 0 0 15px;
-}
-
.video-title {
font-size:15px;
margin-top:3px;
@@ -54,4 +49,4 @@
border-top:36px solid transparent;
border-bottom:36px solid transparent;
border-left:60px solid rgba(255,255,255,0.4);
-} \ No newline at end of file
+}
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 10:10:09 +0000