TSK-1189 restructure theme files

This commit is contained in:
Chi Nguyen 2020-04-22 11:46:28 +02:00
parent 9a0a94e5be
commit 029d8595b2
41 changed files with 30 additions and 30 deletions

View File

@ -21,7 +21,7 @@
"src/environments/data-sources" "src/environments/data-sources"
], ],
"styles": [ "styles": [
"src/assets/_main.scss" "src/theme/_main.scss"
], ],
"scripts": [ "scripts": [
"node_modules/jquery/dist/jquery.min.js", "node_modules/jquery/dist/jquery.min.js",
@ -80,7 +80,7 @@
"node_modules/bootstrap/dist/js/bootstrap.min.js" "node_modules/bootstrap/dist/js/bootstrap.min.js"
], ],
"styles": [ "styles": [
"src/assets/_main.scss" "src/theme/_main.scss"
], ],
"assets": [ "assets": [
"src/assets", "src/assets",

View File

@ -1,4 +1,4 @@
@import '../../../../assets/colors'; @import '../../../../theme/colors';
.margin { .margin {
margin-top: 10px; margin-top: 10px;

View File

@ -7,7 +7,7 @@ import { ClassificationDefinition, customFieldCount } from 'app/shared/models/cl
import { ACTION } from 'app/shared/models/action'; import { ACTION } from 'app/shared/models/action';
import { AlertModel, AlertType } from 'app/shared/models/alert'; import { AlertModel, AlertType } from 'app/shared/models/alert';
import { highlight } from 'app/shared/animations/validation.animation'; import { highlight } from 'theme/animations/validation.animation';
import { TaskanaDate } from 'app/shared/util/taskana.date'; import { TaskanaDate } from 'app/shared/util/taskana.date';
import { ClassificationsService } from 'app/shared/services/classifications/classifications.service'; import { ClassificationsService } from 'app/shared/services/classifications/classifications.service';

View File

@ -14,7 +14,7 @@ import { GeneralModalService } from 'app/shared/services/general-modal/general-m
import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { AlertService } from 'app/shared/services/alert/alert.service'; import { AlertService } from 'app/shared/services/alert/alert.service';
import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service'; import { RequestInProgressService } from 'app/shared/services/request-in-progress/request-in-progress.service';
import { highlight } from 'app/shared/animations/validation.animation'; import { highlight } from 'theme/animations/validation.animation';
import { FormsValidatorService } from 'app/shared/services/forms-validator/forms-validator.service'; import { FormsValidatorService } from 'app/shared/services/forms-validator/forms-validator.service';
import { AccessIdDefinition } from 'app/shared/models/access-id'; import { AccessIdDefinition } from 'app/shared/models/access-id';
import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors'; import { EngineConfigurationSelectors } from 'app/store/engine-configuration-store/engine-configuration.selectors';

View File

@ -1,7 +1,7 @@
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
import { WorkbasketSummary } from 'app/shared/models/workbasket-summary'; import { WorkbasketSummary } from 'app/shared/models/workbasket-summary';
import { Filter } from 'app/shared/models/filter'; import { Filter } from 'app/shared/models/filter';
import { expandDown } from 'app/shared/animations/expand.animation'; import { expandDown } from 'theme/animations/expand.animation';
import { Side } from '../workbasket-distribution-targets/workbasket-distribution-targets.component'; import { Side } from '../workbasket-distribution-targets/workbasket-distribution-targets.component';
@Component({ @Component({

View File

@ -8,7 +8,7 @@ import { WorkbasketSummary } from 'app/shared/models/workbasket-summary';
import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service'; import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.service';
import { TaskanaType } from 'app/shared/models/taskana-type'; import { TaskanaType } from 'app/shared/models/taskana-type';
import { expandDown } from 'app/shared/animations/expand.animation'; import { expandDown } from 'theme/animations/expand.animation';
import { ErrorsService } from '../../../shared/services/errors/errors.service'; import { ErrorsService } from '../../../shared/services/errors/errors.service';
import { ERROR_TYPES } from '../../../shared/models/errors'; import { ERROR_TYPES } from '../../../shared/models/errors';

View File

@ -1,4 +1,4 @@
@import './src/assets/_colors'; @import '../../../theme/colors';
.table { .table {
max-height: calc(100vh - 152px); max-height: calc(100vh - 152px);

View File

@ -1,4 +1,4 @@
@import './src/assets/_colors'; @import '../../../../theme/colors';
.btn.selected { .btn.selected {
background-color: $blue; background-color: $blue;

View File

@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { AlertModel } from 'app/shared/models/alert'; import { AlertModel } from 'app/shared/models/alert';
import { AlertService } from 'app/shared/services/alert/alert.service'; import { AlertService } from 'app/shared/services/alert/alert.service';
import { expandTop } from '../../animations/expand.animation'; import { expandTop } from '../../../../theme/animations/expand.animation';
@Component({ @Component({
selector: 'taskana-alert', selector: 'taskana-alert',

View File

@ -1,5 +1,5 @@
import { Component, OnInit, Input } from '@angular/core'; import { Component, OnInit, Input } from '@angular/core';
import { highlight } from 'app/shared/animations/validation.animation'; import { highlight } from 'theme/animations/validation.animation';
@Component({ @Component({
selector: 'taskana-field-error-display', selector: 'taskana-field-error-display',

View File

@ -1,4 +1,4 @@
@import './src/assets/_variables'; @import '../../../../theme/variables';
.navbar.main:before { .navbar.main:before {
@include degraded-bar(right, 100%, 3px) @include degraded-bar(right, 100%, 3px)

View File

@ -7,7 +7,7 @@ import { BusinessAdminGuard } from 'app/shared/guards/business-admin.guard';
import { MonitorGuard } from 'app/shared/guards/monitor.guard'; import { MonitorGuard } from 'app/shared/guards/monitor.guard';
import { WindowRefService } from 'app/shared/services/window/window.service'; import { WindowRefService } from 'app/shared/services/window/window.service';
import { UserGuard } from 'app/shared/guards/user.guard'; import { UserGuard } from 'app/shared/guards/user.guard';
import { expandRight } from 'app/shared/animations/expand.animation'; import { expandRight } from 'theme/animations/expand.animation';
import { TaskanaEngineService } from '../../services/taskana-engine/taskana-engine.service'; import { TaskanaEngineService } from '../../services/taskana-engine/taskana-engine.service';
@Component({ @Component({
selector: 'taskana-nav-bar', selector: 'taskana-nav-bar',

View File

@ -1,4 +1,4 @@
@import './src/assets/_colors'; @import '../../../../theme/colors';
.wrapper-text { .wrapper-text {
min-width: 150px; min-width: 150px;

View File

@ -4,7 +4,7 @@ import { TypeaheadMatch } from 'ngx-bootstrap/typeahead';
import { AccessIdsService } from 'app/shared/services/access-ids/access-ids.service'; import { AccessIdsService } from 'app/shared/services/access-ids/access-ids.service';
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
import { highlight } from 'app/shared/animations/validation.animation'; import { highlight } from 'theme/animations/validation.animation';
import { mergeMap } from 'rxjs/operators'; import { mergeMap } from 'rxjs/operators';
import { AccessIdDefinition } from 'app/shared/models/access-id'; import { AccessIdDefinition } from 'app/shared/models/access-id';

View File

@ -1,4 +1,4 @@
@import './src/assets/_variables'; @import '../../../../theme/variables';
.big { .big {
width: 64px; width: 64px;

View File

@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { TaskanaEngineService } from 'app/shared/services/taskana-engine/taskana-engine.service'; import { TaskanaEngineService } from 'app/shared/services/taskana-engine/taskana-engine.service';
import { UserInfo } from 'app/shared/models/user-info'; import { UserInfo } from 'app/shared/models/user-info';
import { expandDown } from '../../animations/expand.animation'; import { expandDown } from '../../../../theme/animations/expand.animation';
@Component({ @Component({
selector: 'taskana-user-information', selector: 'taskana-user-information',

View File

@ -1,4 +1,4 @@
@import '../../../../assets/colors'; @import '../../../../theme/colors';
.list-group-item { .list-group-item {
padding: 5px 0px 2px 1px; padding: 5px 0px 2px 1px;

View File

@ -6,7 +6,7 @@ import { WorkbasketService } from 'app/shared/services/workbasket/workbasket.ser
import { Sorting } from 'app/shared/models/sorting'; import { Sorting } from 'app/shared/models/sorting';
import { Filter } from 'app/shared/models/filter'; import { Filter } from 'app/shared/models/filter';
import { TaskanaType } from 'app/shared/models/taskana-type'; import { TaskanaType } from 'app/shared/models/taskana-type';
import { expandDown } from 'app/shared/animations/expand.animation'; import { expandDown } from 'theme/animations/expand.animation';
import { ActivatedRoute, Router, NavigationExtras } from '@angular/router'; import { ActivatedRoute, Router, NavigationExtras } from '@angular/router';
import { WorkplaceService } from 'app/workplace/services/workplace.service'; import { WorkplaceService } from 'app/workplace/services/workplace.service';
import { ObjectReference } from 'app/workplace/models/object-reference'; import { ObjectReference } from 'app/workplace/models/object-reference';

View File

@ -1,4 +1,4 @@
@import '../../../../assets/colors'; @import '../../../../theme/colors';
::ng-deep .btn-block { ::ng-deep .btn-block {
background-color: whitesmoke; background-color: whitesmoke;

View File

@ -1 +0,0 @@
@import '../../node_modules/bootstrap-sass/assets/stylesheets/_bootstrap';

View File

@ -1,2 +1,2 @@
$icon-font-path: '../../node_modules/bootstrap-sass/assets/fonts/bootstrap/'; $icon-font-path: '../../node_modules/bootstrap-sass/assets/fonts/bootstrap/';
@import '../../node_modules/bootstrap-sass/assets/stylesheets/_bootstrap'; @import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap';

View File

@ -3,7 +3,7 @@
@import 'bootstrap-3-backward-compatibility'; @import 'bootstrap-3-backward-compatibility';
@import 'variables'; @import 'variables';
@import '../../node_modules/angular-tree-component/dist/angular-tree-component.css'; @import '../../node_modules/angular-tree-component/dist/angular-tree-component.css';
@import '../../node_modules/ngx-bootstrap/datepicker/bs-datepicker.scss'; @import '../../node_modules/ngx-bootstrap/datepicker/bs-datepicker';
@import 'material_icons'; @import 'material_icons';
@import 'site'; @import 'site';
@import 'forms'; @import 'forms';

View File

@ -2,12 +2,12 @@
font-family: 'Material Icons'; font-family: 'Material Icons';
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
src: url(icons-fonts/MaterialIcons-Regular.eot); /* For IE6-8 */ src: url(../assets/icons-fonts/MaterialIcons-Regular.eot); /* For IE6-8 */
src: local('Material Icons'), src: local('Material Icons'),
local('MaterialIcons-Regular'), local('MaterialIcons-Regular'),
url(icons-fonts/MaterialIcons-Regular.woff2) format('woff2'), url(../assets/icons-fonts/MaterialIcons-Regular.woff2) format('woff2'),
url(icons-fonts/MaterialIcons-Regular.woff) format('woff'), url(../assets/icons-fonts/MaterialIcons-Regular.woff) format('woff'),
url(icons-fonts/MaterialIcons-Regular.ttf) format('truetype'); url(../assets/icons-fonts/MaterialIcons-Regular.ttf) format('truetype');
} }
.material-icons { .material-icons {

View File

@ -0,0 +1 @@
@import '../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap';

View File

@ -1,4 +1,4 @@
@import '_colors'; @import 'colors';
.item { .item {
margin-bottom: 20px; margin-bottom: 20px;
position: relative; position: relative;

View File

@ -1,4 +1,4 @@
@import '_colors'; @import 'colors';
@import 'mixin/colors'; @import 'mixin/colors';
@mixin degraded-bar ($direction, $width, $height) { @mixin degraded-bar ($direction, $width, $height) {