summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass/partials
diff options
context:
space:
mode:
Diffstat (limited to 'web/sass-files/sass/partials')
-rw-r--r--web/sass-files/sass/partials/_base.scss11
-rw-r--r--web/sass-files/sass/partials/_popover.scss41
-rw-r--r--web/sass-files/sass/partials/_post.scss42
-rw-r--r--web/sass-files/sass/partials/_responsive.scss32
-rw-r--r--web/sass-files/sass/partials/_search.scss40
-rw-r--r--web/sass-files/sass/partials/_settings.scss58
-rw-r--r--web/sass-files/sass/partials/_sidebar--left.scss15
-rw-r--r--web/sass-files/sass/partials/_videos.scss8
-rw-r--r--web/sass-files/sass/partials/_webhooks.scss31
9 files changed, 258 insertions, 20 deletions
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index cb5ff67b5..6399b8fd8 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -40,6 +40,7 @@ img {
}
.popover {
+ @include border-radius(3px);
color: #333;
&.bottom, &.right, &.top, &.left {
>.arrow:after {
@@ -93,8 +94,11 @@ a:focus, a:hover {
margin: 0;
}
-.text-danger {
+.text-danger, a.text-danger {
color: #E05F5D;
+ &:hover, &:focus {
+ color: #E05F5D;
+ }
}
.btn {
@@ -111,6 +115,10 @@ a:focus, a:hover {
&:focus {
@include box-shadow(none);
}
+ &.no-padding {
+ line-height: 32px;
+ padding: 0;
+ }
&.no-resize {
resize: none;
}
@@ -118,6 +126,7 @@ a:focus, a:hover {
.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
cursor: auto;
+ background: rgba(#fff, 0.1);
}
.form-group {
diff --git a/web/sass-files/sass/partials/_popover.scss b/web/sass-files/sass/partials/_popover.scss
index 126d239ec..484e63c7c 100644
--- a/web/sass-files/sass/partials/_popover.scss
+++ b/web/sass-files/sass/partials/_popover.scss
@@ -20,3 +20,44 @@
display: block;
}
+.search-help-popover {
+ visibility: hidden;
+ max-width: none;
+ width: 100%;
+ top: 36px;
+ @include single-transition(opacity, 0.3s, ease-in);
+ font-size: em(13px);
+
+ &.bottom > .arrow {
+ top: -18px;
+ border-width: 9px;
+ left: 30px;
+ }
+
+ .popover-content {
+ padding: 3px 13px;
+ }
+
+ h4 {
+ font-size: 1em;
+ }
+
+ ul {
+ padding-left: 17px;
+ span {
+ @include opacity(0.8);
+ }
+ strong, b {
+ @include opacity(1);
+ }
+ }
+
+ .tooltip-inner {
+ max-width: 100%;
+ }
+
+ &.visible {
+ visibility: visible;
+ @include opacity(1);
+ }
+}
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 6ecc0d965..3fac1fed9 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -54,6 +54,7 @@ body.ios {
height: 2em;
margin: 0;
position: relative;
+ z-index: 0;
&:before, &:after {
content: "";
height: 1em;
@@ -116,13 +117,25 @@ body.ios {
left: 0;
width: 100%;
height: 100%;
- background-color: rgba(0, 0, 0, 0.6);
text-align: center;
color: #FFF;
font-size: em(20px);
font-weight: 600;
z-index: 6;
+ .overlay__indent {
+ background-color: rgba(0, 0, 0, 0.6);
+ position: relative;
+ height: 100%;
+ @include clearfix;
+ }
+
+ &.center-file-overlay {
+ .overlay__indent {
+ margin-left: 220px;
+ }
+ }
+
&.right-file-overlay {
font-size: em(18px);
.overlay__circle {
@@ -453,6 +466,22 @@ body.ios {
white-space: nowrap;
cursor: pointer;
}
+ .post-body--code {
+ font-size: .97em;
+ position:relative;
+ .post-body--code__language {
+ position: absolute;
+ right: 0;
+ background: #fff;
+ cursor: default;
+ padding: 0.3em 0.5em 0.1em;
+ border-bottom-left-radius: 4px;
+ @include opacity(.3);
+ }
+ code {
+ white-space: pre;
+ }
+ }
}
.create-reply-form-wrap {
width: 100%;
@@ -556,9 +585,10 @@ body.ios {
}
.bot-indicator {
- background-color: lightgrey;
- border-radius:2px;
- padding-left:2px;
- padding-right:2px;
- font-family:"Courier New"
+ font-family: inherit;
+ font-size: 11px;
+ padding: 2px 4px;
+ border-radius: 2px;
+ font-weight: 600;
+ margin: 0 0 0 -4px;
}
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index c8bb24f3a..2cd5560ef 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -179,6 +179,22 @@
}
@media screen and (max-width: 1140px) {
+ .inner__wrap {
+ &.move--left {
+ .file-overlay {
+ font-size: em(18px);
+ .overlay__circle {
+ width: 300px;
+ height: 300px;
+ margin: -150px 0 0 -150px;
+ }
+ .overlay__files {
+ margin: 60px auto 15px;
+ width: 150px;
+ }
+ }
+ }
+ }
.post {
.post__content {
width: 100%;
@@ -268,6 +284,9 @@
height: auto;
}
}
+ .search-help-popover.visible {
+ visibility: hidden;
+ }
.modal-direct-channels {
.member-count {
float: none;
@@ -277,6 +296,11 @@
}
.file-overlay {
font-size: em(18px);
+ &.center-file-overlay {
+ .overlay__indent {
+ margin-left: 0;
+ }
+ }
.overlay__circle {
width: 300px;
height: 300px;
@@ -380,6 +404,9 @@
text-align: left;
}
}
+ .no-padding--left {
+ padding-left: 15px;
+ }
}
.settings-links {
display: none;
@@ -404,6 +431,11 @@
}
}
.settings-table {
+ .nav {
+ position: relative;
+ top: auto;
+ width: 100%;
+ }
.settings-content {
&.minimize-settings {
padding: 0;
diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss
index 2f15a445f..ce3563885 100644
--- a/web/sass-files/sass/partials/_search.scss
+++ b/web/sass-files/sass/partials/_search.scss
@@ -109,3 +109,43 @@
.search-highlight {
background-color: #FFF2BB;
}
+
+.search-autocomplete {
+ background-color: #fff;
+ border: $border-gray;
+ line-height: 36px;
+ overflow-x: hidden;
+ overflow-y: scroll;
+ position: absolute;
+ text-align: left;
+ width: 100%;
+ z-index: 100;
+ @extend %popover-box-shadow;
+}
+
+.search-autocomplete__channel {
+ cursor: pointer;
+ height: 36px;
+ padding: 0px 6px;
+
+ &.selected {
+ background-color:rgba(51, 51, 51, 0.15);
+ }
+}
+
+.search-autocomplete__user {
+ cursor: pointer;
+ height: 36px;
+ padding: 0px;
+
+ .profile-img {
+ height: 32px;
+ margin-right: 6px;
+ width: 32px;
+ @include border-radius(16px);
+ }
+
+ &.selected {
+ background-color:rgba(51, 51, 51, 0.15);
+ }
+}
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index bc53dc0e4..c881f9073 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -1,5 +1,6 @@
@import "access-history";
@import "activity-log";
+@import "webhooks";
.user-settings {
min-height:300px;
@@ -29,6 +30,9 @@
li {
list-style: none;
}
+ label {
+ font-weight: 600;
+ }
.settings-table {
display: table;
table-layout: fixed;
@@ -37,6 +41,11 @@
display: table-cell;
vertical-align: top;
}
+ .nav {
+ position: fixed;
+ top: 57px;
+ width: 180px;
+ }
.security-links {
margin-right: 20px;
.fa {
@@ -129,10 +138,6 @@
}
}
- .font--small {
- font-size: 13px;
- }
-
.section-describe {
@include opacity(0.7);
white-space:pre;
@@ -161,14 +166,29 @@
.setting-list-item {
margin-top:7px;
- .has-error {
- color: #a94442;
+ }
+ .has-error {
+ color: #a94442;
+ }
+ .no-padding--left {
+ padding-left: 0;
+ }
+ .padding-top {
+ padding-top: 7px;
+ &.x2 {
+ padding-top: 14px;
}
- .padding-top {
- padding-top: 7px;
- &.x2 {
- padding-top: 14px;
- }
+ &.x3 {
+ padding-top: 21px;
+ }
+ }
+ .padding-bottom {
+ padding-bottom: 7px;
+ &.x2 {
+ padding-bottom: 14px;
+ }
+ &.x3 {
+ padding-bottom: 21px;
}
.control-label {
font-weight: 600;
@@ -211,6 +231,22 @@
a {
color: #111;
background-color: #E1E1E1;
+ &:before {
+ content: '';
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 5px;
+ height: 100%;
+ background: #000;
+ }
+ }
+ a, a:hover, a:focus {
+ padding-right: 10px;
+ background-color: rgba(black, 0.1);
+ border-radius: 0;
+ font-weight: 400;
+ position: relative;
}
}
}
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index 585a51f08..ab13d1b42 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -128,12 +128,23 @@
}
}
&.active {
+ a {
+ &:before {
+ content: '';
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 5px;
+ height: 100%;
+ background: #000;
+ }
+ }
a, a:hover, a:focus {
- color: #111;
padding-right: 10px;
- background-color: #e1e1e1;
+ background-color: rgba(black, 0.1);
border-radius: 0;
font-weight: 400;
+ position: relative;
}
}
}
diff --git a/web/sass-files/sass/partials/_videos.scss b/web/sass-files/sass/partials/_videos.scss
index 6ae5b488b..f6999d15c 100644
--- a/web/sass-files/sass/partials/_videos.scss
+++ b/web/sass-files/sass/partials/_videos.scss
@@ -50,3 +50,11 @@
border-bottom:36px solid transparent;
border-left:60px solid rgba(255,255,255,0.4);
}
+
+.gif-div {
+ position:relative;
+ max-width: 450px;
+ max-height: 500px;
+ margin-bottom: 8px;
+ border-radius:5px
+}
diff --git a/web/sass-files/sass/partials/_webhooks.scss b/web/sass-files/sass/partials/_webhooks.scss
new file mode 100644
index 000000000..b801ccf63
--- /dev/null
+++ b/web/sass-files/sass/partials/_webhooks.scss
@@ -0,0 +1,31 @@
+.webhooks__container {
+ background: rgba(black, 0.1);
+ border: 1px solid;
+ @include border-radius(3px);
+ padding: 0 13px 15px;
+ margin-top: 10px;
+}
+.webhook__item {
+ font-size: 13px;
+ position: relative;
+ &:last-child {
+ .divider-light:last-child {
+ display: none;
+ }
+ }
+ .webhook__remove {
+ position: absolute;
+ right: -7px;
+ top: 8px;
+ width: 30px;
+ height: 30px;
+ font-size: 22px;
+ font-weight: bold;
+ text-align: center;
+ text-decoration: none;
+ color: #E05F5D;
+ }
+ .webhook__url {
+ padding-right: 20px;
+ }
+} \ No newline at end of file
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 17:35:47 +0000