diff --git a/TutorLizard.Blazor/Components/Calendar.razor.css b/TutorLizard.Blazor/Components/Calendar.razor.css index acaf605c..7ce94c4e 100644 --- a/TutorLizard.Blazor/Components/Calendar.razor.css +++ b/TutorLizard.Blazor/Components/Calendar.razor.css @@ -1,8 +1,8 @@ .calendar-container { display: flex; flex-direction: column; - background-color: darkgreen; - border-radius: 1rem; + background-color: #2b4027; + border-radius: 0px; padding: 1rem; } @@ -39,7 +39,7 @@ .calendar-main { border-radius: .5rem; overflow: hidden; - background-color: whitesmoke; + background-color: #2b4027; } .seven-column-section { @@ -55,7 +55,7 @@ .days-header div { padding: 1rem 0; - background-color: white; + background-color: #9db88c; text-align: center; font-weight: bold; } @@ -75,7 +75,7 @@ } .calendar-grid div:hover { - background-color: darkgreen; + background-color: #9db88c; transition: .35s; color: white; font-weight: bold; diff --git a/TutorLizard.Blazor/Components/ScheduleForDay.razor b/TutorLizard.Blazor/Components/ScheduleForDay.razor index 34a9766c..67acb67f 100644 --- a/TutorLizard.Blazor/Components/ScheduleForDay.razor +++ b/TutorLizard.Blazor/Components/ScheduleForDay.razor @@ -4,7 +4,7 @@
@if (Schedule.Count == 0) { -
Brak terminów.
+
Brak terminów.
} @foreach (var item in Schedule) { diff --git a/TutorLizard.Blazor/Components/ScheduleForDay.razor.css b/TutorLizard.Blazor/Components/ScheduleForDay.razor.css index 9be38962..d0c61ce7 100644 --- a/TutorLizard.Blazor/Components/ScheduleForDay.razor.css +++ b/TutorLizard.Blazor/Components/ScheduleForDay.razor.css @@ -1,11 +1,12 @@ .schedule-container { - background-color: slateblue; + background-color: #ededed; padding: 1rem; - border-radius: 1rem; + border-radius: 0; + color: black; } .schedule-container h3 { - color:white; + color:black; margin: 0; text-align: center; padding-bottom: 1rem; diff --git a/TutorLizard.Blazor/Components/StudentsScheduleItem.razor b/TutorLizard.Blazor/Components/StudentsScheduleItem.razor index 8de28d39..cdfd79de 100644 --- a/TutorLizard.Blazor/Components/StudentsScheduleItem.razor +++ b/TutorLizard.Blazor/Components/StudentsScheduleItem.razor @@ -5,7 +5,7 @@ {

@ScheduleItem.DateTime.ToString("HH:mm")

-
@ScheduleItem.AdTitle | Jako uczeń
+
@ScheduleItem.AdTitle | Jako uczeń
Nauczyciel: @ScheduleItem.TutorName
Status zgłoszenia: @GetStatusName(ScheduleItem.Status)
diff --git a/TutorLizard.Blazor/Components/StudentsScheduleItem.razor.css b/TutorLizard.Blazor/Components/StudentsScheduleItem.razor.css index e5389d9e..e50b42d2 100644 --- a/TutorLizard.Blazor/Components/StudentsScheduleItem.razor.css +++ b/TutorLizard.Blazor/Components/StudentsScheduleItem.razor.css @@ -2,11 +2,11 @@ background-color: white; padding: .5rem; margin: .25rem; - border-radius: .5rem; + border-radius: 0; } .item:hover { - background-color: lightblue; + background-color: #9db88c; transition: .25s; cursor: pointer; } diff --git a/TutorLizard.Blazor/Components/TutorsScheduleItem.razor.css b/TutorLizard.Blazor/Components/TutorsScheduleItem.razor.css index b8be8ce4..5043cf18 100644 --- a/TutorLizard.Blazor/Components/TutorsScheduleItem.razor.css +++ b/TutorLizard.Blazor/Components/TutorsScheduleItem.razor.css @@ -2,14 +2,14 @@ background-color: white; padding: .5rem; margin: .25rem; - border-radius: .5rem; + border-radius: 0; } -.item:hover { - background-color: lightblue; - transition: .25s; - cursor: pointer; -} + .item:hover { + background-color: #9db88c; + transition: .25s; + cursor: pointer; + } .item h4 { margin: 0; diff --git a/TutorLizard.Web/Controllers/BrowseController.cs b/TutorLizard.Web/Controllers/BrowseController.cs index abe95350..30cd8464 100644 --- a/TutorLizard.Web/Controllers/BrowseController.cs +++ b/TutorLizard.Web/Controllers/BrowseController.cs @@ -27,7 +27,7 @@ public BrowseController(IBrowseService browseService, _userAuthenticationService = userAuthenticationService; _uiMessagesService = uiMessagesService; _categoryService = categoryService; - _pageSize = 10; + _pageSize = 12; } public IActionResult Index() { diff --git a/TutorLizard.Web/Views/Account/ActivateAccount.cshtml b/TutorLizard.Web/Views/Account/ActivateAccount.cshtml index b1773218..c6561406 100644 --- a/TutorLizard.Web/Views/Account/ActivateAccount.cshtml +++ b/TutorLizard.Web/Views/Account/ActivateAccount.cshtml @@ -1,7 +1,2 @@ -@using TutorLizard.Web.Resources -@{ - ViewData["Title"] = @TutorLizard.Web.Resources.Account.AccountActivation; -} +

@ViewData["Title"]

- -

@TutorLizard.Web.Resources.Account.AccountActivated

\ No newline at end of file diff --git a/TutorLizard.Web/Views/Account/Login.cshtml b/TutorLizard.Web/Views/Account/Login.cshtml index 9838515e..e6d1b0ae 100644 --- a/TutorLizard.Web/Views/Account/Login.cshtml +++ b/TutorLizard.Web/Views/Account/Login.cshtml @@ -5,11 +5,11 @@ ViewData["Title"] = "Login"; } -

@TutorLizard.Web.Resources.Account.Login

+

@TutorLizard.Web.Resources.Account.Login


-
-
+
+
@@ -23,25 +23,25 @@
- +
-
+
-

@TutorLizard.Web.Resources.Account.LoginWithGoogle

+

@TutorLizard.Web.Resources.Account.LoginWithGoogle

-
+@*
Back -
+
*@ @section Scripts { @{ diff --git a/TutorLizard.Web/Views/Account/Register.cshtml b/TutorLizard.Web/Views/Account/Register.cshtml index 4cc35f7e..6aea6ecd 100644 --- a/TutorLizard.Web/Views/Account/Register.cshtml +++ b/TutorLizard.Web/Views/Account/Register.cshtml @@ -4,11 +4,11 @@ ViewData["Title"] = "Register"; } -

@TutorLizard.Web.Resources.Account.Register

+

@TutorLizard.Web.Resources.Account.Register


-
-
+