From 047b03305d28555486e993848e92e856fac20fea Mon Sep 17 00:00:00 2001 From: "sk9331657@gmail.com" Date: Wed, 16 Jan 2019 22:36:57 +0530 Subject: [PATCH] Fix Badge Overlapping And Icon --- frontend/app/components/create-badge.js | 7 +- frontend/app/styles/partials/footer-main.scss | 4 ++ frontend/app/styles/partials/preview.scss | 2 +- .../app/templates/components/footer-main.hbs | 67 +------------------ .../components/user-component/preview.hbs | 6 +- 5 files changed, 13 insertions(+), 73 deletions(-) diff --git a/frontend/app/components/create-badge.js b/frontend/app/components/create-badge.js index b0a5baf11..4f4111545 100644 --- a/frontend/app/components/create-badge.js +++ b/frontend/app/components/create-badge.js @@ -10,16 +10,13 @@ export default Component.extend({ EmberObject.$(window).bind('resize scroll', function(e) { var card = EmberObject.$(document)[0].getElementsByClassName('six wide column preview'); if (card.length != 0) { - if (e.type === 'scroll' && this.scrollY >= 137 && this.window.innerWidth >= 764 && !(EmberObject.$(window).scrollTop() + EmberObject.$(window).height() > (EmberObject.$(document).height() - 100))) { + if (e.type === 'scroll' && this.scrollY >= 137 && this.window.innerWidth >= 764 && !(EmberObject.$(window).scrollTop() + EmberObject.$(window).height() > (EmberObject.$(document).height()))) { card[0].style.position = 'fixed'; card[0].style.right = '0'; card[0].style.top = '0'; - EmberObject.$(document)[0].getElementsByClassName('bgImg ui raised segment')[0].style.height = '600px'; - } else if (e.type === 'scroll' && this.window.innerWidth >= 764 && (EmberObject.$(window).scrollTop() + EmberObject.$(window).height() > (EmberObject.$(document).height() - 100))) { - card[0].style.position = 'fixed'; EmberObject.$(document)[0].getElementsByClassName('bgImg ui raised segment')[0].style.height = '530px'; } else { - EmberObject.$(document)[0].getElementsByClassName('bgImg ui raised segment')[0].style.height = '100%'; + EmberObject.$(document)[0].getElementsByClassName('bgImg ui raised segment')[0].style.height = '530px'; card[0].style.position = 'inherit'; } } diff --git a/frontend/app/styles/partials/footer-main.scss b/frontend/app/styles/partials/footer-main.scss index 69c69555c..d72b4a5ba 100644 --- a/frontend/app/styles/partials/footer-main.scss +++ b/frontend/app/styles/partials/footer-main.scss @@ -4,6 +4,10 @@ footer { background-color: $bkColor; } +.ui.bottom.inverted.menu { + overflow: scroll; +} + @media only screen and (max-width: 600px) { .mobile-hide{ display: none; diff --git a/frontend/app/styles/partials/preview.scss b/frontend/app/styles/partials/preview.scss index d39c6b48b..fa0bcbb72 100644 --- a/frontend/app/styles/partials/preview.scss +++ b/frontend/app/styles/partials/preview.scss @@ -1,6 +1,6 @@ .bgImg { border-radius: 5px; - height: 600px; + height: 500px !important; } .preview.content { diff --git a/frontend/app/templates/components/footer-main.hbs b/frontend/app/templates/components/footer-main.hbs index 0797052b8..98dcecd8b 100644 --- a/frontend/app/templates/components/footer-main.hbs +++ b/frontend/app/templates/components/footer-main.hbs @@ -1,4 +1,4 @@ -{{!--