Unverified Commit 5aeebe28 authored by srinivasan pusuluri's avatar srinivasan pusuluri Committed by GitHub
Browse files

Merge pull request #3679 from vinodkumar45/Sb-17348-new

Issue #SB-17348 footer dynamic height issue 
parents 02b4d527 ee4b8b4e
master Dark_theme SB-25589 SB-28090 aws_fileRead contributions dependabot/npm_and_yarn/src/app/client/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/app/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/app/express-4.17.3 dependabot/npm_and_yarn/src/app/jsonwebtoken-9.0.0 dependabot/npm_and_yarn/src/desktop/OpenRAP/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/desktop/OpenRAP/express-4.17.3 dependabot/npm_and_yarn/src/desktop/OpenRAP/jsonwebtoken-9.0.0 dependabot/npm_and_yarn/src/desktop/OpenRAP/qs-6.5.3 dependabot/npm_and_yarn/src/desktop/decode-uri-component-0.2.2 dependabot/npm_and_yarn/src/desktop/express-4.17.3 dependabot/npm_and_yarn/src/desktop/jsonwebtoken-9.0.0 dependabot/npm_and_yarn/src/desktop/qs-6.10.3 filters_5.1.1 gcp gcp_test keshavprasadms-patch-1 keshavprasadms-patch-2 release-2.10.0 release-2.10.1 release-2.10.2 release-2.10.3 release-2.8.1 release-2.8.10 release-2.8.11 release-2.8.12 release-2.8.2 release-2.8.3 release-2.8.4 release-2.8.5 release-2.8.6 release-2.8.7 release-2.8.8 release-2.8.9 release-2.9.0 release-3.0 release-3.0-merge release-3.0.0 release-3.0.1 release-3.0.2 release-3.0.3 release-3.0.4 release-3.0.4-sso release-3.1.0 release-3.1.1 release-3.1.2 release-3.2.0 release-3.2.1 release-3.2.10 release-3.2.11 release-3.2.12 release-3.2.13 release-3.2.14 release-3.2.2 release-3.2.3 release-3.2.4 release-3.3.0 release-3.3.0-telemetry-fix release-3.3.1 release-3.3.2 release-3.4.0 release-3.4.1 release-3.4.2 release-3.4.3 release-3.4.4 release-3.4.5 release-3.4.6 release-3.4.7 release-3.5.0 release-3.5.1 release-3.5.2 release-3.5.3 release-3.6.0 release-3.6.1 release-3.6.5 release-3.6.6 release-3.7.0 release-3.7.1 release-3.7.2 release-3.8.0 release-3.8.1 release-3.8.2 release-3.8.3 release-3.9.0 release-3.9.1 release-3.9.2 release-3.9.3 release-4.0.0 release-4.0.1 release-4.0.2 release-4.1 release-4.1.0 release-4.1.1 release-4.10.0 release-4.10.0.1 release-4.10.1 release-4.10.2 release-4.10.2.1 release-4.10.2.2 release-4.10.3 release-4.2.0 release-4.2.1 release-4.3.0 release-4.3.1 release-4.4.0 release-4.4.1 release-4.5.0 release-4.5.1 release-4.5.2 release-4.6.0 release-4.7.0 release-4.7.1 release-4.8.0 release-4.8.5 release-4.9.0 release-4.9.1 release-5.0.0 release-5.0.0.1 release-5.0.0.2 release-5.0.0.3 release-5.0.1 release-5.0.2 release-5.1.0 release-5.1.1 revert-3718-copypi revert-3842-release-2.8.7 revert-3890-release-2.8.9 revert-4427-player-cache-issue revert-4537-SB-19763 revert-5244-sh-809 revert-5260-SB-table-3.3.0 revert-8284-release-5.0.0 sharathkashyap-patch-1 Tags unavailable
No related merge requests found
Showing with 67 additions and 63 deletions
+67 -63
......@@ -22,18 +22,27 @@
<div class="ui grid stackable">
<div class="four wide column footerMenu mr-auto">
<ul class="p-0 m-0">
<!-- <li class="mb-15">
<!-- <li class="mb-16">
<a href="/verticals/profile-registry/">
{{resourceService.frmelmnts?.lnk?.footerDikshaVerticals}}
</a>
</li> -->
<li class="mb-15">
<li class="mb-16">
<a appTelemetryInteract [telemetryInteractEdata]="setTelemetryInteractEdata('help-center')"
href="/help/getting-started/explore-diksha/index.html">
{{resourceService.frmelmnts?.lnk?.footerHelpCenter}}
</a>
</li>
<!-- <li class="mb-15">
<li>
<label class="d-block mb-0">
{{resourceService.frmelmnts?.lnk?.footerContact}}
</label>
<a appTelemetryInteract [telemetryInteractEdata]="setTelemetryInteractEdata('fresh-desk')" class="d-block mb-0"
href="mailto:support@diksha-ncte.freshdesk.com">
support@diksha-ncte.freshdesk.com
</a>
</li>
<!-- <li class="mb-16">
<a href="/partners/">
{{resourceService.frmelmnts?.lnk?.footerPartners}}
</a>
......@@ -61,14 +70,7 @@
</div>
</div>
<div class="four wide column contantDetails">
<label class="d-block mb-10">
{{resourceService.frmelmnts?.lnk?.footerContact}}
</label>
<a appTelemetryInteract [telemetryInteractEdata]="setTelemetryInteractEdata('fresh-desk')" class="d-block mb-30"
href="mailto:support@diksha-ncte.freshdesk.com">
support@diksha-ncte.freshdesk.com
</a>
<label class="d-block">
<label class="d-block mb-16">
<a appTelemetryInteract [telemetryInteractEdata]="setTelemetryInteractEdata('t&c')" href="/term-of-use.html">
{{resourceService.frmelmnts?.lnk?.footerTnC}}
</a>
......
import { Component, OnInit, ViewChild, ElementRef, Renderer2, AfterViewInit } from '@angular/core';
import { Component, OnInit, ViewChild, ElementRef, Renderer2, ChangeDetectorRef, HostListener} from '@angular/core';
import { ResourceService, ConfigService } from '@sunbird/shared';
import { environment } from '@sunbird/environment';
import { Router, ActivatedRoute, NavigationEnd } from '@angular/router';
......@@ -10,7 +10,7 @@ import * as _ from 'lodash-es';
selector: 'app-footer',
templateUrl: './main-footer.component.html'
})
export class MainFooterComponent implements OnInit, AfterViewInit {
export class MainFooterComponent implements OnInit {
@ViewChild('footerFix') footerFix: ElementRef;
/**
* reference of resourceService service.
......@@ -29,29 +29,42 @@ export class MainFooterComponent implements OnInit, AfterViewInit {
instance: string;
bodyPaddingBottom: string;
constructor(resourceService: ResourceService, public router: Router, public activatedRoute: ActivatedRoute,
public configService: ConfigService, private renderer: Renderer2) {
public configService: ConfigService, private renderer: Renderer2, private cdr: ChangeDetectorRef
) {
this.resourceService = resourceService;
}
ngOnInit() {
this.instance = _.upperCase(this.resourceService.instance);
}
ngAfterViewInit() {
this.footerAlign();
}
@HostListener('window:resize', ['$event'])
onResize(event) {
console.log('event', event);
this.footerAlign();
}
// footer dynamic height
footerAlign() {
$('.footerfix').css('height', 'auto');
const footerHeight = $('footer').outerHeight();
$('.footerfix').css('height', footerHeight);
if (window.innerWidth <= 767) {
(document.querySelector('.download-mobile-app') as HTMLElement).style.minHeight = 0 + 'px';
(document.querySelector('.download-mobile-app') as HTMLElement).style.bottom = footerHeight + 'px';
(document.querySelector('body') as HTMLElement).style.paddingBottom = footerHeight + 178 + 'px';
} else {
(document.querySelector('.download-mobile-app') as HTMLElement).style.minHeight = 200 + 'px';
(document.querySelector('.download-mobile-app') as HTMLElement).style.bottom = 0 + 'px';
(document.querySelector('body') as HTMLElement).style.paddingBottom = footerHeight + 67 + 'px';
}
}
checkRouterPath() {
this.showDownloadmanager = this.router.url.includes('/profile') || this.router.url.includes('/play/collection') ||
this.router.url.includes('/play/content');
}
ngAfterViewInit() {
setTimeout(() => {
if (this.footerFix && this.footerFix.nativeElement) {
this.bodyPaddingBottom = this.footerFix.nativeElement.offsetHeight + 'px';
this.renderer.setStyle(
document.body,
'padding-bottom',
this.bodyPaddingBottom
);
}
}, 500);
}
redirectToDikshaApp() {
let applink = this.configService.appConfig.UrlLinks.downloadDikshaApp;
......
......@@ -27,35 +27,12 @@ body {
}
}
}
@include respond-above(lg) {
body {
.footer-fix {
padding-bottom: 56px;
}
}
}
@include respond-between(md, lg) {
body {
.footer-fix {
padding-bottom: 64px;
}
}
}
@include respond-between(sm, md) {
body {
.footer-fix {
padding-bottom: 112px;
}
}
}
@include respond-above(sm) {
body {
padding-bottom: 168px;
.pusher {
padding-bottom: 240px !important;
}
.footer-fix {
min-height: calc(100vh - 168px);
}
.sb-mid-container-min-height {
min-height: calc(100vh - 288px);
......@@ -64,16 +41,13 @@ body {
}
}
@include respond-below(sm) {
.footer-fix {
min-height: calc(100vh - 336px);
padding-bottom: $base-block-space * 3;
.download-mobile-app .download-mobile-app-logo{
min-height: 116px;
}
}
.sb-offline {
padding-bottom: 0px;
// .footer-fix {
// min-height: calc(100vh - 180px);
// }
}
*[lang="en"] body {
......@@ -106,8 +80,12 @@ body {
border-left: 1px solid rgba(51, 51, 51, 0.1);
}
}
@include respond-above(sm) {
.download-mobile-app .download-mobile-app-logo{
min-height: 168px;
}
}
}
[dir="ltr"] {
.sb-explore-qr-container {
.dial-section-column {
......@@ -243,6 +221,12 @@ app-workspace {
}
}
}
.sb-workspace-bg{
position: relative;
bottom: -35px;
height: auto;
margin-top: -35px;
}
// common consumption cards for library
.sb-library-cards{
......
......@@ -152,17 +152,22 @@
}
}
@media screen and (max-width: 900px) {
.footer{
padding: 20px 0;
}
}
@media screen and (max-width: 767px) {
.download-mobile-app {
bottom: 206px;
margin: 0 auto;
right: 0;
left: 0;
z-index: inherit;
box-shadow: 0 -5px 20px 5px rgba(0, 0, 0, 0.2);
.app-download{
padding-top: 12px;
}
a {
padding-bottom: 0 !important;
}
......@@ -182,11 +187,11 @@
}
.footer {
max-height: 206px;
max-height: 230px;
.footerMenu {
ul {
margin-top: 0 !important;
margin-bottom: 24px !important;
margin-bottom: 0px !important;
}
li {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment