Go 100% SASS (CC-28)

pull/56/head
HardiReady 2019-02-22 08:14:46 +01:00
parent 66e5b2db9e
commit 143fb734f3
111 changed files with 130 additions and 64 deletions

View File

@ -21,9 +21,10 @@
"src/favicon.ico"
],
"styles": [
"src/styles.css",
"src/styles.scss",
"node_modules/jquery-ui-bundle/jquery-ui.css",
"node_modules/bootstrap/dist/css/bootstrap.min.css"
"node_modules/bootstrap/dist/css/bootstrap.min.css",
"node_modules/@angular/material/prebuilt-themes/deeppurple-amber.css",
],
"scripts": [
"node_modules/jquery/dist/jquery.js",
@ -146,4 +147,4 @@
"prefix": "app"
}
}
}
}

View File

@ -0,0 +1 @@
@import url('../style/overview.scss');

View File

@ -3,7 +3,7 @@ import {Component} from '@angular/core';
@Component({
selector: 'cc-admin-component',
templateUrl: './admin.component.html',
styleUrls: ['./admin.component.css', '../style/overview.css']
styleUrls: ['./admin.component.scss']
})
export class AdminComponent {
constructor() {

View File

@ -0,0 +1,2 @@
@import url('../../style/entry-form.scss');
@import url('../../style/overview.scss');

View File

@ -11,7 +11,7 @@ import {AppUserService} from '../../services/app-user-service/app-user.service';
@Component({
templateUrl: './edit-app-user.component.html',
styleUrls: ['./edit-app-user.component.css', '../../style/entry-form.css', '../../style/overview.css'],
styleUrls: ['./edit-app-user.component.scss'],
})
export class EditAppUserComponent implements OnInit {

View File

@ -1,3 +1,5 @@
@import url('../../style/list-entry.scss');
.icon-award {
width: 27px;
height: 42px;

View File

@ -5,7 +5,7 @@ import {Fraction} from '../../utils/fraction.enum';
@Component({
selector: 'cc-app-user-item',
templateUrl: './app-user-item.component.html',
styleUrls: ['./app-user-item.component.css', '../../style/list-entry.css'],
styleUrls: ['./app-user-item.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class AppUserItemComponent {

View File

@ -0,0 +1 @@
@import url('../../style/select-list.scss');

View File

@ -14,7 +14,7 @@ import {SquadService} from '../../services/army-management/squad.service';
@Component({
selector: 'cc-app-user-list',
templateUrl: './app-user-list.component.html',
styleUrls: ['./app-user-list.component.css', '../../style/select-list.css']
styleUrls: ['./app-user-list.component.scss']
})
export class AppUserListComponent {

View File

@ -5,7 +5,7 @@ import {Fraction} from '../../utils/fraction.enum';
@Component({
selector: 'cc-army-squad',
templateUrl: './army-squad.component.html',
styleUrls: ['./army-squad.component.css']
styleUrls: ['./army-squad.component.scss']
})
export class ArmySquadComponent {

View File

@ -3,7 +3,7 @@ import {Component, OnInit} from '@angular/core';
@Component({
selector: 'app-not-found',
templateUrl: 'not-found.component.html',
styleUrls: ['not-found.component.css']
styleUrls: ['not-found.component.scss']
})
export class NotFoundComponent implements OnInit {

View File

@ -4,7 +4,7 @@ import {Fraction} from '../../../utils/fraction.enum';
@Component({
selector: 'cc-list-filter',
templateUrl: './list-filter.component.html',
styleUrls: ['./list-filter.component.css']
styleUrls: ['./list-filter.component.scss']
})
export class ListFilterComponent {

View File

@ -5,7 +5,7 @@ import {ActivatedRoute} from '@angular/router';
@Component({
selector: 'cc-list-search',
templateUrl: './search-field.component.html',
styleUrls: ['./search-field.component.css']
styleUrls: ['./search-field.component.scss']
})
export class SearchFieldComponent implements OnInit {

View File

@ -8,7 +8,7 @@ import {SnackBarService} from '../services/user-interface/snack-bar/snack-bar.se
@Component({
moduleId: module.id,
templateUrl: 'login.component.html',
styleUrls: ['login.component.css']
styleUrls: ['login.component.scss']
})
export class LoginComponent implements OnInit {

View File

@ -8,7 +8,7 @@ import {SnackBarService} from '../services/user-interface/snack-bar/snack-bar.se
@Component({
moduleId: module.id,
templateUrl: './signup.component.html',
styleUrls: ['./login.component.css']
styleUrls: ['./login.component.scss']
})
export class SignupComponent implements OnInit {

View File

@ -0,0 +1 @@
@import url('../../../style/list-entry.scss');

View File

@ -5,7 +5,7 @@ import {Fraction} from '../../../utils/fraction.enum';
@Component({
selector: 'decoration-item',
templateUrl: './decoration-item.component.html',
styleUrls: ['./decoration-item.component.css', '../../../style/list-entry.css'],
styleUrls: ['./decoration-item.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class DecorationItemComponent implements OnInit {

View File

@ -0,0 +1 @@
@import url('../../../style/select-list.scss');

View File

@ -13,7 +13,7 @@ import {TranslateService} from '@ngx-translate/core';
@Component({
selector: 'cc-decoration-list',
templateUrl: './decoration-list.component.html',
styleUrls: ['./decoration-list.component.css', '../../../style/select-list.css']
styleUrls: ['./decoration-list.component.scss']
})
export class DecorationListComponent implements OnInit {

View File

@ -0,0 +1,2 @@
@import url('../../../style/entry-form.scss');
@import url('../../../style/overview.scss');

View File

@ -10,7 +10,7 @@ import {TranslateService} from '@ngx-translate/core';
@Component({
templateUrl: './edit-decoration.component.html',
styleUrls: ['./edit-decoration.component.css', '../../../style/entry-form.css', '../../../style/overview.css']
styleUrls: ['./edit-decoration.component.scss']
})
export class EditDecorationComponent implements OnInit, OnDestroy {

View File

@ -0,0 +1,2 @@
@import url('../../../style/entry-form.scss');
@import url('../../../style/overview.scss');

View File

@ -11,7 +11,7 @@ import {TranslateService} from '@ngx-translate/core';
@Component({
templateUrl: './edit-rank.component.html',
styleUrls: ['./edit-rank.component.css', '../../../style/entry-form.css', '../../../style/overview.css']
styleUrls: ['./edit-rank.component.scss']
})
export class EditRankComponent implements OnInit, OnDestroy {

View File

@ -1,3 +1,5 @@
@import url('../../../style/list-entry.scss');
.rank-list-preview {
height: 54px;
float: left;

View File

@ -5,7 +5,7 @@ import {Fraction} from '../../../utils/fraction.enum';
@Component({
selector: 'cc-rank-item',
templateUrl: './rank-item.component.html',
styleUrls: ['./rank-item.component.css', '../../../style/list-entry.css'],
styleUrls: ['./rank-item.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class RankItemComponent implements OnInit {

View File

@ -0,0 +1 @@
@import url('../../../style/select-list.scss');

View File

@ -13,7 +13,7 @@ import {TranslateService} from '@ngx-translate/core';
@Component({
selector: 'cc-rank-list',
templateUrl: './rank-list.component.html',
styleUrls: ['./rank-list.component.css', '../../../style/select-list.css']
styleUrls: ['./rank-list.component.scss']
})
export class RankListComponent implements OnInit {

View File

@ -0,0 +1,2 @@
@import url('../../../style/entry-form.scss');
@import url('../../../style/overview.scss');

View File

@ -11,7 +11,7 @@ import {TranslateService} from '@ngx-translate/core';
@Component({
templateUrl: './edit-squad.component.html',
styleUrls: ['./edit-squad.component.css', '../../../style/entry-form.css', '../../../style/overview.css']
styleUrls: ['./edit-squad.component.scss']
})
export class EditSquadComponent implements OnInit, OnDestroy {

View File

@ -0,0 +1 @@
@import url('../../../style/list-entry.scss');

View File

@ -5,7 +5,7 @@ import {Fraction} from '../../../utils/fraction.enum';
@Component({
selector: 'cc-squad-item',
templateUrl: './squad-item.component.html',
styleUrls: ['./squad-item.component.css', '../../../style/list-entry.css'],
styleUrls: ['./squad-item.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class SquadItemComponent implements OnInit {

View File

@ -1,3 +0,0 @@
.search-bar {
padding-bottom: 20px;
}

View File

@ -0,0 +1,5 @@
@import url('../../../style/select-list.scss');
.search-bar {
padding-bottom: 20px;
}

View File

@ -13,7 +13,7 @@ import {TranslateService} from '@ngx-translate/core';
@Component({
selector: 'cc-squad-list',
templateUrl: './squad-list.component.html',
styleUrls: ['./squad-list.component.css', '../../../style/select-list.css']
styleUrls: ['./squad-list.component.scss']
})
export class SquadListComponent implements OnInit {

View File

@ -1,3 +1,6 @@
@import url('../../../style/overview.scss');
@import url('../../../style/hide-scrollbar.scss');
.decoration-preview {
background-color: white;
padding: 5px;

View File

@ -11,7 +11,7 @@ import {TranslateService} from '@ngx-translate/core';
@Component({
templateUrl: './award-user.component.html',
styleUrls: ['./award-user.component.css', '../../../style/overview.css', '../../../style/hide-scrollbar.css'],
styleUrls: ['./award-user.component.scss'],
})
export class AwardUserComponent implements OnInit {

View File

@ -0,0 +1,2 @@
@import url('../../../style/entry-form.scss');
@import url('../../../style/overview.scss');

View File

@ -12,7 +12,7 @@ import {SnackBarService} from '../../../services/user-interface/snack-bar/snack-
@Component({
templateUrl: './edit-user.component.html',
styleUrls: ['./edit-user.component.css', '../../../style/entry-form.css', '../../../style/overview.css'],
styleUrls: ['./edit-user.component.scss'],
})
export class EditUserComponent implements OnInit {

View File

@ -1,3 +1,5 @@
@import url('../../../style/list-entry.scss');
.icon-award {
width: 27px;
height: 42px;

View File

@ -6,7 +6,7 @@ import {LoginService} from '../../../services/app-user-service/login-service';
@Component({
selector: 'cc-user-item',
templateUrl: './user-item.component.html',
styleUrls: ['./user-item.component.css', '../../../style/list-entry.css'],
styleUrls: ['./user-item.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class UserItemComponent {

View File

@ -0,0 +1 @@
@import url('../../../style/select-list.scss');

View File

@ -14,7 +14,7 @@ import {TranslateService} from '@ngx-translate/core';
@Component({
selector: 'cc-user-list',
templateUrl: './user-list.component.html',
styleUrls: ['./user-list.component.css', '../../../style/select-list.css']
styleUrls: ['./user-list.component.scss']
})
export class UserListComponent {

View File

@ -7,7 +7,7 @@ import {Fraction} from '../../../utils/fraction.enum';
@Component({
selector: 'cc-decoration-panel',
templateUrl: './decoration-panel.component.html',
styleUrls: ['./decoration-panel.component.css']
styleUrls: ['./decoration-panel.component.scss']
})
export class DecorationPanelComponent {

View File

@ -5,7 +5,7 @@ import {Fraction} from '../../../utils/fraction.enum';
@Component({
selector: 'cc-rank-panel',
templateUrl: './rank-panel.component.html',
styleUrls: ['./rank-panel.component.css']
styleUrls: ['./rank-panel.component.scss']
})
export class RankPanelComponent {

View File

@ -1,3 +1,5 @@
@import url('../../style/overview.scss');
.overview {
width: 100% !important;
margin-left: 25px !important;

View File

@ -11,7 +11,7 @@ import {SnackBarService} from '../../services/user-interface/snack-bar/snack-bar
@Component({
templateUrl: './req-award.component.html',
styleUrls: ['./req-award.component.css', '../../style/overview.css'],
styleUrls: ['./req-award.component.scss'],
})
export class RequestAwardComponent implements OnInit {

View File

@ -1,3 +1,5 @@
@import url('../../style/overview.scss');
.overview {
margin-left: 25px !important;
}

View File

@ -7,7 +7,7 @@ import {SnackBarService} from '../../services/user-interface/snack-bar/snack-bar
@Component({
templateUrl: './confirm-award.component.html',
styleUrls: ['./confirm-award.component.css', '../../style/overview.css'],
styleUrls: ['./confirm-award.component.scss'],
})
export class ConfirmAwardComponent implements OnInit {

View File

@ -1,3 +1,5 @@
@import url('../../style/overview.scss');
.overview {
margin-left: 25px !important;
}

View File

@ -8,7 +8,7 @@ import {SnackBarService} from '../../services/user-interface/snack-bar/snack-bar
@Component({
templateUrl: './confirm-promotion.component.html',
styleUrls: ['./confirm-promotion.component.css', '../../style/overview.css'],
styleUrls: ['./confirm-promotion.component.scss'],
})
export class ConfirmPromotionComponent implements OnInit {

View File

@ -1,3 +1,5 @@
@import url('../../style/overview.scss');
.overview {
margin-left: 25px !important;
}

View File

@ -11,7 +11,7 @@ import {SnackBarService} from '../../services/user-interface/snack-bar/snack-bar
@Component({
templateUrl: './req-promotion.component.html',
styleUrls: ['./req-promotion.component.css', '../../style/overview.css'],
styleUrls: ['./req-promotion.component.scss'],
})
export class RequestPromotionComponent implements OnInit {

View File

@ -5,7 +5,7 @@ import {SettingsService} from '../services/settings.service';
@Component({
selector: 'cc-request-root',
templateUrl: 'request.component.html',
styleUrls: ['request.component.css']
styleUrls: ['request.component.scss']
})
export class RequestComponent {
constructor(private translate: TranslateService,

View File

@ -1,3 +1,5 @@
@import url('../../style/overview.scss');
.overview {
margin-left: 25px !important;
}

View File

@ -9,7 +9,7 @@ import {AwardingService} from '../../services/army-management/awarding.service';
@Component({
templateUrl: './sql-dashboard.component.html',
styleUrls: ['./sql-dashboard.component.css', '../../style/overview.css'],
styleUrls: ['./sql-dashboard.component.scss'],
})
export class SqlDashboardComponent implements OnInit {

View File

@ -15,7 +15,7 @@ import {CampaignService} from '../../../services/logs/campaign.service';
@Component({
selector: 'campaign-navigation',
templateUrl: './campaign-navigation.component.html',
styleUrls: ['./campaign-navigation.component.css']
styleUrls: ['./campaign-navigation.component.scss']
})
export class CampaignNavigationComponent implements OnInit {

View File

@ -1,3 +1,7 @@
@import url('../../../style/overview.scss');
@import url('../../../style/list-entry.scss');
@import url('../../../style/hide-scrollbar.scss');
.player-campaign-detail-container {
padding: 0 1% 0 1%;
border-top: thin solid lightgrey;

View File

@ -9,8 +9,7 @@ import {TranslateService} from '@ngx-translate/core';
@Component({
selector: 'campaign-player-detail',
templateUrl: './campaign-player-detail.component.html',
styleUrls: ['./campaign-player-detail.component.scss', '../../../style/list-entry.css',
'../../../style/hide-scrollbar.css', '../../../style/overview.css']
styleUrls: ['./campaign-player-detail.component.scss']
})
export class CampaignPlayerDetailComponent implements OnInit {

View File

@ -1,3 +0,0 @@
form {
margin-top: 45px;
}

View File

@ -0,0 +1,6 @@
@import url('../../../style/entry-form.scss');
@import url('../../../style/overview.scss');
form {
margin-top: 45px;
}

View File

@ -10,7 +10,7 @@ import {SnackBarService} from '../../../services/user-interface/snack-bar/snack-
@Component({
selector: 'campaign-submit',
templateUrl: './campaign-submit.component.html',
styleUrls: ['./campaign-submit.component.css', '../../../style/entry-form.css', '../../../style/overview.css']
styleUrls: ['./campaign-submit.component.scss']
})
export class CampaignSubmitComponent {

View File

@ -1,3 +1,9 @@
@import url('../../../style/overview.scss');
@import url('../../../style/list-entry.scss');
$highscore-table-width: 320px;
$highscore-table-height: 394px;
h2 {
margin-left: 10%;
}
@ -12,8 +18,9 @@ h2 {
}
.highscore-table-container {
width: 320px;
max-height: 394px;
width: $highscore-table-width;
min-height: $highscore-table-height;
max-height: $highscore-table-height;
margin: 50px 0 50px 8%;
float: left;
overflow-x: hidden;
@ -28,7 +35,7 @@ h2 {
:host /deep/ table.mat-table > thead {
position: absolute;
width: 320px;
width: $highscore-table-width;
display: inherit;
margin-left: -1px;
margin-top: -57px;

View File

@ -11,7 +11,7 @@ import {PlayerUtils} from '../../../utils/player-utils';
@Component({
selector: 'cc-stats-highscore',
templateUrl: './highscore.component.html',
styleUrls: ['./highscore.component.css', '../../../style/list-entry.css', '../../../style/overview.css']
styleUrls: ['./highscore.component.scss']
})
export class StatisticHighScoreComponent implements OnInit {

View File

@ -9,7 +9,7 @@ import {WarService} from '../../../services/logs/war.service';
@Component({
selector: 'cc-campaign-overview',
templateUrl: './campaign-overview.component.html',
styleUrls: ['./campaign-overview.component.css']
styleUrls: ['./campaign-overview.component.scss']
})
export class StatisticOverviewComponent implements OnInit {

View File

@ -9,7 +9,7 @@ import {WarService} from '../services/logs/war.service';
@Component({
selector: 'cc-stats',
templateUrl: './stats.component.html',
styleUrls: ['./stats.component.css']
styleUrls: ['./stats.component.scss']
})
export class StatisticComponent implements OnInit {

View File

@ -1,3 +1,6 @@
@import url('../../../style/list-entry.scss');
@import url('../../../style/hide-scrollbar.scss');
.chart-select-group {
display: flex;
width: fit-content;

View File

@ -8,7 +8,7 @@ import {TranslateService} from '@ngx-translate/core';
@Component({
selector: 'war-detail-fraction',
templateUrl: './fraction-stats.component.html',
styleUrls: ['./fraction-stats.component.scss', '../../../style/list-entry.css', '../../../style/hide-scrollbar.css']
styleUrls: ['./fraction-stats.component.scss']
})
export class FractionStatsComponent implements OnInit, OnChanges {

View File

@ -1,3 +1,6 @@
@import url('../../../style/list-entry.scss');
@import url('../../../style/hide-scrollbar.scss');
.scoreboard-table {
width: 1058px;
margin: auto;

View File

@ -10,7 +10,7 @@ import {TranslateService} from '@ngx-translate/core';
@Component({
selector: 'cc-scoreboard',
templateUrl: './scoreboard.component.html',
styleUrls: ['./scoreboard.component.css', '../../../style/list-entry.css', '../../../style/hide-scrollbar.css']
styleUrls: ['./scoreboard.component.scss']
})
export class ScoreboardComponent implements OnChanges {

View File

@ -1,3 +1,6 @@
@import url('../../../style/list-entry.scss');
@import url('../../../style/hide-scrollbar.scss');
.chart-select-group {
display: flex;
width: fit-content;

View File

@ -7,7 +7,7 @@ import {ChartUtils} from '../../../utils/chart-utils';
@Component({
selector: 'cc-server-statistics',
templateUrl: './server-stats.component.html',
styleUrls: ['./server-stats.component.scss', '../../../style/list-entry.css', '../../../style/hide-scrollbar.css']
styleUrls: ['./server-stats.component.scss']
})
export class ServerStatsComponent implements OnInit, OnChanges {

View File

@ -1,3 +1,6 @@
@import url('../../../style/list-entry.scss');
@import url('../../../style/hide-scrollbar.scss');
.war-header-container {
width: 920px;
min-height: 165px;

View File

@ -11,7 +11,7 @@ import {ScoreboardComponent} from '../scoreboard/scoreboard.component';
@Component({
selector: 'war-detail',
templateUrl: './war-header.component.html',
styleUrls: ['./war-header.component.scss', '../../../style/list-entry.css', '../../../style/hide-scrollbar.css']
styleUrls: ['./war-header.component.scss']
})
export class WarHeaderComponent implements OnInit {

View File

@ -5,7 +5,7 @@ import {LoginService} from '../../../services/app-user-service/login-service';
@Component({
selector: 'cc-war-item',
templateUrl: './war-item.component.html',
styleUrls: ['./war-item.component.css'],
styleUrls: ['./war-item.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class WarItemComponent implements OnInit {

View File

@ -10,7 +10,7 @@ import {TranslateService} from '@ngx-translate/core';
@Component({
selector: 'war-list',
templateUrl: './war-list.component.html',
styleUrls: ['./war-list.component.css']
styleUrls: ['./war-list.component.scss']
})
export class WarListComponent implements OnChanges {

Some files were not shown because too many files have changed in this diff Show More