From f2401dd91f7e0ae005e1efddd1132d91bf4dad02 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 26 Jun 2015 03:07:20 +0500 Subject: MM-1184 - Updating image preview --- web/sass-files/sass/partials/_modal.scss | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'web/sass-files/sass/partials/_modal.scss') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 43dbdc077..22013aa4f 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -129,15 +129,16 @@ width:100%; margin: 0 auto; .image-wrapper { - padding: 4px; background: #FFF; position: relative; max-width: 80%; - min-height: 280px; min-width: 280px; - @include border-radius(4px); + @include border-radius(3px); display: table; margin: 0 auto; + &:hover { + @include border-radius(3px 3px 0 0); + } &:hover .modal-close { @include opacity(1); } @@ -217,10 +218,11 @@ } .modal-button-bar { position:absolute; - bottom:0px; + bottom:-40px; left:0px; right:0px; - background-color:rgba(0, 0, 0, 0.8); + background-color: #222; + @include border-radius(0 0 3px 3px); @include opacity(0); -webkit-transition: opacity 0.6s; -moz-transition: opacity 0.6s; @@ -228,7 +230,6 @@ transition: opacity 0.6s; line-height: 40px; padding: 0 10px; - margin: 4px; &.footer--show { @include opacity(1); } -- cgit v1.2.3-1-g7c22 From febb6e3b656f0a5e48c928f26d071d2f1baf5b33 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 26 Jun 2015 23:19:29 +0500 Subject: mm-1256 - Improving view modal and close modal button --- web/sass-files/sass/partials/_modal.scss | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'web/sass-files/sass/partials/_modal.scss') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 22013aa4f..9009dd768 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -1,9 +1,17 @@ +.modal-body { + padding: 20px 15px; +} .modal { &.image_modal { .modal-backdrop.in { @include opacity(0.7); } } + .info__label { + font-weight: bold; + text-align: right; + padding-right: 0; + } .remove__member { float: right; } @@ -29,7 +37,7 @@ border-radius: 0; background: $primary-color; color: #FFF; - padding: 15px 15px 11px; + padding: 15px 15px 11px; border: none; min-height: 56px; @include clearfix; @@ -41,11 +49,22 @@ margin: 0; } button.close { - margin-top: 0; + margin: -2px -2px 0 0; color: #fff; @include opacity(1); z-index: 5; + width: 30px; + height: 30px; + line-height: 30px; + @include single-transition(all, 0.25s, ease-in); position: relative; + &:hover { + background: rgba(0, 0, 0, 0.1); + } + span { + position: relative; + top: -1px; + } } .btn { margin-right: 10px; -- cgit v1.2.3-1-g7c22 From 9e7ba4aa5dec9882e6fcf747b464cd8d5cee1e98 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Sat, 27 Jun 2015 00:29:37 +0500 Subject: Removing relative from span --- web/sass-files/sass/partials/_modal.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'web/sass-files/sass/partials/_modal.scss') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 9009dd768..4427cb7dd 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -62,8 +62,7 @@ background: rgba(0, 0, 0, 0.1); } span { - position: relative; - top: -1px; + line-height: 10px; } } .btn { -- cgit v1.2.3-1-g7c22 From e46561339f59ff19f68d69596567d1498ed5a857 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 17 Jul 2015 21:04:33 +0500 Subject: MM-1426 - Updating UI --- web/sass-files/sass/partials/_modal.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'web/sass-files/sass/partials/_modal.scss') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 4427cb7dd..7367b5d1a 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -8,7 +8,7 @@ } } .info__label { - font-weight: bold; + font-weight: 600; text-align: right; padding-right: 0; } @@ -120,7 +120,7 @@ } .more-channel-name { color: #444; - font-weight: bold; + font-weight: 600; font-size: 0.95em; } tbody { -- cgit v1.2.3-1-g7c22 From 30239d255ae8ecbed70bb7b5b10db23039ca649b Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 17 Jul 2015 22:06:53 +0500 Subject: Improving image modals --- web/sass-files/sass/partials/_modal.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'web/sass-files/sass/partials/_modal.scss') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 7367b5d1a..b26af1d32 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -145,6 +145,7 @@ .modal-image { position:relative; width:100%; + height: 100%; margin: 0 auto; .image-wrapper { background: #FFF; -- cgit v1.2.3-1-g7c22 From 764bd97bc72ac335ce42b5c4e19931b6a72b803b Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 17 Jul 2015 23:10:10 +0500 Subject: Improving modal UI --- web/sass-files/sass/partials/_modal.scss | 1 - 1 file changed, 1 deletion(-) (limited to 'web/sass-files/sass/partials/_modal.scss') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index b26af1d32..5438f58fb 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -66,7 +66,6 @@ } } .btn { - margin-right: 10px; &.btn-primary { float: right; margin-top: -4px; -- cgit v1.2.3-1-g7c22 From f5c4cf10c484111e817c1111d9138d891c6d84cf Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Fri, 17 Jul 2015 23:39:09 +0500 Subject: Adding highlights and improving css for posts on responsive screens --- web/sass-files/sass/partials/_modal.scss | 1 - 1 file changed, 1 deletion(-) (limited to 'web/sass-files/sass/partials/_modal.scss') diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 5438f58fb..971ed0935 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -21,7 +21,6 @@ margin-right: auto; } .modal-body { - max-height: 75%; overflow: auto; } .modal-push-down { -- cgit v1.2.3-1-g7c22