From ca5f1f2765f6ed09da538893f9a6c23fb8c19eaa Mon Sep 17 00:00:00 2001
From: s416122 <annmad@st.amu.edu.pl>
Date: Sat, 14 Dec 2019 21:28:55 +0100
Subject: [PATCH] =?UTF-8?q?Zmiana=20wygl=C4=85du=20przycisk=C3=B3w=20->=20?=
 =?UTF-8?q?materia=C5=82y?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flashcards-sets-list.component.css        | 29 +------------------
 .../flashcards-sets-list.component.html       |  4 +--
 FrontEnd/src/app/login/login.component.html   |  8 ++---
 .../materials-add/materials-add.component.css | 17 +++++++++--
 .../materials-add.component.html              |  7 ++---
 .../materials-details.component.css           | 11 +++++--
 .../materials-list.component.css              | 10 ++++++-
 .../materials-list.component.html             |  4 +--
 .../materials-menu.component.css              |  6 ++++
 .../materials-menu.component.html             |  6 ++--
 10 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.css b/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.css
index d11b4f2..1e777b2 100644
--- a/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.css
+++ b/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.css
@@ -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;
-}
+
 
diff --git a/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.html b/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.html
index 5fe237f..fa3f6d4 100644
--- a/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.html
+++ b/FrontEnd/src/app/flashcards/flashcards-sets-list/flashcards-sets-list.component.html
@@ -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>
diff --git a/FrontEnd/src/app/login/login.component.html b/FrontEnd/src/app/login/login.component.html
index dd2ee7a..be7d622 100644
--- a/FrontEnd/src/app/login/login.component.html
+++ b/FrontEnd/src/app/login/login.component.html
@@ -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>
\ No newline at end of file
+</div>
diff --git a/FrontEnd/src/app/materials/materials-add/materials-add.component.css b/FrontEnd/src/app/materials/materials-add/materials-add.component.css
index f5a0a77..4e6af2f 100644
--- a/FrontEnd/src/app/materials/materials-add/materials-add.component.css
+++ b/FrontEnd/src/app/materials/materials-add/materials-add.component.css
@@ -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;
-}
\ No newline at end of file
+}
+
+.button{
+  font-size: large;
+  padding-left: 30px;
+  padding-right: 30px;
+  margin-bottom: 10px;
+}
+
+p{
+  color:white;
+}
diff --git a/FrontEnd/src/app/materials/materials-add/materials-add.component.html b/FrontEnd/src/app/materials/materials-add/materials-add.component.html
index 9a2c2b8..6cbaa6d 100644
--- a/FrontEnd/src/app/materials/materials-add/materials-add.component.html
+++ b/FrontEnd/src/app/materials/materials-add/materials-add.component.html
@@ -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>
-  
\ No newline at end of file
diff --git a/FrontEnd/src/app/materials/materials-details/materials-details.component.css b/FrontEnd/src/app/materials/materials-details/materials-details.component.css
index 5780197..d9a73f7 100644
--- a/FrontEnd/src/app/materials/materials-details/materials-details.component.css
+++ b/FrontEnd/src/app/materials/materials-details/materials-details.component.css
@@ -14,8 +14,15 @@
 
 .content{
     background-color: #181616;
-    padding: 30px; 
+    padding: 30px;
     margin-top: 2rem;
     margin-bottom: 2rem;
     text-align: center;
-}
\ No newline at end of file
+}
+
+.button{
+  font-size: large;
+  padding-left: 30px;
+  padding-right: 30px;
+  margin-bottom: 10px;
+}
diff --git a/FrontEnd/src/app/materials/materials-list/materials-list.component.css b/FrontEnd/src/app/materials/materials-list/materials-list.component.css
index ada8734..6113e32 100644
--- a/FrontEnd/src/app/materials/materials-list/materials-list.component.css
+++ b/FrontEnd/src/app/materials/materials-list/materials-list.component.css
@@ -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;
+}
diff --git a/FrontEnd/src/app/materials/materials-list/materials-list.component.html b/FrontEnd/src/app/materials/materials-list/materials-list.component.html
index 2e3eadd..1ed6856 100644
--- a/FrontEnd/src/app/materials/materials-list/materials-list.component.html
+++ b/FrontEnd/src/app/materials/materials-list/materials-list.component.html
@@ -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>
 
diff --git a/FrontEnd/src/app/materials/materials-menu/materials-menu.component.css b/FrontEnd/src/app/materials/materials-menu/materials-menu.component.css
index e69de29..8ff3ab8 100644
--- a/FrontEnd/src/app/materials/materials-menu/materials-menu.component.css
+++ b/FrontEnd/src/app/materials/materials-menu/materials-menu.component.css
@@ -0,0 +1,6 @@
+.button{
+  font-size: large;
+  min-width: 200px;
+}
+
+
diff --git a/FrontEnd/src/app/materials/materials-menu/materials-menu.component.html b/FrontEnd/src/app/materials/materials-menu/materials-menu.component.html
index ea5a3db..93fceb8 100644
--- a/FrontEnd/src/app/materials/materials-menu/materials-menu.component.html
+++ b/FrontEnd/src/app/materials/materials-menu/materials-menu.component.html
@@ -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>
\ No newline at end of file
+  <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>