Remove dashboard-theme and import library less
This commit is contained in:
parent
0a6cac1f6c
commit
b3b27dcdc1
|
@ -4,9 +4,6 @@
|
|||
[submodule "src/assets/common-assets"]
|
||||
path = src/assets/common-assets
|
||||
url = gitea@code-repo.d4science.org:MaDgIK/openaire-assets.git
|
||||
[submodule "src/assets/dashboard-theme"]
|
||||
path = src/assets/dashboard-theme
|
||||
url = gitea@code-repo.d4science.org:MaDgIK/dashboard-theme.git
|
||||
[submodule "src/assets/openaire-theme"]
|
||||
path = src/assets/openaire-theme
|
||||
url = gitea@code-repo.d4science.org:MaDgIK/openaire-theme.git
|
||||
|
|
|
@ -48,7 +48,6 @@
|
|||
"styles": [
|
||||
"src/mining.scss",
|
||||
"src/styles.less",
|
||||
"src/deprecated.css",
|
||||
"src/assets/common-assets/library-css/material.scss"
|
||||
],
|
||||
"scripts": [
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit c5da95fb48e1f4964396b2a9c1358a0d6d4b93cc
|
||||
Subproject commit 01fd4ac49f2758bb992529478562358bf45e6370
|
|
@ -1,29 +1,23 @@
|
|||
<ng-template #selected_filters_pills>
|
||||
<h1>
|
||||
<div class="uk-width-1-1" uk-slider="finite: true">
|
||||
<div class="uk-slider filters-slider" uk-slider="finite: true">
|
||||
<div [class.uk-invisible]="list.children.length === 0" class="uk-position-relative">
|
||||
<div class="uk-slider-container" style="height: 40px">
|
||||
<div class="uk-slider-container">
|
||||
<ul #list class="uk-slider-items uk-grid uk-grid-small uk-margin-small-right uk-flex-nowrap">
|
||||
<!-- <ng-container *ngIf="funders && funders.countSelectedValues > 0">-->
|
||||
<!-- <ng-container *ngFor="let value of getSelectedValues(funders); let i = index; let end = last; ">-->
|
||||
<li>
|
||||
<li *ngIf="selectedFunder">
|
||||
<span class="uk-label uk-label-primary uk-flex uk-flex-middle">
|
||||
<span class="uk-margin-small-right uk-width-expand uk-text-truncate">
|
||||
{{selectedFunder.name}}
|
||||
</span>
|
||||
<button class="uk-close uk-icon" [class.uk-disabled]="disabled" [disabled]="disabled" (click)="removeFilter(value, funders)">
|
||||
<button class="uk-close uk-icon" [class.uk-disabled]="disabled" [disabled]="disabled" (click)="removeFilter(null, funders)">
|
||||
<icon name="close" flex="true" ratio="0.7"></icon>
|
||||
</button>
|
||||
</span>
|
||||
</li>
|
||||
<!-- </ng-container>-->
|
||||
<!-- </ng-container>-->
|
||||
</ul>
|
||||
</div>
|
||||
<div class="">
|
||||
<a class="uk-position-center-left blur-background" uk-slider-item="previous"><span uk-icon="chevron-left"></span></a>
|
||||
<a class="uk-position-center-right blur-background" uk-slider-item="next"><span uk-icon="chevron-right"></span></a>
|
||||
</div>
|
||||
<a class="uk-position-center-left uk-blur-background" uk-slider-item="previous"><span uk-icon="chevron-left"></span></a>
|
||||
<a class="uk-position-center-right uk-blur-background" uk-slider-item="next"><span uk-icon="chevron-right"></span></a>
|
||||
</div>
|
||||
</div>
|
||||
</h1>
|
||||
|
@ -76,7 +70,7 @@
|
|||
<ng-container *ngTemplateOutlet="filters_column; context: {}"></ng-container>
|
||||
</div>
|
||||
<div class="uk-width-expand@m uk-with-1-1@s">
|
||||
<div *ngIf="(selectedFunderId && openaireSearchUtils.status !== errorCodes.LOADING)">
|
||||
<div *ngIf="selectedFunderId && openaireSearchUtils.status !== errorCodes.LOADING">
|
||||
<ng-container *ngTemplateOutlet="selected_filters_pills;"></ng-container>
|
||||
</div>
|
||||
<div>
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit d577c6d69a55901e319cf0cf5b93f900f1cdeaab
|
||||
Subproject commit bb96e1c48fbc2090220d2b72415b929c3cc23492
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 3027af352f9bc72d8870550d61138d66e219cb32
|
|
@ -1 +1 @@
|
|||
Subproject commit a61c749816accd456cf30c9e4983d61282f28a89
|
||||
Subproject commit 3bc96a4bdccd2f09dab039759375fa8980e8e59e
|
|
@ -1,4 +0,0 @@
|
|||
@import "assets/openaire-theme/css/structure/variables.css";
|
||||
@import "assets/openaire-theme/css/openaire.css";
|
||||
@import "assets/common-assets/library.css";
|
||||
@import "assets/dashboard-theme/main.css";
|
|
@ -1,2 +1,3 @@
|
|||
/* You can add global styles to this file, and also import other style files */
|
||||
@import "~src/assets/openaire-theme/less/_import";
|
||||
@import "~src/assets/common-assets/less/_import";
|
||||
|
|
Loading…
Reference in New Issue