Skip to content
Snippets Groups Projects
Commit 940a36f7 authored by Alex ORLUC's avatar Alex ORLUC
Browse files

fix some css

parent b83b212c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 27 additions and 70 deletions
src/frontend/app/basket/basket-home.component.html
+ 9
− 9
View file @ 940a36f7
<mat-divider *ngIf="homeData.regroupedBaskets.length > 0 || homeData.assignedBaskets.length > 0">
</mat-divider>
<mat-expansion-panel class="basketList" expanded style="box-shadow:none;" *ngIf="homeData.regroupedBaskets.length > 0 || homeData.assignedBaskets.length > 0">
<mat-expansion-panel class="basketList" expanded *ngIf="homeData.regroupedBaskets.length > 0 || homeData.assignedBaskets.length > 0">
<mat-expansion-panel-header>
<mat-panel-title style="color: rgba(0,0,0,0.54);font-size: 14px;font-weight: 500;">
<mat-panel-title>
{{lang.myBaskets}}
</mat-panel-title>
</mat-expansion-panel-header>
<mat-form-field floatLabel="never">
<mat-form-field floatLabel="never" style="padding-left:20px;padding-right:20px;">
<input matInput placeholder="Filtrer" #listFilter>
</mat-form-field>
<ng-container *ngFor="let regroupedBasket of homeData.regroupedBaskets">
......@@ -16,15 +16,15 @@
<ng-container *ngFor="let basket of regroupedBasket.baskets | filterList:listFilter.value:'basket_name'">
<a mat-list-item *ngIf="basket.redirected" disableRipple="true" style="cursor:not-allowed;">
<mat-icon [ngStyle]="{'color': basket.color}" *ngIf="basket.redirected && !mobileMode" mat-list-icon class="fa fa-share"></mat-icon>
<span *ngIf="basket.resourceNumber==0" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
<span *ngIf="basket.resourceNumber!=0" bgcolor="warn" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
<span *ngIf="basket.resourceNumber==0" class="nbResZero">{{basket.resourceNumber}}</span>
<span *ngIf="basket.resourceNumber!=0" class="nbRes">{{basket.resourceNumber}}</span>
<p mat-line title="{{basket.basket_name}}" [ngStyle]="{'color': basket.color}">
{{basket.basket_name}}<br/><small color="primary">({{lang.redirectedTo}} {{basket.redirectedUser}})</small>
</p>
</a>
<a mat-list-item [ngClass]="{'selectedBasket': currentBasketInfo.basketId == basket.id && currentBasketInfo.ownerId == basket.owner_user_id && currentBasketInfo.groupId == regroupedBasket.groupSerialId}" *ngIf="!basket.redirected" (click)="closePanelLeft();" routerLink="/basketList/users/{{basket.owner_user_id}}/groups/{{regroupedBasket.groupSerialId}}/baskets/{{basket.id}}" style="cursor:pointer;" [ngStyle]="{'opacity': basket.resourceNumber==0 ? '0.5' : '1', 'height': mobileMode ? '50px' : '38px'}">
<span *ngIf="basket.resourceNumber==0" class="nbResZero" style="min-width:auto;">{{basket.resourceNumber}}</span>
<span *ngIf="basket.resourceNumber!=0" class="nbRes" style="min-width:auto;">{{basket.resourceNumber}}</span>
<span *ngIf="basket.resourceNumber==0" class="nbResZero">{{basket.resourceNumber}}</span>
<span *ngIf="basket.resourceNumber!=0" class="nbRes">{{basket.resourceNumber}}</span>
<p mat-line title="{{basket.basket_name}}" [ngStyle]="{'color': basket.color}">
{{basket.basket_name}}
</p>
......@@ -38,8 +38,8 @@
<mat-nav-list>
<a mat-list-item *ngFor="let basket of homeData.assignedBaskets | filterList:listFilter.value:'basket_name'" [ngClass]="{'selectedBasket': currentBasketInfo.basketId==basket.id && currentBasketInfo.ownerId==basket.owner_user_id && currentBasketInfo.groupId==basket.group_id}" routerLink="/basketList/users/{{basket.owner_user_id}}/groups/{{basket.group_id}}/baskets/{{basket.id}}">
<mat-icon *ngIf="!mobileMode" style="color:#666" mat-list-icon class="fa fa-paper-plane"></mat-icon>
<span *ngIf="basket.resourceNumber==0" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
<span *ngIf="basket.resourceNumber!=0" bgcolor="warn" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
<span *ngIf="basket.resourceNumber==0" class="nbResZero">{{basket.resourceNumber}}</span>
<span *ngIf="basket.resourceNumber!=0" class="nbRes">{{basket.resourceNumber}}</span>
<p mat-line title="{{basket.basket_name}}" style="color:#666">
{{basket.basket_name}}<br/><small color="primary">({{basket.userToDisplay}} - {{basket.group_desc}})</small>
</p>
......
src/frontend/app/basket/basket-home.component.scss
+ 11
− 1
View file @ 940a36f7
@import '../../css/vars.scss';
.basketList {
box-shadow:none;
::ng-deep.mat-expansion-panel-body {
padding: 0;
}
.mat-expansion-panel-header-title {
color: rgba(0,0,0,0.54);
font-size: 14px;
font-weight: 500;
}
.mat-line {
font-size: 12px;
font-weight: bold;
......@@ -21,11 +29,13 @@
}
.nbRes {
color : $primary;
font-size: 12px;
font-size: 14px;
font-weight: bold;
min-width:auto;
}
.nbResZero {
color : #666;
font-size: 12px;
font-weight: bold;
min-width:auto;
}
\ No newline at end of file
src/frontend/app/header/header-panel.component.html
+ 2
− 2
View file @ 940a36f7
......@@ -5,8 +5,8 @@
</a>
</div>
<div class="panelHeader-button">
<button mat-icon-button>
<mat-icon fontSet="fas" fontIcon="fa-bars" (click)="snavLeft.close()"></mat-icon>
<button mat-icon-button (click)="snavLeft.close()">
<mat-icon fontSet="fas" fontIcon="fa-bars"></mat-icon>
</button>
</div>
</div>
......
src/frontend/app/header/header-right.component.html
+ 1
− 1
View file @ 940a36f7
......@@ -16,7 +16,7 @@
</mat-menu>
<button mat-button [matMenuTriggerFor]="menu" *ngIf="!mobileMode">
<mat-icon mat-list-icon class="fa fa-user fa-2x" style="color:white; margin:0px 12px 8px 0px;"></mat-icon>
{{headerService.user.firstname | uppercase}} <b>{{headerService.user.lastname | uppercase}}</b>
{{headerService.user.firstname | titlecase }} <b>{{headerService.user.lastname | uppercase}}</b>
</button>
<mat-menu #menu="matMenu" class="headerMaarch">
<canvas class="header-bg" width="250" height="70"
......
src/frontend/app/list/basket-list.component.html
+ 1
− 1
View file @ 940a36f7
......@@ -173,7 +173,7 @@
</div>
</mat-sidenav-content>
<mat-sidenav #snav2 mode="side" [fixedInViewport]="mobileQuery.matches" fixedTopGap="56" position='end'
[opened]="mobileQuery.matches ? false : false" style="overflow-x:hidden;"
[opened]="mobileQuery.matches ? false : false" class="panel-right" style="overflow-x:hidden;"
[class.docView]="!filtersListService.filterMode" [ngStyle]="{'width': mobileMode ? '80%' : '30%'}"
autoFocus="false">
<div *ngIf="innerHtml && !filtersListService.filterMode" [matTooltip]="currentChrono"
......
src/frontend/app/list/basket-list.component.scss
+ 3
− 56
View file @ 940a36f7
......@@ -48,63 +48,10 @@
}
}
.panel-left {
.panel-left, .panel-right {
min-width: 300px;
&-title {
padding: 20px;
padding-left: 10px;
padding-right: 10px;
color: #666;
display: flex;
align-items: center;
&-label,
&-tool {
flex: 1;
display: flex;
align-items: center;
}
&-tool {
justify-content: end;
}
}
&-menu {
&-shortcut {
span {
display: flex;
flex: 1;
justify-content: center;
}
.mat-mini-fab {
box-shadow: none;
}
}
&-basket {
box-shadow: none;
.mat-expansion-panel-header-title {
font-weight: bold;
color: #135F7F;
}
::ng-deep.mat-expansion-panel-body {
padding: 0;
}
}
h3 {
font-size: 12px;
font-weight: 500;
}
}
box-shadow: none;
border: none;
}
.container {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment