diff options
Diffstat (limited to 'web/sass-files/sass/partials')
-rw-r--r-- | web/sass-files/sass/partials/_base.scss | 1 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_files.scss | 22 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_get-link.scss | 8 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_mentions.scss | 2 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post.scss | 47 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post_right.scss | 4 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 6 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_sidebar--left.scss | 14 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_signup.scss | 17 |
9 files changed, 102 insertions, 19 deletions
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 78006ff18..5b68b488f 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -24,6 +24,7 @@ body { height: 100%; > .row.main { height: 100%; + position: relative; } } > .container-fluid { diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss index ca06d7def..70f440989 100644 --- a/web/sass-files/sass/partials/_files.scss +++ b/web/sass-files/sass/partials/_files.scss @@ -10,7 +10,7 @@ display: inline-block; width: 120px; height: 100px; - margin: 7px 10px 0 0; + margin: 7px 0 0 5px; vertical-align: top; position: relative; border: 1px solid #DDD; @@ -18,6 +18,9 @@ &:hover .remove-preview:after { @include opacity(1); } + &:first-child { + margin-left: 0; + } .spinner { position:absolute; top:50%; @@ -58,6 +61,8 @@ cursor: pointer; z-index: 5; opacity: inherit; + text-shadow: 0 0px 3px #444; + text-shadow: 0 0px 3px rgba(0, 0, 0, 0.7); } } } @@ -193,11 +198,12 @@ border-right: 1px solid #ddd; vertical-align: center; - // helper to center the image icon in the preview window - .file-details__preview-helper { - height: 100%; - display: inline-block; - vertical-align: middle; - } - } + // helper to center the image icon in the preview window + .file-details__preview-helper { + height: 100%; + display: inline-block; + vertical-align: middle; } + } +} + diff --git a/web/sass-files/sass/partials/_get-link.scss b/web/sass-files/sass/partials/_get-link.scss index c84befd6a..a723a4c1f 100644 --- a/web/sass-files/sass/partials/_get-link.scss +++ b/web/sass-files/sass/partials/_get-link.scss @@ -1,6 +1,6 @@ .copy-link-confirm { - position: fixed; - color: rgb(153, 230, 153); - top: 84%; - left: 130px; + display: inline-block; + float: left; + padding: 4px 10px; + margin: 3px 0 0 10px; }
\ No newline at end of file diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss index a8c4dec26..aa893c535 100644 --- a/web/sass-files/sass/partials/_mentions.scss +++ b/web/sass-files/sass/partials/_mentions.scss @@ -55,7 +55,7 @@ font-size: 20px; text-align: center; color: #555; - @include border-radius(3px); + @include border-radius(32px); } .mention-fullname { diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 98b17120d..e665be6b9 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -106,6 +106,32 @@ body.ios { } } +.file-overlay { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: rgba(0, 0, 0, 0.6); + text-align: center; + color: #FFF; + display: table; + font-size: 1.7em; + font-weight: 600; + z-index: 6; + + > div { + display: table-cell; + vertical-align: middle; + } + + .fa { + display: block; + font-size: 2em; + margin: 0 0 0.3em; + } +} + #post-list { .post-list-holder-by-time { background: #fff; @@ -214,9 +240,6 @@ body.ios { .dropdown, .comment-icon__container { @include opacity(1); } - .dropdown-toggle:after { - content: '[...]'; - } } background: #f5f5f5; } @@ -292,6 +315,21 @@ body.ios { font-size: 0.97em; white-space: pre-wrap; } + + .post-loading-gif { + height:10px; + width:10px; + margin-top:6px; + } + + .post-fail { + color: #D58A8A; + } + + .post-waiting { + color: #999; + } + .comment-icon__container { margin-left: 7px; fill: $primary-color; @@ -383,6 +421,9 @@ body.ios { display: inline-block; @include opacity(0); } + .dropdown-toggle:after { + content: '[...]'; + } } } .post-profile-time { diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss index 4cf3e32a1..da5bcbad2 100644 --- a/web/sass-files/sass/partials/_post_right.scss +++ b/web/sass-files/sass/partials/_post_right.scss @@ -11,8 +11,8 @@ .post { &.post--root { - padding: 0 1em 0; - margin: 1em 0; + padding: 1em 1em 0; + margin: 0 0 1em; hr { border-color: #DDD; margin: 1em 0 0 0; diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index f28df1f89..733d81c2b 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -189,6 +189,9 @@ } @media screen and (max-width: 960px) { + .center-file-overlay { + font-size: 1.5em; + } .post { .post-header .post-header-col.post-header__reply { .comment-icon__container__hide { @@ -240,6 +243,9 @@ } } @media screen and (max-width: 768px) { + .center-file-overlay { + font-size: 1.3em; + } .date-separator, .new-separator { &.hovered--after { &:before { diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index 5d866715e..6d9f2ad8b 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -6,6 +6,7 @@ border-right: $border-gray; padding: 0 0 2em 0; background: #fafafa; + z-index: 5; &.sidebar--padded { padding-top: 44px; } @@ -26,7 +27,9 @@ .status { position:relative; top:1px; - margin-right: 3px; + margin-right: 6px; + width: 12px; + display: inline-block; .online--icon { fill: #7DBE00; } @@ -79,6 +82,9 @@ line-height: 1.5; border-radius: 0; color: #999; + &.nav-more { + text-decoration: underline; + } &.unread-title { color: #333; font-weight: 600; @@ -116,3 +122,9 @@ } } } + +.channel-loading-gif { + height:15px; + width:15px; + margin-top:2px; +} diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss index 3a6f73316..ddf2aab88 100644 --- a/web/sass-files/sass/partials/_signup.scss +++ b/web/sass-files/sass/partials/_signup.scss @@ -186,6 +186,23 @@ display: inline-block; } } + &.google { + background: #dd4b39; + &:hover { + background: darken(#dd4b39, 10%); + } + span { + vertical-align: middle; + } + .icon { + background: url("../images/googleLogo.png"); + width: 18px; + height: 18px; + margin-right: 8px; + @include background-size(100% 100%); + display: inline-block; + } + } } &.btn-default { color: #444; |