From 1fa436b4f99d482bc2adb926b93d0c0b832d9288 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Fri, 7 Aug 2015 14:24:09 -0700 Subject: Users can now drop files into the center pane or the rhs respectively to upload images and other files --- web/sass-files/sass/partials/_files.scss | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss index 65775f01e..34409d563 100644 --- a/web/sass-files/sass/partials/_files.scss +++ b/web/sass-files/sass/partials/_files.scss @@ -194,11 +194,11 @@ 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; } + } +} -- cgit v1.2.3-1-g7c22 From 81d7599f75b11d619f8ee9440394de3f9f86f39f Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Sun, 9 Aug 2015 13:04:24 -0700 Subject: Working on adding overlays for file drag and drop --- web/sass-files/sass/partials/_post.scss | 5 +++++ web/sass-files/sass/partials/_post_right.scss | 6 ++++++ 2 files changed, 11 insertions(+) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 98b17120d..093e10ee0 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -107,6 +107,11 @@ body.ios { } #post-list { + .post-list-file-overlay { + width: 100%; + height: 100%; + background:rgba(255,255,255,0.5); + } .post-list-holder-by-time { background: #fff; overflow-y: scroll; diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss index 4cf3e32a1..1b98d62f9 100644 --- a/web/sass-files/sass/partials/_post_right.scss +++ b/web/sass-files/sass/partials/_post_right.scss @@ -1,5 +1,11 @@ .post-right__container { + .post-right-file-overlay { + width: 100%; + height: 100%; + background:rgba(255,255,255,0.5); + } + .post-right-root-message { padding: 1em 1em 0; } -- cgit v1.2.3-1-g7c22 From 9baafdb372d92c96a4063f11531f4fb5d9e7059e Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Tue, 11 Aug 2015 09:48:25 -0700 Subject: Changed structure to keep code contained to file_upload.jsx --- web/sass-files/sass/partials/_files.scss | 12 ++++++++++++ web/sass-files/sass/partials/_post_right.scss | 6 ------ 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss index 34409d563..83c87132b 100644 --- a/web/sass-files/sass/partials/_files.scss +++ b/web/sass-files/sass/partials/_files.scss @@ -202,3 +202,15 @@ } } } + +.center-file-overlay { + width: 100%; + height: 100%; + background:rgba(255,255,255,0.5); +} + +.right-file-overlay { + width: 100%; + height: 100%; + background:rgba(255,255,255,0.5); +} diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss index 1b98d62f9..4cf3e32a1 100644 --- a/web/sass-files/sass/partials/_post_right.scss +++ b/web/sass-files/sass/partials/_post_right.scss @@ -1,11 +1,5 @@ .post-right__container { - .post-right-file-overlay { - width: 100%; - height: 100%; - background:rgba(255,255,255,0.5); - } - .post-right-root-message { padding: 1em 1em 0; } -- cgit v1.2.3-1-g7c22 From 6f091f0f6d17b74a5d87517ef35f89cd46e1bcb4 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Tue, 11 Aug 2015 15:31:07 -0700 Subject: Added check to make sure files are not strings --- web/sass-files/sass/partials/_files.scss | 4 ---- web/sass-files/sass/partials/_post.scss | 5 ----- 2 files changed, 9 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss index 83c87132b..3736f9303 100644 --- a/web/sass-files/sass/partials/_files.scss +++ b/web/sass-files/sass/partials/_files.scss @@ -204,13 +204,9 @@ } .center-file-overlay { - width: 100%; - height: 100%; background:rgba(255,255,255,0.5); } .right-file-overlay { - width: 100%; - height: 100%; background:rgba(255,255,255,0.5); } diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 093e10ee0..98b17120d 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -107,11 +107,6 @@ body.ios { } #post-list { - .post-list-file-overlay { - width: 100%; - height: 100%; - background:rgba(255,255,255,0.5); - } .post-list-holder-by-time { background: #fff; overflow-y: scroll; -- cgit v1.2.3-1-g7c22 From 14c121dc0cccdd36f97b0b13cde6dd3a5802bb9e Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Wed, 12 Aug 2015 14:12:17 -0700 Subject: Implements better markup for css changes to be made, including an overlay of the dropzones and help pic/text --- web/sass-files/sass/partials/_files.scss | 7 ------- web/sass-files/sass/partials/_post.scss | 23 +++++++++++++++++++++++ web/sass-files/sass/partials/_post_right.scss | 23 +++++++++++++++++++++++ 3 files changed, 46 insertions(+), 7 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss index 3736f9303..9bf6fd83a 100644 --- a/web/sass-files/sass/partials/_files.scss +++ b/web/sass-files/sass/partials/_files.scss @@ -203,10 +203,3 @@ } } -.center-file-overlay { - background:rgba(255,255,255,0.5); -} - -.right-file-overlay { - background:rgba(255,255,255,0.5); -} diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 98b17120d..0af5c01e2 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -107,6 +107,29 @@ body.ios { } #post-list { + .center-file-overlay { + top: 0px; + height: 100%; + width: 59.7%; + position: fixed; + z-index: 2147483646; + -moz-box-shadow: 0px 0px 3px #8a8a8a; + -webkit-box-shadow: 0px 0px 3px #8a8a8a; + box-shadow: 0px 0px 3px #8a8a8a; + + .invisible { + visibility: hidden; + } + .visible { + visibility: visible; + } + .center-file-help-text { + + } + .center-file-help-picture { + + } + } .post-list-holder-by-time { background: #fff; overflow-y: scroll; diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss index 4cf3e32a1..41b7aaada 100644 --- a/web/sass-files/sass/partials/_post_right.scss +++ b/web/sass-files/sass/partials/_post_right.scss @@ -1,5 +1,28 @@ .post-right__container { + .right-file-overlay { + height: 100%; + width: 100%; + position: fixed; + z-index: 2147483646; + -moz-box-shadow: 0px 0px 3px #8a8a8a; + -webkit-box-shadow: 0px 0px 3px #8a8a8a; + box-shadow: 0px 0px 3px #8a8a8a; + + .invisible { + visibility: hidden; + } + .visible { + visibility: visible; + } + .right-file-help-text { + + } + .right-file-help-picture { + + } + } + .post-right-root-message { padding: 1em 1em 0; } -- cgit v1.2.3-1-g7c22 From 097257ade8b01a6f4ce4766cb844d06533bb74cf Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Thu, 13 Aug 2015 23:11:01 +0500 Subject: UI Upgrades to file overlay for uploads --- web/sass-files/sass/partials/_post.scss | 50 ++++++++++++++++----------- web/sass-files/sass/partials/_post_right.scss | 23 ------------ web/sass-files/sass/partials/_responsive.scss | 6 ++++ 3 files changed, 36 insertions(+), 43 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 0af5c01e2..614fc085b 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -106,30 +106,40 @@ body.ios { } } -#post-list { - .center-file-overlay { - top: 0px; - height: 100%; - width: 59.7%; - position: fixed; - z-index: 2147483646; - -moz-box-shadow: 0px 0px 3px #8a8a8a; - -webkit-box-shadow: 0px 0px 3px #8a8a8a; - box-shadow: 0px 0px 3px #8a8a8a; +.center-file-overlay { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: rgba(0, 0, 0, 0.8); + text-align: center; + color: #FFF; + display: table; + font-size: 1.7em; + font-weight: 600; + z-index: 6; - .invisible { - visibility: hidden; - } - .visible { - visibility: visible; - } - .center-file-help-text { + > div { + display: table-cell; + vertical-align: middle; + } - } - .center-file-help-picture { + .fa { + display: block; + font-size: 2em; + margin: 0 0 0.3em; + } - } + .invisible { + visibility: hidden; + } + .visible { + visibility: visible; } +} + +#post-list { .post-list-holder-by-time { background: #fff; overflow-y: scroll; diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss index 41b7aaada..4cf3e32a1 100644 --- a/web/sass-files/sass/partials/_post_right.scss +++ b/web/sass-files/sass/partials/_post_right.scss @@ -1,28 +1,5 @@ .post-right__container { - .right-file-overlay { - height: 100%; - width: 100%; - position: fixed; - z-index: 2147483646; - -moz-box-shadow: 0px 0px 3px #8a8a8a; - -webkit-box-shadow: 0px 0px 3px #8a8a8a; - box-shadow: 0px 0px 3px #8a8a8a; - - .invisible { - visibility: hidden; - } - .visible { - visibility: visible; - } - .right-file-help-text { - - } - .right-file-help-picture { - - } - } - .post-right-root-message { padding: 1em 1em 0; } diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 47b2b6bd7..52bb5eae6 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 { -- cgit v1.2.3-1-g7c22 From 6ca6072f478f556ba2d25c9762f0d73c9e84c7f6 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Thu, 13 Aug 2015 23:33:18 +0500 Subject: Updating UI to cover RHS and the centre channel separately --- web/sass-files/sass/partials/_base.scss | 1 + web/sass-files/sass/partials/_post.scss | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'web/sass-files/sass/partials') 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/_post.scss b/web/sass-files/sass/partials/_post.scss index 614fc085b..bbf36ea93 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -106,13 +106,13 @@ body.ios { } } -.center-file-overlay { - position: fixed; +.file-overlay { + position: absolute; top: 0; left: 0; width: 100%; height: 100%; - background-color: rgba(0, 0, 0, 0.8); + background-color: rgba(0, 0, 0, 0.6); text-align: center; color: #FFF; display: table; -- cgit v1.2.3-1-g7c22 From 2c098d7711eda893f903329ab64528a7d387a6e8 Mon Sep 17 00:00:00 2001 From: Reed Garmsen Date: Fri, 14 Aug 2015 10:00:24 -0700 Subject: Small changes to css to clean up code --- web/sass-files/sass/partials/_post.scss | 7 ------- web/sass-files/sass/partials/_sidebar--left.scss | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index bbf36ea93..56b31205b 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -130,13 +130,6 @@ body.ios { font-size: 2em; margin: 0 0 0.3em; } - - .invisible { - visibility: hidden; - } - .visible { - visibility: visible; - } } #post-list { diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index 5d866715e..2376c9212 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; } -- cgit v1.2.3-1-g7c22