From 62940fb72f8ba89b97bbbd2bdc484fd42f5e09ce Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Tue, 8 Sep 2015 21:12:36 +0500 Subject: UI changes for various tickets --- 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 dec08b567..29e05f6bf 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -63,7 +63,6 @@ margin: 0; } button.close { - margin: -2px -2px 0 0; color: #fff; @include opacity(1); z-index: 5; @@ -71,7 +70,8 @@ height: 30px; line-height: 30px; @include single-transition(all, 0.25s, ease-in); - position: relative; + position: absolute; + right: 10px; &:hover { background: rgba(0, 0, 0, 0.1); } -- cgit v1.2.3-1-g7c22 From 7fba0adc805f3b633bf5ef23e0c8143c525a23e6 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 9 Sep 2015 22:25:01 +0500 Subject: PLT-188 - Moving attachment button to the left and fixing buttons in modal header --- web/sass-files/sass/partials/_modal.scss | 2 +- 1 file changed, 1 insertion(+), 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 29e05f6bf..b94ed2113 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -82,7 +82,7 @@ .btn { &.btn-primary { float: right; - margin-top: -4px; + margin: -4px 25px 0 0; position: relative; i { margin-right: 5px; -- cgit v1.2.3-1-g7c22 From 1440c953817aac3a5ebc6762f6c3e2668213fd70 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Thu, 10 Sep 2015 23:34:30 +0500 Subject: PM-183 and PM-162 - Updating UI for more modal and unread notification bar --- 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 b94ed2113..d5db5fc46 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -118,12 +118,11 @@ } &#more_channels { .modal-body { - padding: 5px 10px; + padding: 0; } } .more-channel-table { margin: 0; - table-layout: fixed; p { font-size: 0.9em; overflow: hidden; @@ -138,16 +137,18 @@ } tbody { > tr { - &:first-child { - td { - border: none; - } + &:hover td { + background: #f7f7f7; } td { + width: 100%; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + padding: 8px 8px 8px 15px; &.td--action { + text-align: right; + padding: 8px 15px 8px 8px; width: 70px; vertical-align: middle; } -- cgit v1.2.3-1-g7c22 From 72b9c3d7f6b24f74e145b0be9d9e733f0364ccb6 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Thu, 10 Sep 2015 23:36:10 +0500 Subject: Removing border from first tr tds in more modal --- web/sass-files/sass/partials/_modal.scss | 5 +++++ 1 file changed, 5 insertions(+) (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 d5db5fc46..d32306cbc 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -140,6 +140,11 @@ &:hover td { background: #f7f7f7; } + &:first-child { + td { + border: none; + } + } td { width: 100%; white-space: nowrap; -- cgit v1.2.3-1-g7c22