diff --git a/static/src/app/app.component.css b/static/src/app/app.component.css index cb9e8f2..42e7aed 100644 --- a/static/src/app/app.component.css +++ b/static/src/app/app.component.css @@ -1,10 +1,3 @@ -html { - height: 100%; -} -body { - min-height: 100%; -} - ul { list-style-type: none; margin: 0; @@ -15,17 +8,6 @@ li { display: inline; } -.sidebar-toggle-btn { - background: #dadada; - filter: drop-shadow(2px 1px 1px #666); - margin-left: -12px; - z-index: 500; -} - -.sidebar-toggle-btn mat-icon.mat-icon { - color: #666666; -} - .content { padding-left: 15px; padding-right: 15px; diff --git a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.css b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.css index 96a4486..0696913 100644 --- a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.css +++ b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.css @@ -1,6 +1,6 @@ .scroll-btn { position: absolute; - height: 53px; + height: 46px; width: 32px; cursor: pointer; } @@ -8,15 +8,11 @@ .scroll-btn-right { top: 50px; left: calc(100vw - 45px); - background: linear-gradient(to right, rgba(255, 255, 255, 0.89), white); -} - -.scroll-btn-left { - background: linear-gradient(to right, white, rgba(255, 255, 255, 0.89)); } .scroll-btn mat-icon { - height: 53px + height: 46px; + width: 28px; } .campaign-horizontal-list { @@ -26,13 +22,12 @@ margin: 0; padding: 0; overflow: hidden; - box-shadow: #dadada 0 1px 5px; + box-shadow: #666666 1px 1px 4px; } .campaign-entry { border: 1px solid #222222; - min-width: 120px; - width: 20%; + min-width: 20%; max-height: 4em; padding: 10px 0; text-align: center; diff --git a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.html b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.html index f471bfa..b2835f7 100644 --- a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.html +++ b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.html @@ -1,4 +1,4 @@ -
diff --git a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.ts b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.ts index aec1481..c18ed75 100644 --- a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.ts +++ b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.ts @@ -1,4 +1,4 @@ -import {Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild} from '@angular/core'; +import {Component, ElementRef, EventEmitter, Input, OnChanges, Output, ViewChild} from '@angular/core'; import {Campaign} from '../../../models/model-interfaces'; @Component({ @@ -6,7 +6,7 @@ import {Campaign} from '../../../models/model-interfaces'; templateUrl: './campaign-navigation.component.html', styleUrls: ['./campaign-navigation.component.css'] }) -export class CampaignNavigationComponent implements OnInit { +export class CampaignNavigationComponent implements OnChanges { @Input() campaigns: Campaign[]; @@ -22,7 +22,7 @@ export class CampaignNavigationComponent implements OnInit { repeater; - ngOnInit() { + ngOnChanges() { this.isRightScrollVisible = this.campaigns.length > 4; } diff --git a/static/src/assets/bg.jpg b/static/src/assets/bg.jpg index ff37a15..f1a1755 100644 Binary files a/static/src/assets/bg.jpg and b/static/src/assets/bg.jpg differ