From 047e7145bbcd473871ceb7e0a13cc6076576c7f4 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Tue, 7 Jul 2015 04:13:36 +0500 Subject: Fixing background hovers --- web/sass-files/sass/partials/_post.scss | 11 +++++++---- web/sass-files/sass/partials/_responsive.scss | 8 +------- 2 files changed, 8 insertions(+), 11 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 e35979b64..310e9e7e4 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -220,10 +220,16 @@ body.ios { .post-comment { border-left: 4px solid #EEE; padding: 4px 0 6px 10px; - background: #F5F5F5; margin: 0 0 0 30px; @include border-radius(0 4px 4px 0); } + &.current--user { + &:hover { + .post-comment { + background: #fff; + } + } + } .post-body { background: transparent; margin: 0; @@ -231,9 +237,6 @@ body.ios { } &:hover { background: #f5f5f5; - .post-comment { - background: #fff; - } } } } diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index e2c89a6f2..a7927134e 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -235,12 +235,6 @@ &.other--root { &:hover { background: none; - .post-body { - background: none; - .post-comment { - background: #f5f5f5; - } - } } } } @@ -598,7 +592,7 @@ &.post--comment { &.other--root { .post-comment { - margin-left: 4px; + margin-left: 11px; } } } -- cgit v1.2.3-1-g7c22 From 98bdaa04f53c432a62fc56d392255d27ae1bf35c Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Tue, 7 Jul 2015 04:16:04 +0500 Subject: Files img files --- web/sass-files/sass/partials/_files.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 b01d2e157..16881e81c 100644 --- a/web/sass-files/sass/partials/_files.scss +++ b/web/sass-files/sass/partials/_files.scss @@ -13,6 +13,7 @@ vertical-align: top; position: relative; border: 1px solid #DDD; + @include clearfix; &.custom-file { width: 85px; height: 100px; @@ -31,8 +32,9 @@ } } .preview-img { - width:100%; - height:100%; + height: auto; + max-width: 100%; + max-height } .remove-preview { position: absolute; @@ -136,6 +138,7 @@ border: 1px solid #E2E2E2; background-color: #FFF; background-repeat: no-repeat; + background-position: left center; } a { text-decoration: none; -- cgit v1.2.3-1-g7c22 From ab36656830a0af0f1a0d2aa6e44bd91b750781c2 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Tue, 7 Jul 2015 04:19:39 +0500 Subject: Fixing before after hover for date/new separator --- web/sass-files/sass/partials/_responsive.scss | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'web/sass-files/sass/partials') diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index a7927134e..9faa9dc67 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -210,10 +210,14 @@ #post-list { .date-seperator, .new-separator { &.hovered--after { - background: none; + &:before { + background: none; + } } &.hovered--before { - background: none; + &:after { + background: none; + } } } } -- cgit v1.2.3-1-g7c22 From 73cb6904a1d8f365a41695f1b673975bc0228e9a Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Tue, 7 Jul 2015 04:21:20 +0500 Subject: Fixing code error in css --- web/sass-files/sass/partials/_files.scss | 1 - 1 file changed, 1 deletion(-) (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 16881e81c..1268d8a07 100644 --- a/web/sass-files/sass/partials/_files.scss +++ b/web/sass-files/sass/partials/_files.scss @@ -34,7 +34,6 @@ .preview-img { height: auto; max-width: 100%; - max-height } .remove-preview { position: absolute; -- cgit v1.2.3-1-g7c22 From 45867670928e89daa950a8d742d9c36471c7ac45 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Tue, 7 Jul 2015 22:58:13 +0500 Subject: Updating background --- web/sass-files/sass/partials/_post.scss | 29 +++++++++++---------------- web/sass-files/sass/partials/_responsive.scss | 7 ------- 2 files changed, 12 insertions(+), 24 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 310e9e7e4..f33cedd16 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -63,13 +63,13 @@ body.ios { } &.hovered--after { &:before { - background: #f6f6f6; + background: #f5f5f5; display: block; } } &.hovered--before { &:after { - background: #f6f6f6; + background: #f5f5f5; display: block; } } @@ -202,18 +202,13 @@ body.ios { @include opacity(1); } } - background: #f6f6f6; + background: #f5f5f5; } &.current--user { .post-body { @include border-radius(4px); background: #f5f5f5; } - &:hover { - .post-body { - background: #fff; - } - } } &.post--comment { &.other--root { @@ -223,20 +218,20 @@ body.ios { margin: 0 0 0 30px; @include border-radius(0 4px 4px 0); } - &.current--user { - &:hover { - .post-comment { - background: #fff; - } - } - } .post-body { background: transparent; margin: 0; padding: 1px 0px; } - &:hover { - background: #f5f5f5; + &.current--user { + .post-comment { + background: #f5f5f5; + } + } + } + &.same--root { + .post-body { + @include border-radius(0 4px 4px 0); } } } diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 9faa9dc67..1a2befc3f 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -228,13 +228,6 @@ &:hover { background: none; } - &.current--user { - &:hover { - .post-body { - background: #f5f5f5; - } - } - } &.post--comment { &.other--root { &:hover { -- cgit v1.2.3-1-g7c22