summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-07-08 23:08:06 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-07-08 23:08:06 +0500
commitde742baac09726fe2ef9f7274d260950a6828589 (patch)
tree509abbd84a49b3311a8d808a7d4573c493d1270f /web/sass-files/sass
parent235beeb82926abd79f032cecb5f7ddbb4ff72f8b (diff)
downloadchat-de742baac09726fe2ef9f7274d260950a6828589.tar.gz
chat-de742baac09726fe2ef9f7274d260950a6828589.tar.bz2
chat-de742baac09726fe2ef9f7274d260950a6828589.zip
MM-1469 - Loading message in more channel modal
Diffstat (limited to 'web/sass-files/sass')
-rw-r--r--web/sass-files/sass/partials/_files.scss2
-rw-r--r--web/sass-files/sass/partials/_loading.scss64
-rw-r--r--web/sass-files/sass/partials/_post.scss2
3 files changed, 8 insertions, 60 deletions
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/_loading.scss b/web/sass-files/sass/partials/_loading.scss
index a078d3563..b47594daf 100644
--- a/web/sass-files/sass/partials/_loading.scss
+++ b/web/sass-files/sass/partials/_loading.scss
@@ -5,10 +5,15 @@
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;
h3 {
+ font-size: 16px;
font-weight: 400;
margin: 0 0.2em 0;
display: inline-block;
@@ -23,64 +28,7 @@
width: 4px;
height: 4px;
display: inline-block;
- margin: 0 1px;
- opacity: 0.1;
- @include border-radius(10px);
- -moz-animation: move 0.75s infinite linear;
- -webkit-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;
- }
-
- 100% {
- opacity: 0.1;
- };
- }
-
- @-webkit-keyframes move {
- 0% {
- opacity: 1;
- }
-
- 100% {
- opacity: 0.1;
- };
- }
- }
-}
-
-.channel-loading-screen {
- position: absolute;
- text-align: center;
- padding: 2em 1em;
-}
-
-.channel-loading-message {
- .loading__content {
- .round {
- background-color: #444;
- width: 4px;
- height: 4px;
- display: inline-block;
- margin: 0 1px;
+ margin: 0;
opacity: 0.1;
@include border-radius(10px);
-moz-animation: move 0.75s infinite linear;
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index f33cedd16..4891fe67f 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -306,7 +306,7 @@ body.ios {
}
.post-image__columns {
@include legacy-pie-clearfix;
- margin-top: 1em;
+ padding-bottom: 5px;
}
.post-info--hidden {
display: none;