s416178
/
Punktonerzy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Zmiana wyglądu przycisków -> materiały

This commit is contained in:
s416122 2019-12-14 21:28:55 +01:00
parent e51700eadd
commit ca5f1f2765
10 changed files with 53 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.css
View File

@ -12,31 +12,7 @@
label
{
clip-path: polygon(0% 50%, 15% 0%, 85% 0%, 100% 50%, 85% 100%, 15% 100%);
background-color: #000080;
width: 300px;
text-align: center;
border: 3px solid #000080;
border-bottom: #000080;
color: white;
cursor: pointer;
margin-top:10px;
font-size: x-large;
}
label:hover
{
background-color: orange;
border-color: orange;
}
.radio-answer:checked + label
{
background-color: orange;
border-color: orange;
}
.wrapper{
width: 100%;
@ -80,8 +56,5 @@ ag-grid-angular{
margin: 10px;
}
.radio-answer
{
display: none;
}

4
FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.html
View File

@ -9,10 +9,10 @@
<button class="button" (click)="toFlashcardsMaker()"><i class="fas fa-plus"></i> Dodaj fiszki</button>
</div>
<div *ngIf="logged" class="btn-group btn-group-toggle" data-toggle="buttons">
<label class="button active" (click)="ShowPublic()">
<label class="btn btn-study-cave active" (click)="ShowPublic()">
<input type="radio" class="radio-answer" name="options" id="option1" autocomplete="off" checked><i class="fas fa-globe"></i> Publiczne
</label>
<label class="button" (click)="ShowPrivate()">
<label class="btn btn-study-cave " (click)="ShowPrivate()">
<input type="radio" class="radio-answer" name="options" id="option2" autocomplete="off"><i class="fas fa-user-secret"></i> Prywatne
</label>
</div>

8
FrontEnd/src/app/login/login.component.html
View File

@ -1,15 +1,15 @@
<div class="content">
<div id="container-login">
<button class="btn btn-study-cave" (click)="loginWithUsos()">Zaloguj przez USOS</button>
<button class="button" (click)="loginWithUsos()">Zaloguj przez USOS</button>
<br /><br /><br /><br />
<div>
<form (ngSubmit)="login()">
Nazwa użytkownika:<br />
<input type = "text" [(ngModel)] = "model.username" name="username"><br />
Hasło:<br />
Hasło:<br />
<input type = "password" [(ngModel)] = "model.password" name = "password"><br /><br />
<input class="btn btn-study-cave" type="submit" value = "Zaloguj" />
<input class="button" type="submit" value = "Zaloguj" />
</form>
</div>
</div>
</div>
</div>

17
FrontEnd/src/app/materials/materials-add/materials-add.component.css
View File

@ -9,7 +9,7 @@
.container {
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;
@ -38,7 +38,7 @@
.content{
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;
@ -52,4 +52,15 @@ ag-grid-angular{
.buttons-container > div{
margin: 10px;
}
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}
p{
color:white;
}

7
FrontEnd/src/app/materials/materials-add/materials-add.component.html
View File

@ -1,7 +1,7 @@
<div class="wrapper">
<div class="content">
<div class="buttons-container">
<button class="btn btn-study-cave" routerLink="/materials/list"><i class="fas fa-arrow-left"></i> WRÓĆ DO LISTY</button>
<button class="button" routerLink="/materials/list"><i class="fas fa-arrow-left"></i> WRÓĆ DO LISTY</button>
</div>
</div>
<div class="wrapper-add">
@ -33,10 +33,9 @@
<b>Udostępnij publicznie</b>
<br /><br />
</div>
<button class="btn btn-study-cave" [disabled]="!selectedFiles" (click)="upload()"><i class="fas fa-check-circle"></i> Dodaj materiały!</button>
<button class="button" style ="font-size: x-large; padding-left: 30px; padding-right: 30px;" [disabled]="!selectedFiles" (click)="upload()"><i class="fas fa-check-circle"></i> Dodaj materiały!</button>
<br /><br />
<button class="btn btn-study-cave" routerLink="/materials/list/"><i class="fas fa-arrow-left"></i> Powrót</button>
<button class="button" routerLink="/materials/list/"><i class="fas fa-arrow-left"></i> Powrót</button>
</div>
</div>
</div>

11
FrontEnd/src/app/materials/materials-details/materials-details.component.css
View File

@ -14,8 +14,15 @@
.content{
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;
}
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}

10
FrontEnd/src/app/materials/materials-list/materials-list.component.css
View File

@ -30,7 +30,7 @@
.content{
background-color: #181616;
padding: 30px;
padding: 30px;
margin-top: 2rem;
margin-bottom: 2rem;
text-align: center;
@ -45,3 +45,11 @@ ag-grid-angular{
.buttons-container > div{
margin: 10px;
}
.button{
font-size: large;
padding-left: 30px;
padding-right: 30px;
margin-bottom: 10px;
}

4
FrontEnd/src/app/materials/materials-list/materials-list.component.html
View File

@ -7,7 +7,7 @@
<br />
<div class="buttons-container">
<div *ngIf="logged">
<button class="btn btn-study-cave" (click)="toMaterialsMaker()"><i class="fas fa-plus"></i> Dodaj materiały</button>
<button class="button" (click)="toMaterialsMaker()"><i class="fas fa-plus"></i> Dodaj materiały</button>
</div>
<div *ngIf="logged" class="btn-group btn-group-toggle" data-toggle="buttons">
<label class="btn btn-study-cave active" (click)="ShowPublic()">
@ -21,7 +21,7 @@
<br />
<ag-grid-angular style="width: 100%; height: 475px;" class="ag-theme-dark" [rowData]="mats" [columnDefs]="columnDefs" [enableSorting]="true"
[enableFilter]="true" (gridReady)="onGridReady($event)" (gridSizeChanged)="onGridSizeChanged($event)" [gridOptions]="gridOptions"
[pagination]="true" [paginationAutoPageSize]="true" (rowClicked)="onRowClicked($event)" [localeText]="localeText"
[pagination]="true" [paginationAutoPageSize]="true" (rowClicked)="onRowClicked($event)" [localeText]="localeText"
(gridColumnsChanged)="onGidColumnsChanged($event)">
</ag-grid-angular>

6
FrontEnd/src/app/materials/materials-menu/materials-menu.component.css
View File

@ -0,0 +1,6 @@
.button{
font-size: large;
min-width: 200px;
}

6
FrontEnd/src/app/materials/materials-menu/materials-menu.component.html
View File

@ -1,4 +1,4 @@
<div>
<button class="btn btn-study-cave" routerLink="/flashcards/sets"><i class="fas fa-scroll"></i> FISZKI</button>
<button class="btn btn-study-cave" routerLink="/materials/list"><i class="fas fa-book-open"></i> MATERIAŁY</button>
</div>
<button class="button" routerLink="/flashcards/sets"><i class="fas fa-scroll"></i> FISZKI</button>
<button class="button" routerLink="/materials/list"><i class="fas fa-book-open"></i> MATERIAŁY</button>
</div>