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.scss7
-rw-r--r--web/sass-files/sass/partials/_files.scss2
-rw-r--r--web/sass-files/sass/partials/_headers.scss27
-rw-r--r--web/sass-files/sass/partials/_loading.scss50
-rw-r--r--web/sass-files/sass/partials/_mentions.scss48
-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.scss121
-rw-r--r--web/sass-files/sass/partials/_post_right.scss13
-rw-r--r--web/sass-files/sass/partials/_responsive.scss37
-rw-r--r--web/sass-files/sass/partials/_sidebar--right.scss6
-rw-r--r--web/sass-files/sass/partials/_signup.scss8
12 files changed, 191 insertions, 152 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 1268d8a07..79142176e 100644
--- a/web/sass-files/sass/partials/_files.scss
+++ b/web/sass-files/sass/partials/_files.scss
@@ -119,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;
diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss
index 1ec1109a5..7b0f24abf 100644
--- a/web/sass-files/sass/partials/_headers.scss
+++ b/web/sass-files/sass/partials/_headers.scss
@@ -75,14 +75,16 @@
// Team Header in Sidebar
.sidebar--left, .sidebar--menu {
.team__header {
- padding: 0 15px 0 15px;
+ padding: 15px;
@include legacy-pie-clearfix;
a {
color: #fff;
}
.navbar-right {
font-size: 0.85em;
- margin: 16px -5px 0;
+ position: absolute;
+ top: 24px;
+ right: 25px;
.dropdown-toggle {
padding: 0 10px;
}
@@ -100,17 +102,32 @@
display: inline-block;
}
}
- .team__name {
+ .user__picture {
+ width: 36px;
+ height: 36px;
float: left;
- line-height: 50px;
+ @include border-radius(36px);
+ }
+ .header__info {
+ padding-left: 42px;
+ color: #fff;
+ }
+ .team__name, .user__name {
+ display: block;
+ line-height: 18px;
font-weight: 600;
- font-size: 1.2em;
+ font-size: 16px;
max-width: 80%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
text-decoration: none;
}
+ .user__name {
+ font-size: 14px;
+ font-weight: 400;
+ color: #eee;
+ }
> .nav {
> li {
> a {
diff --git a/web/sass-files/sass/partials/_loading.scss b/web/sass-files/sass/partials/_loading.scss
index 185a42180..d71055722 100644
--- a/web/sass-files/sass/partials/_loading.scss
+++ b/web/sass-files/sass/partials/_loading.scss
@@ -2,67 +2,39 @@
display: table;
width: 100%;
height: 100%;
- position: absolute;
- @include box-sizing(border-box);
+ padding: 60px;
text-align: center;
.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;
}
- }
-}
-.loading-screen {
- .loading__content {
.round {
background-color: #444;
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;
- -webkit-animation: move 0.75s infinite linear;
+ @include animation(move 0.75s infinite linear);
}
- #round_1 {
- -moz-animation-delay: .2s;
- -webkit-animation-delay: .2s;
- }
-
- #round_2 {
- -moz-animation-delay: .4s;
- -webkit-animation-delay: .4s;
- }
-
- #round_3 {
- -moz-animation-delay: .6s;
- -webkit-animation-delay: .6s;
- }
-
- @-moz-keyframes move {
- 0% {
- opacity: 1;
+ @for $i from 1 through 3 {
+ .round-#{$i} {
+ @include animation-delay(.2s*$i);
}
-
- 100% {
- opacity: 0.1;
- };
}
- @-webkit-keyframes move {
- 0% {
- opacity: 1;
- }
-
- 100% {
- opacity: 0.1;
- };
+ @include keyframes(move) {
+ from { opacity: 1; }
+ to { opacity: 0.1; }
}
}
}
diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss
index d6e2ab368..7e8c1869a 100644
--- a/web/sass-files/sass/partials/_mentions.scss
+++ b/web/sass-files/sass/partials/_mentions.scss
@@ -11,12 +11,14 @@
position: absolute;
z-index: 1060;
.mentions-box {
- position:absolute;
- background-color:#fff;
+ width: 100%;
+ height: 100%;
+ 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 +26,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 +42,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 +64,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 f33cedd16..40ed40b49 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: #f5f5f5;
- display: block;
- }
- }
- &.hovered--before {
- &:after {
- background: #f5f5f5;
- 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;
@@ -114,6 +119,7 @@ body.ios {
table-layout: fixed;
width: 100%;
min-height: 100%;
+ height: 100%;
.post-list__content {
display: table-cell;
vertical-align: bottom;
@@ -135,6 +141,7 @@ body.ios {
color: grey;
}
}
+
.post-create__container {
form {
width: 100%;
@@ -306,7 +313,7 @@ body.ios {
}
.post-image__columns {
@include legacy-pie-clearfix;
- margin-top: 1em;
+ padding-bottom: 5px;
}
.post-info--hidden {
display: none;
@@ -347,7 +354,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 1a2befc3f..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,17 +221,15 @@
}
@media screen and (max-width: 768px) {
- #post-list {
- .date-seperator, .new-separator {
- &.hovered--after {
- &:before {
- background: none;
- }
+ .date-separator, .new-separator {
+ &.hovered--after {
+ &:before {
+ background: none;
}
- &.hovered--before {
- &:after {
- background: none;
- }
+ }
+ &.hovered--before {
+ &:after {
+ background: none;
}
}
}
@@ -264,6 +276,11 @@
}
}
}
+ .row--invite {
+ .col-sm-6 {
+ padding: 0;
+ }
+ }
.settings-modal {
&.display--content {
.modal-header {
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-07-19 08:11:05 +0000