summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass
diff options
context:
space:
mode:
Diffstat (limited to 'web/sass-files/sass')
-rw-r--r--web/sass-files/sass/partials/_base.scss2
-rw-r--r--web/sass-files/sass/partials/_content.scss6
-rw-r--r--web/sass-files/sass/partials/_error-bar.scss1
-rw-r--r--web/sass-files/sass/partials/_files.scss2
-rw-r--r--web/sass-files/sass/partials/_get-link.scss2
-rw-r--r--web/sass-files/sass/partials/_headers.scss3
-rw-r--r--web/sass-files/sass/partials/_modal.scss6
-rw-r--r--web/sass-files/sass/partials/_post.scss59
-rw-r--r--web/sass-files/sass/partials/_post_right.scss8
-rw-r--r--web/sass-files/sass/partials/_print.scssbin0 -> 3604 bytes
-rw-r--r--web/sass-files/sass/partials/_responsive.scss20
-rw-r--r--web/sass-files/sass/partials/_search.scss14
-rw-r--r--web/sass-files/sass/partials/_settings.scss37
-rw-r--r--web/sass-files/sass/partials/_sidebar--left.scss2
-rw-r--r--web/sass-files/sass/styles.scss3
15 files changed, 121 insertions, 44 deletions
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index 926c289e6..61ad186e0 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -145,6 +145,7 @@ select {
.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
cursor: auto;
background: rgba(#fff, 0.1);
+ color: inherit;
}
.form-group {
@@ -210,6 +211,7 @@ select {
.alert {
padding: 8px 12px;
+ @include border-radius(2px);
}
.emoji {
diff --git a/web/sass-files/sass/partials/_content.scss b/web/sass-files/sass/partials/_content.scss
index 166995632..da75bc61b 100644
--- a/web/sass-files/sass/partials/_content.scss
+++ b/web/sass-files/sass/partials/_content.scss
@@ -36,9 +36,13 @@
#archive-link-home {
@include flex(0 0 auto);
cursor: pointer;
- padding: 10px;
+ padding: 10px 20px;
font-size: 13px;
+ .fa {
+ @include opacity(0.7);
+ }
+
a {
color: inherit;
}
diff --git a/web/sass-files/sass/partials/_error-bar.scss b/web/sass-files/sass/partials/_error-bar.scss
index 249bbeaa5..0bfcbe0be 100644
--- a/web/sass-files/sass/partials/_error-bar.scss
+++ b/web/sass-files/sass/partials/_error-bar.scss
@@ -19,6 +19,7 @@
font-weight: 600;
text-decoration: none;
padding: 0 10px;
+ font-family: 'Open Sans', sans-serif;
&:hover {
color: #FFF;
text-decoration: none;
diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss
index aeb04e931..2c341f61e 100644
--- a/web/sass-files/sass/partials/_files.scss
+++ b/web/sass-files/sass/partials/_files.scss
@@ -2,7 +2,7 @@
.preview-container {
position: relative;
- margin-top: 25px;
+ margin: 1px 0 10px;
width: 100%;
max-height: 100px;
height: 100px;
diff --git a/web/sass-files/sass/partials/_get-link.scss b/web/sass-files/sass/partials/_get-link.scss
index 8910ff115..d4365d1e6 100644
--- a/web/sass-files/sass/partials/_get-link.scss
+++ b/web/sass-files/sass/partials/_get-link.scss
@@ -4,5 +4,5 @@
display: inline-block;
float: left;
padding: 4px 10px;
- margin: 3px 0 0 10px;
+ margin: 1px 0 0 10px;
} \ No newline at end of file
diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss
index f8c7a65af..e73680b38 100644
--- a/web/sass-files/sass/partials/_headers.scss
+++ b/web/sass-files/sass/partials/_headers.scss
@@ -218,7 +218,7 @@
font-size: 14px;
line-height: 56px;
#member_popover {
- width: 45px;
+ width: 50px;
color: #999;
cursor: pointer;
.fa {
@@ -293,6 +293,7 @@
}
.channel-header__links {
+ font-family: 'Open Sans', sans-serif;
height: 30px;
width: 24px;
line-height: 26px;
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 08d1d8a75..a082ffb22 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -35,6 +35,9 @@
text-align: right;
padding-right: 0;
}
+ .team-member-list {
+ width: 100%;
+ }
.remove__member {
float: right;
color: #999;
@@ -95,6 +98,7 @@
background: rgba(0, 0, 0, 0.1);
}
span {
+ font-family: 'Open Sans', sans-serif;
line-height: 10px;
}
}
@@ -182,6 +186,7 @@
padding: 8px 15px 8px 8px;
width: 80px;
vertical-align: middle;
+ position: relative;
&.lg {
width: 110px;
}
@@ -389,7 +394,6 @@
.modal-body {
padding: 10px 0 20px;
- @include clearfix;
}
.filter-row {
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 3b7184550..3ec1c4434 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -319,13 +319,11 @@ body.ios {
@include clearfix;
padding: 3px 0 0 0;
font-size: 13px;
- .has-error {
- .control-label {
- height: 0;
- display: block;
- font-weight: normal;
- margin-bottom: 0;
- }
+ .control-label {
+ font-weight: normal;
+ margin-bottom: 0;
+ top: -5px;
+ position: relative;
}
.msg-typing {
min-height: 25px;
@@ -369,12 +367,8 @@ body.ios {
}
}
- &.post--highlight {
- background-color: beige;
- }
-
- &.post--system .post__header .col__name {
- display: none;
+ &.post--highlight {
+ background-color: beige;
}
ul {
@@ -551,7 +545,23 @@ body.ios {
position: absolute;
right: 0;
top: 30px;
- width: 60px;
+ width: 65px;
+ }
+
+ .permalink-popover {
+ min-width: 0;
+
+ .popover-content {
+ padding: 5px;
+ }
+
+ .form-control, .btn {
+ font-size: 13px;
+ height: 30px;
+ padding: 0 8px;
+ line-height: 30px;
+ }
+
}
}
@@ -569,6 +579,8 @@ body.ios {
.dropdown {
display: inline-block;
visibility: hidden;
+ position: absolute;
+ right: 0;
top: -1px;
.dropdown-menu {
@@ -602,17 +614,20 @@ body.ios {
word-wrap: break-word;
padding: 0.2em 0.5em 0em;
@include legacy-pie-clearfix;
- width: calc(100% - 70px);
+ width: calc(100% - 75px);
img {
- max-height: 400px;
- }
+ max-height: 400px;
+ }
ul {
padding: 5px 0 0 20px;
}
ul, ol {
+ p {
+ margin-bottom: 0;
+ }
li ul, li ol {
padding: 0 0 0 20px
}
@@ -679,11 +694,11 @@ body.ios {
color: #999;
}
- .permalink-icon {
+ .permalink-icon {
display: inline-block;
color: $primary-color;
visibility: hidden;
- }
+ }
.comment-icon__container {
fill: $primary-color;
@@ -828,10 +843,10 @@ body.ios {
}
.permalink-text {
- overflow: hidden;
+ overflow: hidden;
}
.permalink-popover {
- min-width: 320px;
- margin-left: 50px !important;
+ min-width: 320px;
+ margin-left: 50px !important;
}
diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss
index 4f04a266b..fa52e2972 100644
--- a/web/sass-files/sass/partials/_post_right.scss
+++ b/web/sass-files/sass/partials/_post_right.scss
@@ -44,6 +44,9 @@
.textarea-wrapper {
min-height: 100px;
}
+ .btn {
+ margin-bottom: 10px;
+ }
.custom-textarea {
min-height: 100px;
}
@@ -123,6 +126,11 @@
overflow: auto;
-webkit-overflow-scrolling: touch;
@include flex(1 1 auto);
+
+ .preview-container {
+ margin-top: 5px;
+ }
+
}
.post-right-comment-time {
diff --git a/web/sass-files/sass/partials/_print.scss b/web/sass-files/sass/partials/_print.scss
new file mode 100644
index 000000000..143ec2915
--- /dev/null
+++ b/web/sass-files/sass/partials/_print.scss
Binary files differ
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index ba2fe2ffe..66aaede8d 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -107,7 +107,8 @@
&:after {
font-size: 20px;
- content: '...'
+ content: '...';
+ top: -3px;
}
}
@@ -124,6 +125,14 @@
.post {
+ .post__header {
+
+ .col__name {
+ pointer-events: none;
+ }
+
+ }
+
&.same--root {
&.same--user {
@@ -376,10 +385,8 @@
.msg-typing {
display: none;
}
- .has-error {
- .control-label {
- height: auto;
- }
+ .control-label {
+ top: 0;
}
}
.post-create-body {
@@ -408,8 +415,7 @@
}
}
.preview-container {
- padding: 0px;
- margin-top: 5px;
+ margin: 5px 0 0;
.preview-div {
margin-top: 0;
}
diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss
index a29e940e6..eceeb9a8c 100644
--- a/web/sass-files/sass/partials/_search.scss
+++ b/web/sass-files/sass/partials/_search.scss
@@ -111,6 +111,20 @@
.search-item__jump {
position: absolute;
right: 0;
+ top: 0px;
+ font-size: 13px;
+ @include opacity(0.8);
+
+ &:hover {
+ @include opacity(1);
+ }
+
+}
+
+.search-item__comment {
+ position: absolute;
+ right: 0;
+ margin-right: 35px;
top: 0;
}
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index 8c6214224..473ffb28d 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -40,7 +40,7 @@
font-weight: 600;
}
- .no-padding--left {
+ .no-padding--left {
padding-left: 0;
}
.padding-top {
@@ -135,9 +135,10 @@
.input-group-addon {
padding: 4px 5px;
width: 40px;
- img {
- border: 1px solid rgba(black, 0.15);
- }
+ }
+ img {
+ border: 1px solid rgba(black, 0.15);
+ width: 29px;
}
}
.premade-themes {
@@ -182,7 +183,7 @@
text-align: right;
margin-bottom: 5px;
.fa {
- margin-right: 7px;
+ margin-right: 5px;
font-size: 12px;
@include opacity(0.5);
display: none;
@@ -313,18 +314,36 @@
.member-name {
font-weight:500;
display: block;
+ max-width: 80%;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.member-email {
color:darkgrey;
display: block;
+ max-width: 80%;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+}
+
+.member-role, .member-drop {
+ position:absolute;
+ right: 15px;
+ top: 8px;
+
+ .fa {
+ margin-right: 5px;
+ @include opacity(0.5);
+ font-size: 12px;
}
- .member-role, .member-drop {
- position:absolute;
- right:15px;
- top:13px;
+ .member-menu {
+ top: -50%;
+ right: 110%;
}
+
}
.member-invite {
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index 7b3b8fdf9..d5bf0e503 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -110,6 +110,7 @@
}
}
.btn-close {
+ font-family: 'Open Sans', sans-serif;
position: absolute;
right: 15px;
top: -1px;
@@ -142,7 +143,6 @@
}
}
a, a:hover, a:focus {
- padding-right: 10px;
background-color: rgba(black, 0.1);
border-radius: 0;
font-weight: 400;
diff --git a/web/sass-files/sass/styles.scss b/web/sass-files/sass/styles.scss
index 5ddce4692..c93372175 100644
--- a/web/sass-files/sass/styles.scss
+++ b/web/sass-files/sass/styles.scss
@@ -51,3 +51,6 @@
// Standalone Css
@import "partials/oauth";
+
+// Print
+@import "partials/print"; \ No newline at end of file
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-28 17:10:16 +0000