Skip to content

updated CSS for Student Reviews, MyRatings, ManageStudents, and Admin #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maria-stewart wants to merge 1 commit into
base: developer
Choose a base branch
from
Open

updated CSS for Student Reviews, MyRatings, ManageStudents, and Admin #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified CaPPMS/Data/StudentReviews.db
View file
Open in desktop
Binary file not shown.
32 changes: 20 additions & 12 deletions CaPPMS/Pages/StudentReviews/Admin.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,19 @@
background-color: rgb(30,30,120);
color: white;
}
.headerColorStudentScore{
background-color: rgb(243, 149, 9);
color: rgb(7, 6, 6);
}

.entriesColor {
background-color: rgb(51,16,90);
color: white;
}
.entriesColorWeeklyRatings{
background-color: rgb(243, 149, 9);
color: rgb(7, 6, 6);
}

.card-body {
max-height: calc(520px - 2.5rem); /* Set max height for the card body, considering the card header height */
Expand Down Expand Up @@ -81,7 +89,7 @@
</style>

<div class="card scores mt-4">
<h5 class="card-header headerColor">Student Scores</h5>
<h5 class="card-header headerColorStudentScore">Student Scores</h5>
<div class="form-group mb-3 m-lg-3" style="display: flex;">
<input id="filterInput" type="text" class="form-control short-search" oninput="applyFilter()" placeholder="Search Student..." />
<input id="clear-btn" class="btn btn-primary headerColor" style="margin-left: 5px" value="Clear Search" onclick="clearSearch()" />
Expand All @@ -92,10 +100,10 @@
<table id="studentScoreTable" class="table table-striped table-hover scrollTable">
<thead class="fixedHeader">
<tr>
<th>Details</th>
<th>First Name</th>
<th>Last Name</th>
<th>Average Score</th>
<th style="background-color: #960513; color: white;">Details</th>
<th style="background-color: #960513; color: white;">First Name</th>
<th style="background-color: #960513; color: white;">Last Name</th>
<th style="background-color: #960513; color: white;">Average Score</th>
</tr>
</thead>
<tbody class="scrollContent">
Expand All @@ -121,14 +129,14 @@
</div>

<div class="card mt-4" hidden="@(HidePanel)">
<h5 class="card-header entriesColor">Weekly Ratings</h5>
<h5 class="card-header entriesColorWeeklyRatings">Weekly Ratings</h5>
<div class="card-body">
<table id="studentsTable" class="table table-hover" border="1">
<thead>
<tr>
<th style="width: 150px;">Student</th>
<th style="width: 75px;">Average</th>
<th>&nbsp;</th>
<th style="width: 150px; background-color: #960513; color: white;">Student</th>
<th style="width: 75px; background-color: #960513; color: white;">Average</th>
<th style="background-color: #960513; color: white;">&nbsp;</th>
</tr>
</thead>
<tbody>
Expand All @@ -139,9 +147,9 @@
<table id="innerTable" class="table table-striped table-hover" border="1">
<thead>
<tr class="entriesColor">
<th style="width: 150px;">Week</th>
<th>Score</th>
<th>Comments</th>
<th style="width: 150px; background-color: rgb(243, 149, 9); color: rgb(7, 6, 6);">Week</th>
<th style="background-color: rgb(243, 149, 9); color: rgb(7, 6, 6);">Score</th>
<th style="background-color: rgb(243, 149, 9); color: rgb(7, 6, 6);">Comments</th>
</tr>
</thead>
<tbody>
Expand Down
26 changes: 17 additions & 9 deletions CaPPMS/Pages/StudentReviews/ManageStudents.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,19 @@
background-color: rgb(30,30,120);
color: white;
}
.headerColorStudentDirectory {
background-color: rgb(243, 149, 9);
color: rgb(7, 6, 6);
}

.entriesColor {
background-color: rgb(51,16,90);
color: white;
}
.entriesColorHeader {
background-color: rgb(243, 149, 9);
color: rgb(7, 6, 6);
}

.short-search {
width: 300px; /* Adjust as needed */
Expand Down Expand Up @@ -80,7 +88,7 @@
</style>

<div class="card classlist">
<h5 class="card-header headerColor">Student Directory</h5>
<h5 class="card-header headerColorStudentDirectory">Student Directory</h5>
<div class="form-group mt-2 mb-2">
<input id="filterInput" type="text" class="form-control short-search" oninput="applyFilter()" placeholder="Search Student..." />
<input id="clear-btn" class="btn btn-primary headerColor" style="margin-left: 5px" value="Clear Search" onclick="clearSearch()" />
Expand All @@ -95,10 +103,10 @@
<table id="manageStudentsTable" class="table table-striped table-hover scrollTable">
<thead class="fixedHeader">
<tr>
<th>Edit</th>
<th>First Name</th>
<th>Last Name</th>
<th>Assigned Team</th>
<th style="background-color: #960513; color: white;">Edit</th>
<th style="background-color: #960513; color: white;">First Name</th>
<th style="background-color: #960513; color: white;">Last Name</th>
<th style="background-color: #960513; color: white;">Assigned Team</th>
</tr>
</thead>
<tbody class="scrollContent">
Expand Down Expand Up @@ -129,14 +137,14 @@

<div class="editStudentContainer" style="display: flex; justify-content: center;">
<div class="card" style="width: 750px; margin-top: 10px;" hidden="@(HidePanel)">
<h5 class="card-header entriesColor"> Edit Selected Student</h5>
<h5 class="card-header entriesColorHeader"> Edit Selected Student</h5>
<div class="card-body">
<table id="studentsTable" class="table table-striped table-hover" style="background-color: lightgrey">
<thead>
<tr>
<th>Student</th>
<th>Score</th>
<th>Team</th>
<th style="background-color: #960513; color: white;">Student</th>
<th style="background-color: #960513; color: white;">Score</th>
<th style="background-color: #960513; color: white;">Team</th>
</tr>
<tr>
<td><InputText @bind-Value="@selectedStudent.FirstName" class="form-control" style="width: 200px;" /></td>
Expand Down
16 changes: 8 additions & 8 deletions CaPPMS/Pages/StudentReviews/MyRatings.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
}

