From af1aa14d7df4008766c9e9fa07f8a65505b09e7e Mon Sep 17 00:00:00 2001 From: s416122 Date: Sat, 14 Dec 2019 23:24:14 +0100 Subject: [PATCH] =?UTF-8?q?PUNKT-43=20=20Zmiana=20wygl=C4=85du=20wszystkic?= =?UTF-8?q?h=20przycisk=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group-creator/group-creator.component.css | 11 +++++++-- .../group-creator.component.html | 4 ++-- .../group-details/group-details.component.css | 9 ++++++- .../group-details.component.html | 20 ++++++++-------- ...history-of-activity-in-group.component.css | 9 ++++++- ...istory-of-activity-in-group.component.html | 22 ++++++++--------- .../join-to-group/join-to-group.component.css | 10 ++++++-- .../join-to-group.component.html | 4 ++-- .../manage-group/manage-group.component.css | 9 ++++++- .../manage-group/manage-group.component.html | 14 +++++------ .../groups/my-groups/my-groups.component.css | 9 ++++++- .../groups/my-groups/my-groups.component.html | 6 ++--- .../app/groups/ranking/ranking.component.css | 11 +++++++-- .../app/groups/ranking/ranking.component.html | 6 ++--- .../sharing-resources-in-groups.component.css | 11 +++++++-- ...sharing-resources-in-groups.component.html | 12 +++++----- .../tests-in-group-results.component.css | 9 ++++++- .../tests-in-group-results.component.html | 6 ++--- .../material-to-group-preview.component.css | 6 +++++ .../material-to-group-preview.component.html | 2 +- .../waiting-resources.component.css | 9 ++++++- .../waiting-resources.component.html | 24 +++++++++---------- FrontEnd/src/app/login/login.component.css | 22 +++++++++++------ .../shared/comments/comments.component.css | 12 ++++++++-- .../shared/comments/comments.component.html | 8 +++---- .../gaps-question/gaps-question.component.css | 10 +++++++- .../gaps-question.component.html | 23 +++++++++--------- .../multiple-choice-question.component.css | 22 +++++++++++++++-- .../multiple-choice-question.component.html | 12 +++++----- .../pairs-question.component.css | 21 ++++++++++++++-- .../pairs-question.component.html | 11 +++++---- .../puzzle-question.component.css | 19 ++++++++++++++- .../puzzle-question.component.html | 16 ++++++------- .../single-choice-question.component.css | 21 ++++++++++++++-- .../single-choice-question.component.html | 11 +++++---- .../tests/test-edit/test-edit.component.css | 10 +++++++- .../tests/test-edit/test-edit.component.html | 24 +++++++++---------- .../tests/test-maker/test-maker.component.css | 9 ++++++- .../test-maker/test-maker.component.html | 24 +++++++++---------- .../tests/tests-list/tests-list.component.css | 9 ++++++- .../tests-list/tests-list.component.html | 6 ++--- .../true-false-question.component.css | 9 ++++++- .../true-false-question.component.html | 9 +++---- .../src/app/user/bagdes/bagdes.component.css | 11 +++++++-- .../src/app/user/bagdes/bagdes.component.html | 4 ++-- .../user/edit-user/edit-user.component.css | 12 ++++++++-- .../user/edit-user/edit-user.component.html | 4 ++-- .../app/user/register/register.component.css | 12 ++++++++-- .../app/user/register/register.component.html | 4 ++-- FrontEnd/src/app/user/user/user.component.css | 10 +++++++- .../src/app/user/user/user.component.html | 6 ++--- FrontEnd/src/styles.css | 19 +++++++++++---- 52 files changed, 428 insertions(+), 185 deletions(-) diff --git a/FrontEnd/src/app/groups/group-creator/group-creator.component.css b/FrontEnd/src/app/groups/group-creator/group-creator.component.css index bcf64d8..7dbd641 100644 --- a/FrontEnd/src/app/groups/group-creator/group-creator.component.css +++ b/FrontEnd/src/app/groups/group-creator/group-creator.component.css @@ -4,7 +4,7 @@ label { .container { background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -18,6 +18,13 @@ label { margin-bottom: 4rem; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + .wrapper { width: 100%; padding: 30px; @@ -27,7 +34,7 @@ label { .content { background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; diff --git a/FrontEnd/src/app/groups/group-creator/group-creator.component.html b/FrontEnd/src/app/groups/group-creator/group-creator.component.html index abfbb9e..e618dbc 100644 --- a/FrontEnd/src/app/groups/group-creator/group-creator.component.html +++ b/FrontEnd/src/app/groups/group-creator/group-creator.component.html @@ -14,8 +14,8 @@

- - + + diff --git a/FrontEnd/src/app/groups/group-details/group-details.component.css b/FrontEnd/src/app/groups/group-details/group-details.component.css index 722b21b..190d104 100644 --- a/FrontEnd/src/app/groups/group-details/group-details.component.css +++ b/FrontEnd/src/app/groups/group-details/group-details.component.css @@ -7,7 +7,7 @@ .content{ background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -15,6 +15,13 @@ margin-right: auto; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + ag-grid-angular{ margin: 10px; } diff --git a/FrontEnd/src/app/groups/group-details/group-details.component.html b/FrontEnd/src/app/groups/group-details/group-details.component.html index d9c6533..6df3958 100644 --- a/FrontEnd/src/app/groups/group-details/group-details.component.html +++ b/FrontEnd/src/app/groups/group-details/group-details.component.html @@ -1,19 +1,19 @@
- - -

- +

@@ -23,14 +23,14 @@

{{group?.description}}

- - + +
- - - + +
@@ -52,4 +52,4 @@ -
\ No newline at end of file +
diff --git a/FrontEnd/src/app/groups/history-of-activity-in-group/history-of-activity-in-group.component.css b/FrontEnd/src/app/groups/history-of-activity-in-group/history-of-activity-in-group.component.css index ae160bb..a888df5 100644 --- a/FrontEnd/src/app/groups/history-of-activity-in-group/history-of-activity-in-group.component.css +++ b/FrontEnd/src/app/groups/history-of-activity-in-group/history-of-activity-in-group.component.css @@ -7,7 +7,7 @@ .content { background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -18,3 +18,10 @@ .buttons-container > div { margin: 10px; } + +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} diff --git a/FrontEnd/src/app/groups/history-of-activity-in-group/history-of-activity-in-group.component.html b/FrontEnd/src/app/groups/history-of-activity-in-group/history-of-activity-in-group.component.html index 740482c..43ddd37 100644 --- a/FrontEnd/src/app/groups/history-of-activity-in-group/history-of-activity-in-group.component.html +++ b/FrontEnd/src/app/groups/history-of-activity-in-group/history-of-activity-in-group.component.html @@ -1,7 +1,7 @@
- +

Twoja historia aktywności

@@ -26,7 +26,7 @@
Pokaż wszystkie aktywności

- +


Pokaż aktywności z wybranego przedziału

@@ -40,7 +40,7 @@
- +
@@ -52,20 +52,20 @@

{{ activity.date }} - - lider grupy {{ activity.from }} + lider grupy {{ activity.from }} - zatwierdził dodany przez Ciebie + zatwierdził dodany przez Ciebie test materiał zestaw fiszek {{ activity.resourceName }}. Nie przyznał Ci za to punktów. - Przyznał Ci za to + Przyznał Ci za to {{ activity.points }} pkt. - odrzucił dodany przez Ciebie + odrzucił dodany przez Ciebie test materiał zestaw fiszek @@ -85,7 +85,7 @@ zestaw fiszek {{ activity.resourceName }} użytkownika {{ activity.to }}. Nie przyznałeś mu za to punktów. - Przyznałeś mu za to + Przyznałeś mu za to {{ activity.points }} pkt. @@ -103,12 +103,12 @@ - otrzymałeś - {{ activity.points }} pkt za rozwiązany test + otrzymałeś + {{ activity.points }} pkt za rozwiązany test {{ activity.resourceName }}. - dodałeś do grupy + dodałeś do grupy test materiał zestaw fiszek diff --git a/FrontEnd/src/app/groups/join-to-group/join-to-group.component.css b/FrontEnd/src/app/groups/join-to-group/join-to-group.component.css index 2b80839..7502142 100644 --- a/FrontEnd/src/app/groups/join-to-group/join-to-group.component.css +++ b/FrontEnd/src/app/groups/join-to-group/join-to-group.component.css @@ -7,7 +7,7 @@ .content{ background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -15,6 +15,12 @@ margin-right: auto; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} .join-to-group-form-item{ margin-bottom: 10px; @@ -22,4 +28,4 @@ .join-to-group-form{ margin-top: 10px; -} \ No newline at end of file +} diff --git a/FrontEnd/src/app/groups/join-to-group/join-to-group.component.html b/FrontEnd/src/app/groups/join-to-group/join-to-group.component.html index ab29ffc..7212fc5 100644 --- a/FrontEnd/src/app/groups/join-to-group/join-to-group.component.html +++ b/FrontEnd/src/app/groups/join-to-group/join-to-group.component.html @@ -6,7 +6,7 @@

Dołączyłeś do grupy, przekierowanie do niej nastąpi za 3 sekundy.
- +
- \ No newline at end of file + diff --git a/FrontEnd/src/app/groups/manage-group/manage-group.component.css b/FrontEnd/src/app/groups/manage-group/manage-group.component.css index 722b21b..190d104 100644 --- a/FrontEnd/src/app/groups/manage-group/manage-group.component.css +++ b/FrontEnd/src/app/groups/manage-group/manage-group.component.css @@ -7,7 +7,7 @@ .content{ background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -15,6 +15,13 @@ margin-right: auto; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + ag-grid-angular{ margin: 10px; } diff --git a/FrontEnd/src/app/groups/manage-group/manage-group.component.html b/FrontEnd/src/app/groups/manage-group/manage-group.component.html index 5cd48e4..f94026f 100644 --- a/FrontEnd/src/app/groups/manage-group/manage-group.component.html +++ b/FrontEnd/src/app/groups/manage-group/manage-group.component.html @@ -4,21 +4,21 @@

Klucz: {{group?.groupKey}}


- - - - + + + +

Lista użytkowników

- + Czy chcesz usunąć grupę? @@ -26,4 +26,4 @@ - \ No newline at end of file + diff --git a/FrontEnd/src/app/groups/my-groups/my-groups.component.css b/FrontEnd/src/app/groups/my-groups/my-groups.component.css index 722b21b..34e3c38 100644 --- a/FrontEnd/src/app/groups/my-groups/my-groups.component.css +++ b/FrontEnd/src/app/groups/my-groups/my-groups.component.css @@ -7,7 +7,7 @@ .content{ background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -19,6 +19,13 @@ ag-grid-angular{ margin: 10px; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + .buttons-container > div{ margin: 10px; } diff --git a/FrontEnd/src/app/groups/my-groups/my-groups.component.html b/FrontEnd/src/app/groups/my-groups/my-groups.component.html index 79a8813..7bfee89 100644 --- a/FrontEnd/src/app/groups/my-groups/my-groups.component.html +++ b/FrontEnd/src/app/groups/my-groups/my-groups.component.html @@ -4,16 +4,16 @@
- +
- +

diff --git a/FrontEnd/src/app/groups/ranking/ranking.component.css b/FrontEnd/src/app/groups/ranking/ranking.component.css index 8847472..35839fa 100644 --- a/FrontEnd/src/app/groups/ranking/ranking.component.css +++ b/FrontEnd/src/app/groups/ranking/ranking.component.css @@ -7,7 +7,7 @@ .content { background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -19,9 +19,16 @@ margin: 10px; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + .chart-container { margin: 10px; width: 100%; height: 500px; position: relative; -} \ No newline at end of file +} diff --git a/FrontEnd/src/app/groups/ranking/ranking.component.html b/FrontEnd/src/app/groups/ranking/ranking.component.html index d4432b2..4ef44a5 100644 --- a/FrontEnd/src/app/groups/ranking/ranking.component.html +++ b/FrontEnd/src/app/groups/ranking/ranking.component.html @@ -1,7 +1,7 @@
- +

{{group?.name}}

@@ -17,7 +17,7 @@

- +

@@ -31,4 +31,4 @@
- \ No newline at end of file + diff --git a/FrontEnd/src/app/groups/sharing-resources-in-groups/sharing-resources-in-groups.component.css b/FrontEnd/src/app/groups/sharing-resources-in-groups/sharing-resources-in-groups.component.css index 845f9ef..d811e3a 100644 --- a/FrontEnd/src/app/groups/sharing-resources-in-groups/sharing-resources-in-groups.component.css +++ b/FrontEnd/src/app/groups/sharing-resources-in-groups/sharing-resources-in-groups.component.css @@ -7,7 +7,7 @@ .content { background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -15,6 +15,13 @@ margin-right: auto; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + .buttons-container > div { margin: 10px; } @@ -22,4 +29,4 @@ .multiselect-wrapper{ display: flex; justify-content: center; -} \ No newline at end of file +} diff --git a/FrontEnd/src/app/groups/sharing-resources-in-groups/sharing-resources-in-groups.component.html b/FrontEnd/src/app/groups/sharing-resources-in-groups/sharing-resources-in-groups.component.html index 8e20ac5..faa3a83 100644 --- a/FrontEnd/src/app/groups/sharing-resources-in-groups/sharing-resources-in-groups.component.html +++ b/FrontEnd/src/app/groups/sharing-resources-in-groups/sharing-resources-in-groups.component.html @@ -1,7 +1,7 @@
- +

Dodawanie zasobów do grupy

@@ -9,9 +9,9 @@

Wybierz typ zasobu do dodania:

- - - + + +


@@ -26,11 +26,11 @@

- +
Brak elementów do dodania
- \ No newline at end of file + diff --git a/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.css b/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.css index 722b21b..34e3c38 100644 --- a/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.css +++ b/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.css @@ -7,7 +7,7 @@ .content{ background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -19,6 +19,13 @@ ag-grid-angular{ margin: 10px; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + .buttons-container > div{ margin: 10px; } diff --git a/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.html b/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.html index 55bf971..70df010 100644 --- a/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.html +++ b/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.html @@ -1,7 +1,7 @@
- +

Wyniki za testy w grupie: {{group?.name}}

@@ -19,7 +19,7 @@

Wybrany test: {{selectedTest.title}}


- +

-
\ No newline at end of file + diff --git a/FrontEnd/src/app/groups/waiting-resources/material-to-group-preview/material-to-group-preview.component.css b/FrontEnd/src/app/groups/waiting-resources/material-to-group-preview/material-to-group-preview.component.css index e69de29..246134c 100644 --- a/FrontEnd/src/app/groups/waiting-resources/material-to-group-preview/material-to-group-preview.component.css +++ b/FrontEnd/src/app/groups/waiting-resources/material-to-group-preview/material-to-group-preview.component.css @@ -0,0 +1,6 @@ +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} diff --git a/FrontEnd/src/app/groups/waiting-resources/material-to-group-preview/material-to-group-preview.component.html b/FrontEnd/src/app/groups/waiting-resources/material-to-group-preview/material-to-group-preview.component.html index ede97c1..8a9ec3b 100644 --- a/FrontEnd/src/app/groups/waiting-resources/material-to-group-preview/material-to-group-preview.component.html +++ b/FrontEnd/src/app/groups/waiting-resources/material-to-group-preview/material-to-group-preview.component.html @@ -1,5 +1,5 @@

{{ title }}


- +
diff --git a/FrontEnd/src/app/groups/waiting-resources/waiting-resources.component.css b/FrontEnd/src/app/groups/waiting-resources/waiting-resources.component.css index 648d4b5..2cfa1f8 100644 --- a/FrontEnd/src/app/groups/waiting-resources/waiting-resources.component.css +++ b/FrontEnd/src/app/groups/waiting-resources/waiting-resources.component.css @@ -7,7 +7,7 @@ .content { background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -15,6 +15,13 @@ margin-right: auto; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + .buttons-container > div { margin: 10px; } diff --git a/FrontEnd/src/app/groups/waiting-resources/waiting-resources.component.html b/FrontEnd/src/app/groups/waiting-resources/waiting-resources.component.html index 2e4887a..28b6035 100644 --- a/FrontEnd/src/app/groups/waiting-resources/waiting-resources.component.html +++ b/FrontEnd/src/app/groups/waiting-resources/waiting-resources.component.html @@ -1,7 +1,7 @@
- +

Oczekujące zasoby

@@ -9,9 +9,9 @@

Wybierz typ zasobu:

- - - + + +


@@ -20,21 +20,21 @@
@@ -51,7 +51,7 @@

- +

@@ -67,8 +67,8 @@

- - + +
@@ -79,7 +79,7 @@

- - + +
diff --git a/FrontEnd/src/app/login/login.component.css b/FrontEnd/src/app/login/login.component.css index cc7993f..42e7ea9 100644 --- a/FrontEnd/src/app/login/login.component.css +++ b/FrontEnd/src/app/login/login.component.css @@ -1,8 +1,8 @@ #container-small { background-color: #181616; - padding: 30px; + padding: 30px; width: 25%; - height: 400px; + height: 400px; margin: 25px; float:left; box-sizing: border-box; @@ -14,7 +14,7 @@ top: 50%; left: 50%; transform: translate(-50%, -50%); - padding: 30px; + padding: 30px; width: 50%; min-width: 250px; box-sizing: border-box; @@ -24,17 +24,17 @@ .content{ position:fixed; width:100%; - box-sizing: border-box; + box-sizing: border-box; max-width: 100%; } #container-large { background-color: #181616; - padding: 30px; + padding: 30px; width: 65%; min-height: 400px; margin: 25px; float: right; - box-sizing: border-box; + box-sizing: border-box; position: relative; text-align: center; } @@ -45,4 +45,12 @@ .text-content{ font-size: 18px; -} \ No newline at end of file +} + +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; + min-width: 200px; +} diff --git a/FrontEnd/src/app/shared/comments/comments.component.css b/FrontEnd/src/app/shared/comments/comments.component.css index 97d4679..a704c24 100644 --- a/FrontEnd/src/app/shared/comments/comments.component.css +++ b/FrontEnd/src/app/shared/comments/comments.component.css @@ -6,7 +6,7 @@ overflow: auto; height: calc(100vh - 154px); min-height: calc(100vh - 154px); - + } .wrapper{ @@ -21,6 +21,14 @@ } } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; + min-width: 200px; +} + @media screen and (max-width: 352px) { .content{ margin-top: 170px; @@ -42,4 +50,4 @@ input { border: 2px solid; padding: 20px; text-align: justify; -} \ No newline at end of file +} diff --git a/FrontEnd/src/app/shared/comments/comments.component.html b/FrontEnd/src/app/shared/comments/comments.component.html index b67de90..b0829a3 100644 --- a/FrontEnd/src/app/shared/comments/comments.component.html +++ b/FrontEnd/src/app/shared/comments/comments.component.html @@ -3,8 +3,8 @@

- - + +
@@ -15,7 +15,7 @@ Dodaj komentarz:

- +

@@ -29,4 +29,4 @@
- \ No newline at end of file + diff --git a/FrontEnd/src/app/tests/gaps-question/gaps-question.component.css b/FrontEnd/src/app/tests/gaps-question/gaps-question.component.css index 438c0b0..365ba03 100644 --- a/FrontEnd/src/app/tests/gaps-question/gaps-question.component.css +++ b/FrontEnd/src/app/tests/gaps-question/gaps-question.component.css @@ -4,7 +4,7 @@ .container { background-color: #22272a; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 1rem; text-align: center; @@ -18,6 +18,14 @@ align-content: center; } + +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + .wrapper { width: 100%; margin-bottom: 5rem; diff --git a/FrontEnd/src/app/tests/gaps-question/gaps-question.component.html b/FrontEnd/src/app/tests/gaps-question/gaps-question.component.html index d94fa2b..ac38efd 100644 --- a/FrontEnd/src/app/tests/gaps-question/gaps-question.component.html +++ b/FrontEnd/src/app/tests/gaps-question/gaps-question.component.html @@ -36,13 +36,13 @@
Akcja
- +
Przesuń
- - + + ---
@@ -55,7 +55,7 @@
Akcja
- +
@@ -67,13 +67,13 @@
Akcja
- +

- - - + + +

Podgląd:
@@ -86,9 +86,10 @@


- - - + + +
+ diff --git a/FrontEnd/src/app/tests/multiple-choice-question/multiple-choice-question.component.css b/FrontEnd/src/app/tests/multiple-choice-question/multiple-choice-question.component.css index 2ea51f8..a89e5e8 100644 --- a/FrontEnd/src/app/tests/multiple-choice-question/multiple-choice-question.component.css +++ b/FrontEnd/src/app/tests/multiple-choice-question/multiple-choice-question.component.css @@ -4,7 +4,7 @@ .container { background-color: #22272a; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 1rem; text-align: center; @@ -25,4 +25,22 @@ .align { text-align: center; -} \ No newline at end of file +} + + +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + +.min +{ + min-width: 150px; +} + +.max +{ + font-size: x-large; +} diff --git a/FrontEnd/src/app/tests/multiple-choice-question/multiple-choice-question.component.html b/FrontEnd/src/app/tests/multiple-choice-question/multiple-choice-question.component.html index 632981e..fd2c23d 100644 --- a/FrontEnd/src/app/tests/multiple-choice-question/multiple-choice-question.component.html +++ b/FrontEnd/src/app/tests/multiple-choice-question/multiple-choice-question.component.html @@ -31,7 +31,7 @@
Akcja
- +

@@ -47,17 +47,17 @@
Akcja
- +


- - - + + +
+ - \ No newline at end of file diff --git a/FrontEnd/src/app/tests/pairs-question/pairs-question.component.css b/FrontEnd/src/app/tests/pairs-question/pairs-question.component.css index 2ea51f8..a8bb21c 100644 --- a/FrontEnd/src/app/tests/pairs-question/pairs-question.component.css +++ b/FrontEnd/src/app/tests/pairs-question/pairs-question.component.css @@ -4,7 +4,7 @@ .container { background-color: #22272a; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 1rem; text-align: center; @@ -18,6 +18,23 @@ align-content: center; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + +.min +{ + min-width: 150px; +} + +.max +{ + font-size: x-large; +} + .wrapper { width: 100%; margin-bottom: 5rem; @@ -25,4 +42,4 @@ .align { text-align: center; -} \ No newline at end of file +} diff --git a/FrontEnd/src/app/tests/pairs-question/pairs-question.component.html b/FrontEnd/src/app/tests/pairs-question/pairs-question.component.html index e464571..0aad222 100644 --- a/FrontEnd/src/app/tests/pairs-question/pairs-question.component.html +++ b/FrontEnd/src/app/tests/pairs-question/pairs-question.component.html @@ -31,7 +31,7 @@
Akcja
- +

@@ -46,15 +46,16 @@
Akcja
- +


- - - + + +
+ diff --git a/FrontEnd/src/app/tests/puzzle-question/puzzle-question.component.css b/FrontEnd/src/app/tests/puzzle-question/puzzle-question.component.css index 438c0b0..942c4de 100644 --- a/FrontEnd/src/app/tests/puzzle-question/puzzle-question.component.css +++ b/FrontEnd/src/app/tests/puzzle-question/puzzle-question.component.css @@ -4,7 +4,7 @@ .container { background-color: #22272a; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 1rem; text-align: center; @@ -18,6 +18,23 @@ align-content: center; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + +.min +{ + min-width: 150px; +} + +.max +{ + font-size: x-large; +} + .wrapper { width: 100%; margin-bottom: 5rem; diff --git a/FrontEnd/src/app/tests/puzzle-question/puzzle-question.component.html b/FrontEnd/src/app/tests/puzzle-question/puzzle-question.component.html index dbed39d..f2ffba2 100644 --- a/FrontEnd/src/app/tests/puzzle-question/puzzle-question.component.html +++ b/FrontEnd/src/app/tests/puzzle-question/puzzle-question.component.html @@ -27,13 +27,13 @@
Akcja
- +
Przesuń
- - + + ---
@@ -46,17 +46,17 @@
Akcja
- +


- - - + + +
+ - \ No newline at end of file diff --git a/FrontEnd/src/app/tests/single-choice-question/single-choice-question.component.css b/FrontEnd/src/app/tests/single-choice-question/single-choice-question.component.css index 2ea51f8..a8bb21c 100644 --- a/FrontEnd/src/app/tests/single-choice-question/single-choice-question.component.css +++ b/FrontEnd/src/app/tests/single-choice-question/single-choice-question.component.css @@ -4,7 +4,7 @@ .container { background-color: #22272a; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 1rem; text-align: center; @@ -18,6 +18,23 @@ align-content: center; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + +.min +{ + min-width: 150px; +} + +.max +{ + font-size: x-large; +} + .wrapper { width: 100%; margin-bottom: 5rem; @@ -25,4 +42,4 @@ .align { text-align: center; -} \ No newline at end of file +} diff --git a/FrontEnd/src/app/tests/single-choice-question/single-choice-question.component.html b/FrontEnd/src/app/tests/single-choice-question/single-choice-question.component.html index 3065677..5e14c93 100644 --- a/FrontEnd/src/app/tests/single-choice-question/single-choice-question.component.html +++ b/FrontEnd/src/app/tests/single-choice-question/single-choice-question.component.html @@ -31,7 +31,7 @@
Akcja
- +

@@ -47,15 +47,16 @@
Akcja
- +


- - - + + +
+ diff --git a/FrontEnd/src/app/tests/test-edit/test-edit.component.css b/FrontEnd/src/app/tests/test-edit/test-edit.component.css index 7a4c3bc..a737c10 100644 --- a/FrontEnd/src/app/tests/test-edit/test-edit.component.css +++ b/FrontEnd/src/app/tests/test-edit/test-edit.component.css @@ -4,12 +4,13 @@ label { .container { background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 1rem; text-align: center; } + .wrapper-add { width: 100%; display: flex; @@ -18,6 +19,13 @@ label { margin-bottom: 4rem; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + .wrapper { width: 100%; padding: 30px; diff --git a/FrontEnd/src/app/tests/test-edit/test-edit.component.html b/FrontEnd/src/app/tests/test-edit/test-edit.component.html index 6a52aa1..2510565 100644 --- a/FrontEnd/src/app/tests/test-edit/test-edit.component.html +++ b/FrontEnd/src/app/tests/test-edit/test-edit.component.html @@ -16,13 +16,13 @@

Wybierz rodzaj pytania:

- - - + + +
- - - + + +

@@ -77,10 +77,10 @@ class="mobile">{{ question.content.time }} {{ question.shortcut }} - + - - + + --- @@ -106,10 +106,10 @@
- - +
+
- + diff --git a/FrontEnd/src/app/tests/test-maker/test-maker.component.css b/FrontEnd/src/app/tests/test-maker/test-maker.component.css index 7a4c3bc..d26a220 100644 --- a/FrontEnd/src/app/tests/test-maker/test-maker.component.css +++ b/FrontEnd/src/app/tests/test-maker/test-maker.component.css @@ -4,7 +4,7 @@ label { .container { background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 1rem; text-align: center; @@ -18,6 +18,13 @@ label { margin-bottom: 4rem; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + .wrapper { width: 100%; padding: 30px; diff --git a/FrontEnd/src/app/tests/test-maker/test-maker.component.html b/FrontEnd/src/app/tests/test-maker/test-maker.component.html index 25c30b4..2e23f6a 100644 --- a/FrontEnd/src/app/tests/test-maker/test-maker.component.html +++ b/FrontEnd/src/app/tests/test-maker/test-maker.component.html @@ -16,13 +16,13 @@

Wybierz rodzaj pytania:

- - - + + +
- - - + + +

@@ -77,10 +77,10 @@ class="mobile">{{ question.content.time }} {{ question.shortcut }} - + - - + + --- @@ -106,10 +106,10 @@
- - +
+
- + diff --git a/FrontEnd/src/app/tests/tests-list/tests-list.component.css b/FrontEnd/src/app/tests/tests-list/tests-list.component.css index 722b21b..793ccff 100644 --- a/FrontEnd/src/app/tests/tests-list/tests-list.component.css +++ b/FrontEnd/src/app/tests/tests-list/tests-list.component.css @@ -7,7 +7,7 @@ .content{ background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -22,3 +22,10 @@ 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/tests/tests-list/tests-list.component.html b/FrontEnd/src/app/tests/tests-list/tests-list.component.html index 6a531a5..69c1304 100644 --- a/FrontEnd/src/app/tests/tests-list/tests-list.component.html +++ b/FrontEnd/src/app/tests/tests-list/tests-list.component.html @@ -4,7 +4,7 @@
- +
\ No newline at end of file +
diff --git a/FrontEnd/src/app/tests/true-false-question/true-false-question.component.css b/FrontEnd/src/app/tests/true-false-question/true-false-question.component.css index 1fb2393..97b7b25 100644 --- a/FrontEnd/src/app/tests/true-false-question/true-false-question.component.css +++ b/FrontEnd/src/app/tests/true-false-question/true-false-question.component.css @@ -4,7 +4,7 @@ .container { background-color: #22272a; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 1rem; text-align: center; @@ -18,6 +18,13 @@ align-content: center; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; +} + .wrapper { width: 100%; margin-bottom: 5rem; diff --git a/FrontEnd/src/app/tests/true-false-question/true-false-question.component.html b/FrontEnd/src/app/tests/true-false-question/true-false-question.component.html index fac8dc4..6fefd87 100644 --- a/FrontEnd/src/app/tests/true-false-question/true-false-question.component.html +++ b/FrontEnd/src/app/tests/true-false-question/true-false-question.component.html @@ -29,10 +29,11 @@

- - - + + +
+ - \ No newline at end of file + diff --git a/FrontEnd/src/app/user/bagdes/bagdes.component.css b/FrontEnd/src/app/user/bagdes/bagdes.component.css index 662beee..e6e052c 100644 --- a/FrontEnd/src/app/user/bagdes/bagdes.component.css +++ b/FrontEnd/src/app/user/bagdes/bagdes.component.css @@ -12,12 +12,19 @@ .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; +} + .locked{ opacity: 0.3; } @@ -59,4 +66,4 @@ p { width: 60px; height: 60px; padding: 5px; -} \ No newline at end of file +} diff --git a/FrontEnd/src/app/user/bagdes/bagdes.component.html b/FrontEnd/src/app/user/bagdes/bagdes.component.html index caefd9d..d8c866c 100644 --- a/FrontEnd/src/app/user/bagdes/bagdes.component.html +++ b/FrontEnd/src/app/user/bagdes/bagdes.component.html @@ -1,7 +1,7 @@

Twoje odznaki!

- +

@@ -11,4 +11,4 @@
-
\ No newline at end of file + diff --git a/FrontEnd/src/app/user/edit-user/edit-user.component.css b/FrontEnd/src/app/user/edit-user/edit-user.component.css index e710b66..da4d524 100644 --- a/FrontEnd/src/app/user/edit-user/edit-user.component.css +++ b/FrontEnd/src/app/user/edit-user/edit-user.component.css @@ -14,6 +14,14 @@ input.ng-untouched { border-color: rgb(206, 212, 218); } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; + min-width: 200px; +} + .wrapper{ width: 100%; padding: 30px; @@ -23,8 +31,8 @@ input.ng-untouched { .content{ background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; -} \ No newline at end of file +} diff --git a/FrontEnd/src/app/user/edit-user/edit-user.component.html b/FrontEnd/src/app/user/edit-user/edit-user.component.html index 0384546..552716e 100644 --- a/FrontEnd/src/app/user/edit-user/edit-user.component.html +++ b/FrontEnd/src/app/user/edit-user/edit-user.component.html @@ -62,11 +62,11 @@
- +
- \ No newline at end of file + diff --git a/FrontEnd/src/app/user/register/register.component.css b/FrontEnd/src/app/user/register/register.component.css index e710b66..da4d524 100644 --- a/FrontEnd/src/app/user/register/register.component.css +++ b/FrontEnd/src/app/user/register/register.component.css @@ -14,6 +14,14 @@ input.ng-untouched { border-color: rgb(206, 212, 218); } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; + min-width: 200px; +} + .wrapper{ width: 100%; padding: 30px; @@ -23,8 +31,8 @@ input.ng-untouched { .content{ background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; -} \ No newline at end of file +} diff --git a/FrontEnd/src/app/user/register/register.component.html b/FrontEnd/src/app/user/register/register.component.html index 0ca7a97..0c597aa 100644 --- a/FrontEnd/src/app/user/register/register.component.html +++ b/FrontEnd/src/app/user/register/register.component.html @@ -60,11 +60,11 @@
- +
- \ No newline at end of file + diff --git a/FrontEnd/src/app/user/user/user.component.css b/FrontEnd/src/app/user/user/user.component.css index 7d0fb54..30e2bd5 100644 --- a/FrontEnd/src/app/user/user/user.component.css +++ b/FrontEnd/src/app/user/user/user.component.css @@ -7,7 +7,7 @@ .content{ background-color: #181616; - padding: 30px; + padding: 30px; margin-top: 2rem; margin-bottom: 2rem; text-align: center; @@ -15,6 +15,14 @@ margin-right: auto; } +.button{ + font-size: large; + padding-left: 30px; + padding-right: 30px; + margin-bottom: 10px; + min-width: 200px; +} + .profile{ display: flex; flex-direction: row; diff --git a/FrontEnd/src/app/user/user/user.component.html b/FrontEnd/src/app/user/user/user.component.html index e78a84f..1fd962e 100644 --- a/FrontEnd/src/app/user/user/user.component.html +++ b/FrontEnd/src/app/user/user/user.component.html @@ -1,8 +1,8 @@

Twój profil

- - + +
@@ -20,4 +20,4 @@
-
\ No newline at end of file + diff --git a/FrontEnd/src/styles.css b/FrontEnd/src/styles.css index 65d6b22..5dc6355 100644 --- a/FrontEnd/src/styles.css +++ b/FrontEnd/src/styles.css @@ -160,6 +160,17 @@ label.btn-study-cave { outline: none; } + +.min +{ + min-width: 150px; +} + +.max +{ + font-size: x-large; +} + .button:hover { background-color: orange; @@ -257,7 +268,7 @@ button:hover, a:hover { .ag-theme-dark { font-size: 16px !important; } - + .ag-header { font-size: 16px !important; } @@ -268,7 +279,7 @@ button:hover, a:hover { .ag-theme-dark { font-size: 14px !important; } - + .ag-header { font-size: 14px !important; @@ -277,5 +288,5 @@ button:hover, a:hover { .ag-paging-panel { font-size: 12px !important; } - -} \ No newline at end of file + +}