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.scss7
-rw-r--r--web/sass-files/sass/partials/_files.scss8
-rw-r--r--web/sass-files/sass/partials/_loading.scss8
-rw-r--r--web/sass-files/sass/partials/_mentions.scss43
-rw-r--r--web/sass-files/sass/partials/_modal.scss20
-rwxr-xr-xweb/sass-files/sass/partials/_perfect-scrollbar.scss4
-rw-r--r--web/sass-files/sass/partials/_post.scss138
-rw-r--r--web/sass-files/sass/partials/_post_right.scss13
-rw-r--r--web/sass-files/sass/partials/_responsive.scss44
-rw-r--r--web/sass-files/sass/partials/_sidebar--right.scss6
-rw-r--r--web/sass-files/sass/partials/_signup.scss8
11 files changed, 172 insertions, 127 deletions
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index cf28e44e8..fd6225bdd 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -154,9 +154,4 @@ div.theme {
text-decoration: none;
padding: 0 10px;
}
-}
-
-.invite {
- width: 90%;
-}
-
+} \ No newline at end of file
diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss
index b01d2e157..79142176e 100644
--- a/web/sass-files/sass/partials/_files.scss
+++ b/web/sass-files/sass/partials/_files.scss
@@ -13,6 +13,7 @@
vertical-align: top;
position: relative;
border: 1px solid #DDD;
+ @include clearfix;
&.custom-file {
width: 85px;
height: 100px;
@@ -31,8 +32,8 @@
}
}
.preview-img {
- width:100%;
- height:100%;
+ height: auto;
+ max-width: 100%;
}
.remove-preview {
position: absolute;
@@ -118,7 +119,7 @@
width: 120px;
height: 100px;
float: left;
- margin: 0 1em 1em 0;
+ margin: 5px 10px 5px 0;
&.custom-file {
width: 85px;
height: 100px;
@@ -136,6 +137,7 @@
border: 1px solid #E2E2E2;
background-color: #FFF;
background-repeat: no-repeat;
+ background-position: left center;
}
a {
text-decoration: none;
diff --git a/web/sass-files/sass/partials/_loading.scss b/web/sass-files/sass/partials/_loading.scss
index 185a42180..bc819e8f5 100644
--- a/web/sass-files/sass/partials/_loading.scss
+++ b/web/sass-files/sass/partials/_loading.scss
@@ -5,10 +5,16 @@
position: absolute;
@include box-sizing(border-box);
text-align: center;
+ &.loading-screen--channel {
+ position: relative;
+ padding: 4em 0 3.5em;
+ }
.loading__content {
display: table-cell;
vertical-align: middle;
+ font-size: 0;
h3 {
+ font-size: 16px;
font-weight: 400;
margin: 0 0.2em 0;
display: inline-block;
@@ -23,7 +29,7 @@
width: 4px;
height: 4px;
display: inline-block;
- margin: 0 1px;
+ margin: 0 2px;
opacity: 0.1;
@include border-radius(10px);
-moz-animation: move 0.75s infinite linear;
diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss
index d6e2ab368..da46866c8 100644
--- a/web/sass-files/sass/partials/_mentions.scss
+++ b/web/sass-files/sass/partials/_mentions.scss
@@ -11,12 +11,13 @@
position: absolute;
z-index: 1060;
.mentions-box {
+ max-height: 303px;
position:absolute;
background-color:#fff;
border: $border-gray;
- overflow-x: hidden;
- overflow-y: scroll;
- bottom:0;
+ overflow-x: hidden;
+ overflow-y: scroll;
+ bottom:0;
}
}
@@ -24,13 +25,15 @@
position:relative;
width:100%;
background-color:#fff;
- height:37px;
+ height:36px;
padding:2px;
z-index:101;
- cursor: pointer;
- &:hover {
- background-color:#e8eaed;
- }
+ line-height: 36px;
+ font-size: 13px;
+ cursor: pointer;
+ &:hover {
+ background-color: #E6F2FA;
+ }
}
.mentions-text {
@@ -38,15 +41,20 @@
}
.mention-img {
- margin-right:10px;
- height:32px;
- width:32px;
- border-radius: 10%;
+ margin-right: 6px;
+ height: 32px;
+ width: 32px;
+ line-height: 36px;
+ display: block;
+ font-size: 20px;
+ text-align: center;
+ color: #555;
+ @include border-radius(3px);
}
.mention-fullname {
- color: grey;
- padding-left: 10px;
+ color: grey;
+ padding-left: 10px;
}
.mention-highlight {
@@ -55,9 +63,4 @@
.mention-link {
color:$primary-color;
-}
-
-.mention-align {
- position:relative;
- top:5px;
-}
+} \ No newline at end of file
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 637f908ca..707e71cf0 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -15,6 +15,10 @@
}
.remove__member {
float: right;
+ color: #E56565;
+ font-size: 20px;
+ line-height: 0;
+ padding: 6px;
}
.modal-dialog {
max-width: 95%;
@@ -268,3 +272,19 @@
}
}
}
+
+// Invite New Member
+.invite {
+ margin-right: 40px;
+}
+
+.row--invite {
+ margin-right: 40px;
+ @include clearfix;
+ .col-sm-6 {
+ padding: 0 0 0 15px;
+ &:first-child {
+ padding-left: 0;
+ }
+ }
+} \ No newline at end of file
diff --git a/web/sass-files/sass/partials/_perfect-scrollbar.scss b/web/sass-files/sass/partials/_perfect-scrollbar.scss
index f253d0792..f38c6062f 100755
--- a/web/sass-files/sass/partials/_perfect-scrollbar.scss
+++ b/web/sass-files/sass/partials/_perfect-scrollbar.scss
@@ -3,7 +3,7 @@
.ps-container.ps-active-x > .ps-scrollbar-x-rail, .ps-container.ps-active-y > .ps-scrollbar-y-rail {
display: block; }
.ps-container.ps-in-scrolling {
- pointer-events: none; }
+ }
.ps-container.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail {
background-color: #eee;
opacity: 0.9;
@@ -85,7 +85,7 @@
/* there must be 'right' for ps-scrollbar-y */
width: 8px; }
.ps-container:hover.ps-in-scrolling {
- pointer-events: none; }
+ }
.ps-container:hover.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail {
background-color: #eee;
opacity: 0.9;
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index e35979b64..d0c536363 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -11,6 +11,10 @@
min-height:36px;
}
+.bad-connection {
+ background-color: rgb(255, 255, 172);
+}
+
.textarea-div {
white-space:pre-wrap;
word-wrap:normal;
@@ -41,67 +45,68 @@ body.ios {
min-height:37px;
}
-#post-list {
- .date-separator, .new-separator {
- text-align: center;
- height: 2em;
- margin: 0;
- position: relative;
- &:before, &:after {
- content: "";
- height: 1em;
- position: absolute;
- left: 0;
- width: 100%;
- display: none;
- }
+.date-separator, .new-separator {
+ text-align: center;
+ height: 2em;
+ margin: 0;
+ position: relative;
+ &:before, &:after {
+ content: "";
+ height: 1em;
+ position: absolute;
+ left: 0;
+ width: 100%;
+ display: none;
+ }
+ &:before {
+ bottom: 0;
+ }
+ &:after {
+ top: 0;
+ }
+ &.hovered--after {
&:before {
- bottom: 0;
+ background: #f5f5f5;
+ display: block;
}
+ }
+ &.hovered--before {
&:after {
- top: 0;
- }
- &.hovered--after {
- &:before {
- background: #f6f6f6;
- display: block;
- }
- }
- &.hovered--before {
- &:after {
- background: #f6f6f6;
- display: block;
- }
- }
- .separator__hr {
- border-color: #ccc;
- margin: 0;
- position: relative;
- z-index: 5;
- top: 1em;
- }
- .separator__text {
- line-height: 2em;
- color: #555;
- background: #FFF;
- display: inline-block;
- padding: 0 1em;
- font-weight: 700;
- @include border-radius(50px);
- position: relative;
- z-index: 5;
- font-size: 13px;
+ background: #f5f5f5;
+ display: block;
}
}
- .new-separator {
- .separator__hr {
- border-color: #FFAF53;
- }
- .separator__text {
- color: #F80;
- font-weight: normal;
- }
+ .separator__hr {
+ border-color: #ccc;
+ margin: 0;
+ position: relative;
+ z-index: 5;
+ top: 1em;
+ }
+ .separator__text {
+ line-height: 2em;
+ color: #555;
+ background: #FFF;
+ display: inline-block;
+ padding: 0 1em;
+ font-weight: 700;
+ @include border-radius(50px);
+ position: relative;
+ z-index: 5;
+ font-size: 13px;
+ }
+}
+.new-separator {
+ .separator__hr {
+ border-color: #FFAF53;
}
+ .separator__text {
+ color: #F80;
+ font-weight: normal;
+ }
+}
+
+#post-list {
.post-list-holder-by-time {
background: #fff;
overflow-y: scroll;
@@ -135,6 +140,7 @@ body.ios {
color: grey;
}
}
+
.post-create__container {
form {
width: 100%;
@@ -202,25 +208,19 @@ body.ios {
@include opacity(1);
}
}
- background: #f6f6f6;
+ background: #f5f5f5;
}
&.current--user {
.post-body {
@include border-radius(4px);
background: #f5f5f5;
}
- &:hover {
- .post-body {
- background: #fff;
- }
- }
}
&.post--comment {
&.other--root {
.post-comment {
border-left: 4px solid #EEE;
padding: 4px 0 6px 10px;
- background: #F5F5F5;
margin: 0 0 0 30px;
@include border-radius(0 4px 4px 0);
}
@@ -229,13 +229,17 @@ body.ios {
margin: 0;
padding: 1px 0px;
}
- &:hover {
- background: #f5f5f5;
+ &.current--user {
.post-comment {
- background: #fff;
+ background: #f5f5f5;
}
}
}
+ &.same--root {
+ .post-body {
+ @include border-radius(0 4px 4px 0);
+ }
+ }
}
&.same--root {
.comment-icon__container {
@@ -308,7 +312,7 @@ body.ios {
}
.post-image__columns {
@include legacy-pie-clearfix;
- margin-top: 1em;
+ padding-bottom: 5px;
}
.post-info--hidden {
display: none;
@@ -349,7 +353,7 @@ body.ios {
}
&.post-info {
.post-profile-time {
- width: 100px;
+ width: 150px;
display: inline-block;
margin-left: 50px;
}
diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss
index 0d3e75689..8816393c8 100644
--- a/web/sass-files/sass/partials/_post_right.scss
+++ b/web/sass-files/sass/partials/_post_right.scss
@@ -21,10 +21,21 @@
}
.post-create__container {
- margin-top: 1em;
+ margin-top: 10px;
+ .textarea-wrapper {
+ min-height: 100px;
+ }
.custom-textarea {
min-height: 100px;
}
+ .msg-typing {
+ color: #555;
+ float: left;
+ padding-top: 17px;
+ }
+ .post-create-footer {
+ padding-top: 10px;
+ }
}
}
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index e2c89a6f2..9c0c09ee3 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -1,6 +1,13 @@
@media screen and (max-width: 1800px) {
.inner__wrap {
&.move--left {
+ .date-separator, .new-separator {
+ &.hovered--comment {
+ &:before, &:after {
+ background: none;
+ }
+ }
+ }
.post {
&.same--root {
margin-left: 60px;
@@ -82,6 +89,13 @@
max-width: 810px;
}
}
+ .date-separator, .new-separator {
+ &.hovered--comment {
+ &:before, &:after {
+ background: none;
+ }
+ }
+ }
.post {
&.same--root {
margin-left: 60px;
@@ -207,12 +221,14 @@
}
@media screen and (max-width: 768px) {
- #post-list {
- .date-seperator, .new-separator {
- &.hovered--after {
+ .date-separator, .new-separator {
+ &.hovered--after {
+ &:before {
background: none;
}
- &.hovered--before {
+ }
+ &.hovered--before {
+ &:after {
background: none;
}
}
@@ -224,23 +240,10 @@
&:hover {
background: none;
}
- &.current--user {
- &:hover {
- .post-body {
- background: #f5f5f5;
- }
- }
- }
&.post--comment {
&.other--root {
&:hover {
background: none;
- .post-body {
- background: none;
- .post-comment {
- background: #f5f5f5;
- }
- }
}
}
}
@@ -273,6 +276,11 @@
}
}
}
+ .row--invite {
+ .col-sm-6 {
+ padding: 0;
+ }
+ }
.settings-modal {
&.display--content {
.modal-header {
@@ -598,7 +606,7 @@
&.post--comment {
&.other--root {
.post-comment {
- margin-left: 4px;
+ margin-left: 11px;
}
}
}
diff --git a/web/sass-files/sass/partials/_sidebar--right.scss b/web/sass-files/sass/partials/_sidebar--right.scss
index 7a91caec9..a0e82fd2f 100644
--- a/web/sass-files/sass/partials/_sidebar--right.scss
+++ b/web/sass-files/sass/partials/_sidebar--right.scss
@@ -27,12 +27,6 @@
margin: 3px 0 0;
}
}
- .post-create__container {
- margin-top: 10px;
- .post-create-footer {
- padding-top: 10px;
- }
- }
.sidebar__overlay {
width: 100%;
height: 100%;
diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss
index 8917ebb9f..a714aa44f 100644
--- a/web/sass-files/sass/partials/_signup.scss
+++ b/web/sass-files/sass/partials/_signup.scss
@@ -20,7 +20,7 @@
font-size: em(28px);
}
h3 {
- font-weight: 600;
+ font-weight: 600;
margin: 0 0 1.3em 0;
font-size: 1.4em;
}
@@ -91,6 +91,8 @@
.has-error {
.control-label {
margin-top: 5px;
+ font-size: 14px;
+ font-weight: 600;
}
}
.reset-form {
@@ -114,6 +116,6 @@
}
.signup-team-login {
- padding-bottom: 10px;
- font-weight: 700;
+ padding-bottom: 10px;
+ font-weight: 700;
} \ No newline at end of file
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-09-04 13:02:48 +0000