.headerColor {
background-color: rgb(30,30,120);
color: white;
background-color: rgb(243, 149, 9);
color: rgb(5, 5, 5);
}

.entriesColor {
background-color: rgb(51,16,90);
background-color: rgb(243, 149, 9);
color: white;
}

Expand All @@ -37,7 +37,7 @@
/* Style for the outer table */
table.outerTable {
border-collapse: collapse;
border: 2px solid black; /* Add a border to the entire outer table */
border: 2px solid #960513; /* Add a border to the entire outer table */
}

/* Style for the outer table cells (except for the inner table) */
Expand Down Expand Up @@ -86,7 +86,7 @@
<table id="studentsTable" class="table table-hover">
<thead>
<tr>
<th style="width: 75px;">Average</th>
<th style="width: 75px; background-color: #960513; color: white; ">Average</th>
</tr>
</thead>
<tbody>
Expand All @@ -97,9 +97,9 @@
<table id="studentsTable" class="table table-striped table-hover" border="1">
<thead>
<tr class="entriesColor">
<th style="width: 150px; background-color: lightgray;">Week</th>
<th style="width: 75px; background-color: lightgray; ">Score</th>
<th style="background-color: lightgray; ">Comments</th>
<th style="width: 150px; background-color: #960513; color: white;">Week</th>
<th style="width: 75px; background-color: #960513; color: white; ">Score</th>
<th style="background-color: #960513; color: white; ">Comments</th>
</tr>
</thead>
<tbody>
Expand Down
23 changes: 14 additions & 9 deletions CaPPMS/Pages/StudentReviews/StudentReview.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,31 @@
}

.card-header {
color: white;
color: #030303;
font-size: 25px;
}

.card-header.description {
background-color: rgb(30, 30, 120);
background-color: rgb(243, 149, 9);
}

.card-header.evaluator {
background-color: rgb(46, 46, 131);
background-color: rgb(243, 149, 9);
}

.card-header.student {
background-color: rgb(51, 16, 90);
background-color: rgb(243, 149, 9);
}

.card-header.entries {
background-color: rgb(68, 19, 124);
background-color: rgb(243, 149, 9);
}

.custom-table-header {
background-color: #960513;
color: white;
}

.form-label {
font-size: 18px;
margin-left: 10px;
Expand Down Expand Up @@ -141,10 +146,10 @@
<table class="table table-striped">
<thead>
<tr>
<th>Week</th>
<th>Evaluated Team Member</th>
<th>Score</th>
<th>Comments</th>
<th class="custom-table-header">Week</th>
<th class="custom-table-header">Evaluated Team Member</th>
<th class="custom-table-header">Score</th>
<th class="custom-table-header">Comments</th>
</tr>
</thead>
<tbody>
Expand Down
23 changes: 14 additions & 9 deletions CaPPMS/StudentReviews/Pages/Index.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,30 @@
}

.card-header {
color: white;
color: rgb(243, 240, 240);
font-size: 25px;
}

.card-header.description {
background-color: rgb(30, 30, 120);
background-color: rgb(243, 149, 9);
}

.card-header.evaluator {
background-color: rgb(46, 46, 131);
background-color: rgb(243, 149, 9);
}

.card-header.student {
background-color: rgb(51, 16, 90);
background-color: rgb(243, 149, 9);
}

.card-header.entries {
background-color: rgb(68, 19, 124);
background-color: rgb(243, 149, 9);
}

.custom-table-header {
background-color: #960513;
color: white;
}

.form-label {
font-size: 18px;
Expand Down Expand Up @@ -139,10 +144,10 @@
<table class="table table-striped">
<thead>
<tr>
<th>Week</th>
<th>Evaluated Team Member</th>
<th>Score</th>
<th>Comments</th>
<th class="custom-table-header">Week</th>
<th class="custom-table-header">Evaluated Team Member</th>
<th class="custom-table-header">Score</th>
<th class="custom-table-header">Comments</th>
</tr>
</thead>
<tbody>
Expand Down
2 changes: 1 addition & 1 deletion CaPPMSTests/CaPPMSTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jun 23 08:50:38 CEST 2017
#Tue Apr 30 18:37:42 EDT 2024
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
zipStoreBase=GRADLE_USER_HOME