diff --git a/src/app/core/services/product.service.ts b/src/app/core/services/product.service.ts index 6e74d2c1..7494a356 100644 --- a/src/app/core/services/product.service.ts +++ b/src/app/core/services/product.service.ts @@ -34,7 +34,7 @@ export class ProductService { * * @memberof ProductService */ - getTaxonomies(): any { return this.http.get>(`api/v1/taxonomies`) } + getTaxonomies(): any { return this.http.get>(`api/v1/taxonomies?set=nested`) } /** * diff --git a/src/app/home/content/product-list/product-list.component.scss b/src/app/home/content/product-list/product-list.component.scss index 2135c3dc..7219b676 100644 --- a/src/app/home/content/product-list/product-list.component.scss +++ b/src/app/home/content/product-list/product-list.component.scss @@ -9,12 +9,17 @@ -webkit-transition: visibility 0s, opacity .5s linear; transition: visibility 0s, opacity .5s linear; visibility: hidden; - opacity: 0; + opacity: 1; } .product-base { flex: 0 0 23%; max-width: 23%; + @media screen and (min-width: 320px) and (max-width: 767px) { + margin:0px !important; + flex: 0 0 100%; + max-width: 100%; + } text-align: left; position: relative; background-color: $white; @@ -25,7 +30,7 @@ transition: all 500ms; border: 1px solid $gray-600; // margin: 0 30px 20px 0; box-shadow: 0px 0px 1px #ccc; - &:hover{ + &:hover { box-shadow: 0px 0px 3px #ccc; } a { @@ -69,6 +74,7 @@ } } } + .morechoices { background-color: $gray-400; color: $white; @@ -77,11 +83,12 @@ padding: .2rem; text-align: center; } + .shipping { font-size: 0.8em; font-weight: 400; text-align: left; margin-top: 15px; - color: #000; + color: $black; margin-bottom: 0px; } \ No newline at end of file diff --git a/src/app/home/filter-mobile-menu/filter-mobile-menu.component.html b/src/app/home/filter-mobile-menu/filter-mobile-menu.component.html new file mode 100644 index 00000000..50b47e17 --- /dev/null +++ b/src/app/home/filter-mobile-menu/filter-mobile-menu.component.html @@ -0,0 +1,69 @@ + + + Yes + + No +

Supply

+

Demand

+ + + + +
+ I can have markup! + Some HTML here +
+ +
+
+ + +
+ {{taxon.name}} + Some HTML here +
+
+ + +
+ {{subtaxon.name}} +
+
+ {{ subsubtaxon.name }} +
+ + +
+ + +
+
+ + + + +
+ I can have markup, too! +
+ And some HTML here + + \ No newline at end of file diff --git a/src/app/home/filter-mobile-menu/filter-mobile-menu.component.scss b/src/app/home/filter-mobile-menu/filter-mobile-menu.component.scss new file mode 100644 index 00000000..0d0a7c55 --- /dev/null +++ b/src/app/home/filter-mobile-menu/filter-mobile-menu.component.scss @@ -0,0 +1,54 @@ +@import '../../shared/scss/selected_theme_variables'; +ul { + + list-style: none; + padding: 0.5rem 0 0.5rem 0; + margin: 0px; + li { + padding: 0.8rem 1.1rem; + border-bottom: 1px solid $gray-10; + color: $gray-900; + cursor: pointer; + &::after { + font-family: 'FontAwesome'; + content: "\f105"; + width: 20px; + height: 57px; + margin-right: 12px; + right: 0px; + position: absolute; + background-size: 10px; + } + + } +} + +.parrent-catgory { + width: 100vw; + left: 0vw; + position: relative; +} + +.sub-catgory { + @extend .parrent-catgory; + left: -100vw; +} + +.sub-sub-catgory { + @extend .parrent-catgory; +} + +.radio-pink [type="radio"]:checked+label:after { + border-color: #e91e63; + background-color: #e91e63; +} +/*Gap*/ + +.radio-pink-gap [type="radio"].with-gap:checked+label:before { + border-color: #e91e63; +} + +.radio-pink-gap [type="radio"]:checked+label:after { + border-color: #e91e63; + background-color: #e91e63; +} diff --git a/src/app/home/filter-mobile-menu/filter-mobile-menu.component.spec.ts b/src/app/home/filter-mobile-menu/filter-mobile-menu.component.spec.ts new file mode 100644 index 00000000..034810d9 --- /dev/null +++ b/src/app/home/filter-mobile-menu/filter-mobile-menu.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CategoryMobileMenuComponent } from './category-mobile-menu.component'; + +describe('CategoryMobileMenuComponent', () => { + let component: CategoryMobileMenuComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CategoryMobileMenuComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CategoryMobileMenuComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/home/filter-mobile-menu/filter-mobile-menu.component.ts b/src/app/home/filter-mobile-menu/filter-mobile-menu.component.ts new file mode 100644 index 00000000..db9e02d2 --- /dev/null +++ b/src/app/home/filter-mobile-menu/filter-mobile-menu.component.ts @@ -0,0 +1,86 @@ +import { Component, OnInit ,Input } from '@angular/core'; +import { + trigger, + state, + style, + animate, + transition +} from '@angular/animations'; +@Component({ + selector: 'app-filter-mobile-menu', + templateUrl: './filter-mobile-menu.component.html', + styleUrls: ['./filter-mobile-menu.component.scss'], + animations: [ + trigger('popOverState', [ + state('show', style({ + left: -100 + 'vw' + })), + state('hide', style({ + left: 0 + })), + transition('show => hide', animate('100ms ease-out')), + transition('hide => show', animate('200ms ease-in')) + ]), + trigger('subCatgory', [ + state('show', style({ + left: -200 + 'vw' + })), + state('hide', style({ + left: -100 + })), + transition('show => hide', animate('100ms ease-out')), + transition('hide => show', animate('200ms ease-in')) + ]) + + ] +}) +export class filterMobileMenuComponent implements OnInit { + + users = [ + {name: "Anil Singh", qualification: ["B.Sc.", "MCA", "MCTS", "MCP"]}, + {name: "Reena Singh", qualification: ["B A", "M A", "BTC"]} + ]; + + @Input() fillterList; + @Input() isScrolled; + + @Input() screenwidth; + subChild:any; + dropdownWidth: any; + menuTaxons: any; + autoclose: boolean; + queryParams: any; + showParrent = false; + showChild = false; + backBtnShow = false; + constructor() {} + showCategory(taxon) { + this.menuTaxons = taxon.taxons; + console.log(taxon); + console.log(this.menuTaxons) + } + get stateName() { + return this.showParrent ? 'show' : 'hide' + } + + get stateName1() { + return this.showChild ? 'show' : 'hide' + } + + showSubCategory(i) { + this.showChild = !this.showChild; + this.subChild = this.menuTaxons.taxons[i]; + } + parrentBack(){ + this.showParrent = !this.showParrent; + } + childBack(){ + console.log(this.showChild) ; + this.showChild = !this.showChild; + } + + + ngOnInit() { + + } +} diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 5681cbc1..bdb07c45 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -4,10 +4,10 @@
+ -
-

Searched Results For

+

Searched Results For

diff --git a/src/app/home/home.component.scss b/src/app/home/home.component.scss index be1d9e18..e73ff8d4 100644 --- a/src/app/home/home.component.scss +++ b/src/app/home/home.component.scss @@ -7,3 +7,15 @@ } h1{font-size: 1.7em;color:$gray-900} } + +.filter-mobile-menu{ + width:100Vw; + + margin:0px; + margin-top: 20vh; + .modal-content{ + border:0px solid $gray-100; + border-radius:0px; + } + accordion-group{cursor: pointer;} +} diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index c4b8775b..c0c8116e 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -8,7 +8,12 @@ import { AppState } from './../interfaces'; import { getProducts, getTaxonomies, showAllProducts } from './../product/reducers/selectors'; import { Store } from '@ngrx/store'; import { Observable } from 'rxjs'; -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit,ViewChild } from '@angular/core'; +import { TemplateRef } from '@angular/core'; +import { BsModalService } from 'ngx-bootstrap/modal'; +import { BsModalRef } from 'ngx-bootstrap/modal/bs-modal-ref.service'; +import { Directive, Renderer2, ElementRef} from '@angular/core'; +import { ModalDirective } from 'ngx-bootstrap/modal'; import { Product } from '../core/models/product'; @Component({ @@ -25,7 +30,10 @@ export class HomeComponent implements OnInit { products: any; isProducts = false; isFilterOn = false; - + isBrandOpen = false; + isCategoryOpen = true; + fillterList :any; + constructor( private store: Store, private actions: ProductActions, @@ -43,9 +51,31 @@ export class HomeComponent implements OnInit { this.products = data if (this.products.count) { this.isProducts = true } else { this.isProducts = false } }) + this.store.select(getTaxonomies) + .subscribe(data => { + this.fillterList = data; + console.log(this.fillterList); + }) + } + + @ViewChild('autoShownModal') autoShownModal: ModalDirective; + isModalShown: boolean = false; + + showModal(): void { + this.isModalShown = true; + } + + hideModal(): void { + this.autoShownModal.hide(); + } + + onHidden(): void { + this.isModalShown = false; + } + ngOnInit() { + console.log(this.fillterList); } - ngOnInit() { } OnCategeorySelected(category) { // TODO: Here taxonomies_id is hardcoded for now. this.store.dispatch(this.searchActions.getChildTaxons('5', category.id)); @@ -59,4 +89,10 @@ export class HomeComponent implements OnInit { showAll() { this.isFilterOn = false } + + isOpenChangeaccourdian() + { + this.isCategoryOpen =! this.isCategoryOpen; + console.log(this.isCategoryOpen); + } } diff --git a/src/app/home/index.ts b/src/app/home/index.ts index e0e39409..76546df4 100644 --- a/src/app/home/index.ts +++ b/src/app/home/index.ts @@ -21,8 +21,8 @@ import { ProductActions } from './../product/actions/product-actions'; import { SearchActions } from './reducers/search.actions'; import { SharedModule } from './../shared/index'; import { CarouselModule } from 'ngx-bootstrap/carousel'; - - +import { ModalModule } from 'ngx-bootstrap'; +import { AccordionModule } from 'ngx-bootstrap'; // Components import { HomeComponent } from './home.component'; // Breadcrumb components @@ -38,6 +38,7 @@ import { ContentComponent } from './content/content'; // Sidebar components import { TaxonsComponent } from './sidebar/taxons/taxons.component'; import { FilterComponent } from './sidebar/filter/filter.component'; +import {filterMobileMenuComponent } from './filter-mobile-menu/filter-mobile-menu.component' // Routes import { HomeRoutes as routes } from './home.routes'; @@ -68,6 +69,7 @@ import { reducers } from './reducers/index'; LpTrItemComponent, CategoriesComponent, BrandFilterComponent, + filterMobileMenuComponent, // pipes FilterPipe @@ -79,6 +81,8 @@ import { reducers } from './reducers/index'; CarouselModule, DragScrollModule, PaginationModule.forRoot(), + ModalModule.forRoot(), + AccordionModule.forRoot(), /** * StoreModule.forFeature is used for composing state diff --git a/src/app/layout/footer/footer.component.scss b/src/app/layout/footer/footer.component.scss index 507f0885..43be3531 100644 --- a/src/app/layout/footer/footer.component.scss +++ b/src/app/layout/footer/footer.component.scss @@ -1,7 +1,13 @@ @import "../../shared/scss/_selected_theme_variables.scss"; footer { height: 50px; + position: absolute; + right: 0; + bottom: -60px; + left: 0; + background-color: #efefef; + text-align: center; } .quicklinks { diff --git a/src/app/layout/header/components/categories-menu-dropdown/categories-menu-dropdown.component.html b/src/app/layout/header/components/categories-menu-dropdown/categories-menu-dropdown.component.html index a23daed3..3015e04e 100644 --- a/src/app/layout/header/components/categories-menu-dropdown/categories-menu-dropdown.component.html +++ b/src/app/layout/header/components/categories-menu-dropdown/categories-menu-dropdown.component.html @@ -1,14 +1,13 @@
- - - - - - - - - - - - - - - - - -
- - +
\ No newline at end of file diff --git a/src/app/layout/header/components/categories-menu-dropdown/categories-menu-dropdown.component.scss b/src/app/layout/header/components/categories-menu-dropdown/categories-menu-dropdown.component.scss index c7851904..f5e8ff16 100644 --- a/src/app/layout/header/components/categories-menu-dropdown/categories-menu-dropdown.component.scss +++ b/src/app/layout/header/components/categories-menu-dropdown/categories-menu-dropdown.component.scss @@ -1,3 +1,4 @@ +@import '../../../../shared/scss/selected_theme_variables'; .dropdown-menu { width: 50rem; padding: 0px; @@ -11,12 +12,12 @@ ul { list-style: none; padding: 0.5rem 0 0.5rem 1.5rem; margin: 0px; - background-color: #adadad; + background-color: $gray-10; li { padding: 0.5rem 0.4rem; - background-color: #adadad; - border-bottom: 1px solid #ccc; - color: #fff; + background-color: $gray-10; + border-bottom: 1px solid $gray-10; + color: $white; cursor: pointer; &::after { font-family: 'FontAwesome'; @@ -29,11 +30,11 @@ ul { background-size: 10px; } &:hover::after { - color: #a3d032 + color: $theme-main-color } &:hover { - background-color: #fff; - color: #a3d032; + background-color: $white; + color: $theme-main-color; border-radius: 4px 0px 0px 4px; } uL>LI { diff --git a/src/app/layout/header/components/categories-menu-dropdown/categories-menu-dropdown.component.ts b/src/app/layout/header/components/categories-menu-dropdown/categories-menu-dropdown.component.ts index 83a5ab39..f8adb0c7 100644 --- a/src/app/layout/header/components/categories-menu-dropdown/categories-menu-dropdown.component.ts +++ b/src/app/layout/header/components/categories-menu-dropdown/categories-menu-dropdown.component.ts @@ -12,8 +12,6 @@ import { } from '@angular/animations'; import { URLSearchParams } from '@angular/http' - - @Component({ selector: 'app-categories-menu-dropdown', templateUrl: './categories-menu-dropdown.component.html', @@ -63,13 +61,11 @@ export class CategoriesMenuDropdownComponent implements OnInit { this.autoclose = true; } } - showCategory(i) { this.menuTaxons = this.taxonomies[0].root.taxons[i]; } - showCategoryonclick(i) { this.show = !this.show; if (this.screenwidth <= 1000) { diff --git a/src/app/layout/header/components/category-mobile-menu/category-mobile-menu.component.html b/src/app/layout/header/components/category-mobile-menu/category-mobile-menu.component.html index d1861e1e..95e81795 100644 --- a/src/app/layout/header/components/category-mobile-menu/category-mobile-menu.component.html +++ b/src/app/layout/header/components/category-mobile-menu/category-mobile-menu.component.html @@ -1,37 +1,19 @@ - -
-
+
  • {{taxon.name}}
-
+
  • Back
  • {{taxon.name}}
-
+
    -
  • Back
    • +
  • Back
  • {{taxon.name}}
diff --git a/src/app/layout/header/components/category-mobile-menu/category-mobile-menu.component.scss b/src/app/layout/header/components/category-mobile-menu/category-mobile-menu.component.scss index c2da9ac6..ed1090ff 100644 --- a/src/app/layout/header/components/category-mobile-menu/category-mobile-menu.component.scss +++ b/src/app/layout/header/components/category-mobile-menu/category-mobile-menu.component.scss @@ -1,16 +1,12 @@ - @import '../../../../shared/scss/selected_theme_variables'; ul { width: 100vw; list-style: none; padding: 0.5rem 0 0.5rem 0; margin: 0px; - li { padding: 0.8rem 1.1rem; - - - border-bottom: 1px solid #ccc; + border-bottom: 1px solid $gray-10; color: $gray-900; cursor: pointer; &::after { @@ -23,12 +19,11 @@ ul { position: absolute; background-size: 10px; } - uL>LI { - POSITION: absolute; - LEFT: 20%; - WIDTH: 78%; - TOP: 0PX; + position: absolute; + left: 20%; + width: 78%; + top: 0PX; display: NONE; } } diff --git a/src/app/layout/header/components/category-mobile-menu/category-mobile-menu.component.ts b/src/app/layout/header/components/category-mobile-menu/category-mobile-menu.component.ts index 8d5d4596..66213562 100644 --- a/src/app/layout/header/components/category-mobile-menu/category-mobile-menu.component.ts +++ b/src/app/layout/header/components/category-mobile-menu/category-mobile-menu.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit ,Input } from '@angular/core'; +import { Component, OnInit, Input } from '@angular/core'; import { trigger, state, @@ -26,7 +26,7 @@ import { left: -200 + 'vw' })), state('hide', style({ - left: -100 + left: -100 })), transition('show => hide', animate('100ms ease-out')), transition('hide => show', animate('200ms ease-in')) @@ -40,7 +40,7 @@ export class CategoryMobileMenuComponent implements OnInit { @Input() isScrolled; @Input() screenwidth; - subChild:any; + subChild: any; dropdownWidth: any; menuTaxons: any; autoclose: boolean; @@ -48,33 +48,33 @@ export class CategoryMobileMenuComponent implements OnInit { showParrent = false; showChild = false; backBtnShow = false; - constructor() {} - showCategory(i) { - this.menuTaxons = this.taxonomies[0].root.taxons[i]; - this.showParrent = !this.showParrent; + constructor() { } + showCategory(i) { + this.menuTaxons = this.taxonomies[0].root.taxons[i]; + this.showParrent = !this.showParrent; } - get stateName() { + get getparrentState() { return this.showParrent ? 'show' : 'hide' } - - get stateName1() { + + get getChildState() { return this.showChild ? 'show' : 'hide' } showSubCategory(i) { - this.showChild = !this.showChild; - this.subChild = this.menuTaxons.taxons[i]; + this.showChild = !this.showChild; + this.subChild = this.menuTaxons.taxons[i]; } - parrentBack(){ - this.showParrent = !this.showParrent; + parrentBack() { + this.showParrent = !this.showParrent; } - childBack(){ - console.log(this.showChild) ; - this.showChild = !this.showChild; + childBack() { + console.log(this.showChild); + this.showChild = !this.showChild; } ngOnInit() { - + } } diff --git a/src/app/layout/header/components/header-cart/header-cart.component.scss b/src/app/layout/header/components/header-cart/header-cart.component.scss index d3435fdc..6dbdd93a 100644 --- a/src/app/layout/header/components/header-cart/header-cart.component.scss +++ b/src/app/layout/header/components/header-cart/header-cart.component.scss @@ -1,4 +1,3 @@ - @media screen and(min-width: 320px) and(max-width: 768px) { .header-cart { font-size: 24px !important; @@ -8,12 +7,11 @@ position: relative; top: -10px; left: -5px; -} -.badge-pill { - padding-right: 0.5em; - padding-left: 0.4em; - border-radius: 11.2rem; - font-size: 0.6em; -} - + } + .badge-pill { + padding-right: 0.5em; + padding-left: 0.4em; + border-radius: 11.2rem; + font-size: 0.6em; + } } \ No newline at end of file diff --git a/src/app/layout/header/components/header-search/header-search.component.html b/src/app/layout/header/components/header-search/header-search.component.html index 6eec4d3e..8dfc4e6e 100644 --- a/src/app/layout/header/components/header-search/header-search.component.html +++ b/src/app/layout/header/components/header-search/header-search.component.html @@ -6,12 +6,12 @@
+ 'bg-white desktop-query-updated':isSearchopen }"> + 'themecolor':isSearchopen }"> -
+
diff --git a/src/app/layout/header/components/header-search/header-search.component.scss b/src/app/layout/header/components/header-search/header-search.component.scss index 1919a080..0a27f01a 100644 --- a/src/app/layout/header/components/header-search/header-search.component.scss +++ b/src/app/layout/header/components/header-search/header-search.component.scss @@ -1,8 +1,8 @@ @import '../../../../shared/scss/selected_theme_variables'; - :host { width: 100%; } + .desktop-query { line-height: 0; margin: 4px 10px 20px 0; @@ -13,18 +13,18 @@ font-size: 16px; height: 20px; line-height: 24px; - color: #696e79; + color: $gray-900; box-sizing: content-box; padding: 8px 10px 10px; margin: 0; outline: 0; - border: 1px solid #d5d6d9; + border: 1px solid $gray-10; border-radius: 4px 0 0 4px; border-right: 0; - background: #f5f5f6; + background: $gray-200; &:focus, &:focus+a.desktop-submit { - background-color: #fff; + background-color: $white; border-color: #14cda8; } } @@ -35,8 +35,8 @@ width: 40px; text-align: center; padding: 8px 0 2px; - background: #f5f5f6; - border: 1px solid #d4d5d9; + background: $gray-200; + border: 1px solid $gray-10; border-left: none; border-radius: 0 4px 4px 0; .desktop-iconSearch { @@ -53,53 +53,56 @@ } } } -.themecolor { - color: #a3d032 !important; +.themecolor { + color: $theme-main-color !important; } + .desktop-query-updated { - background-color: #fff; + background-color: $white; } + @media screen and(min-width: 769px) and(max-width: 1024px) { input.desktop-search-bar { width: 75%; } } + .searchinput { position: absolute; width: 100%; left: 0%; bottom: -48px; - background-color: #a3d032; + background-color: $theme-main-color; padding: 0px 10px 10px 10px; .input.desktop-search-bar { width: 100%; - border: 1px solid #d5d6d9; + border: 1px solid $gray-10; } } + @media screen and(min-width: 320px) and(max-width: 768px) { .desktop-query input.desktop-search-bar { width: 94%; - border-top: 0px solid red; + border-top: 0px solid $theme-main-color; border-radius: 3px; } .desktop-query { padding: 0px 7px 5.9px 4px; - margin-right: 8px; margin-top: 2.2px; border-radius: 4px 4px 0px 0px; margin-bottom: 0px; margin-left: 0px; a.desktop-submit { - color: #fff; + color: $white; height: 28px; width: 19px; text-align: center; font-size: 24px; padding: 5px 5px 1px 5px; background: transparent !important; - border: 0px solid #d4d5d9; + border: 0px solid $gray-10; border-left: none; border-radius: none; .desktop-iconSearch { @@ -107,4 +110,4 @@ } } } -} +} \ No newline at end of file diff --git a/src/app/layout/header/components/header-search/header-search.component.ts b/src/app/layout/header/components/header-search/header-search.component.ts index ed2fb309..852c3beb 100644 --- a/src/app/layout/header/components/header-search/header-search.component.ts +++ b/src/app/layout/header/components/header-search/header-search.component.ts @@ -3,7 +3,7 @@ import { Router, ActivatedRoute } from '@angular/router'; import { SearchActions } from './../../../../home/reducers/search.actions'; import { AppState } from './../../../../interfaces'; import { Store } from '@ngrx/store'; -import { Component, OnInit, Input , Output, EventEmitter} from '@angular/core'; +import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { URLSearchParams } from '@angular/http' @Component({ selector: 'app-header-search', @@ -13,7 +13,7 @@ import { URLSearchParams } from '@angular/http' export class HeaderSearchComponent implements OnInit { queryParams: any; @Input() devicewidth; - @Input() flag; + @Input() isSearchopen; @Output() onSubCatClicked: EventEmitter = new EventEmitter(); constructor( @@ -29,12 +29,12 @@ export class HeaderSearchComponent implements OnInit { }); } ngOnInit() { - + } - showsearch() { - this.flag = !this.flag; - this.onSubCatClicked.emit(false); - + showsearch() { + this.isSearchopen = !this.isSearchopen; + this.onSubCatClicked.emit(false); + } onSearch(keyword: string) { if (keyword !== '') { @@ -89,8 +89,8 @@ export class HeaderSearchComponent implements OnInit { if ('q[s]' in this.queryParams && 'q[name_cont_any]' in this.queryParams) { this.onSearch(this.queryParams['q[name_cont_any]']) } - - + + } - + } diff --git a/src/app/layout/header/components/profile-dropdown/profile-dropdown.component.html b/src/app/layout/header/components/profile-dropdown/profile-dropdown.component.html index e3890322..061d108a 100644 --- a/src/app/layout/header/components/profile-dropdown/profile-dropdown.component.html +++ b/src/app/layout/header/components/profile-dropdown/profile-dropdown.component.html @@ -23,7 +23,6 @@ {{email}} -
-
- -
+
+ +
+ + +
+
\ No newline at end of file diff --git a/src/app/layout/header/components/profile-dropdown/profile-dropdown.component.scss b/src/app/layout/header/components/profile-dropdown/profile-dropdown.component.scss index 93fa7653..a74ade9b 100644 --- a/src/app/layout/header/components/profile-dropdown/profile-dropdown.component.scss +++ b/src/app/layout/header/components/profile-dropdown/profile-dropdown.component.scss @@ -6,4 +6,10 @@ margin-top: -13px; margin-right: 8px; font-size: 24px; +} +.mobile-profile{ + width: 100vw; + min-width: 101.7vw; + left: -60.6vw!important; + height: calc(100vw + 65vw); } \ No newline at end of file diff --git a/src/app/layout/header/header.component.html b/src/app/layout/header/header.component.html index 2e505e90..42ea5460 100644 --- a/src/app/layout/header/header.component.html +++ b/src/app/layout/header/header.component.html @@ -7,17 +7,13 @@ - - - + - Fork me on GitHub -
@@ -27,8 +23,7 @@