Skip to content

Commit 883151c

Browse files
authored
Merge pull request #219 from makeopensource/#37-updated-Student-Gradebook
#37 updated student gradebook
2 parents b82a2df + 8baa16b commit 883151c

2 files changed

Lines changed: 267 additions & 59 deletions

File tree

Lines changed: 155 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
@import 'variables';
22

3-
3+
// Category Styling
44
.categoryName {
55
color: $text-color;
66
font-size: 1.25rem;
77
}
88

9+
// Table Wrapper for layout consistency
910
.tableWrapper {
1011
padding: 0 100px;
1112
}
@@ -16,12 +17,11 @@
1617
}
1718

1819
table {
19-
border-radius: 20px;
20-
// margin: 15px auto;
21-
border-collapse: collapse;
2220
width: 100%;
21+
border-collapse: collapse;
2322
}
2423

24+
// Alternating Row Colors
2525
tr.evenRow {
2626
background-color: $table-row-even;
2727
}
@@ -30,18 +30,19 @@ tr.oddRow {
3030
background-color: $table-row-odd;
3131
}
3232

33+
// Table Header & Cell Styling
3334
th {
34-
background-color: $primary;
35-
color: #FFF;
36-
font-weight: 600;
35+
background-color: #5a3d8a;
36+
color: white;
3737
}
3838

39-
td,
40-
th {
39+
th, td {
4140
padding: 10px;
42-
text-align: center;
41+
border-bottom: 1px solid #ccc;
42+
text-align: left;
4343
}
4444

45+
// Table Borders & Rounded Corners
4546
th:first-of-type {
4647
border-top-left-radius: 10px;
4748
}
@@ -58,12 +59,20 @@ tr:last-of-type td:last-of-type {
5859
border-bottom-right-radius: 10px;
5960
}
6061

62+
// Table Options Section
6163
.tableOptions {
6264
display: flex;
6365
justify-content: space-between;
6466
align-items: center;
6567
}
6668

69+
.topSection {
70+
display: flex;
71+
justify-content: space-between;
72+
align-items: center;
73+
}
74+
75+
// Text Colors for Status Indicators
6776
.tableOptions span:first-child,
6877
span.yellow {
6978
color: $yellowText;
@@ -74,42 +83,163 @@ span.red {
7483
color: $redText;
7584
}
7685

77-
// STUDENT GRADEBOOK STYLING
78-
79-
// .header {
80-
// color: $text-color;
81-
// display: flex;
82-
// align-items: center;
83-
// justify-content: center;
84-
// // margin-bottom: 20px;
85-
// }
86-
86+
// Student Gradebook Styling
8787
.assignmentName {
8888
text-align: left;
8989
}
9090

91-
.gradebook-container {
91+
.gradebookContainer {
9292
display: flex;
93+
flex-direction: column;
9394
gap: 20px;
94-
flex-wrap: wrap;
9595
}
9696

97-
.category {
98-
width: calc(100%/3 - 14px);
97+
// Section Styling
98+
.section {
99+
background-color: white;
100+
padding: -3px;
101+
border-radius: 10px;
102+
border: 2px solid #5a3d8a;
103+
}
104+
105+
.categoryRow {
106+
font-weight: bold;
99107
}
100108

109+
.categoryValue {
110+
text-align: right;
111+
padding-right: 10px; // 🟢 Fix: Align value to the left
112+
}
113+
114+
.categoryText {
115+
text-align: left;
116+
padding-left: 10px; // 🟢 Fix: Align "Category Average" text to the right
117+
}
118+
119+
// Assignment Link Styling
120+
.assignmentLink {
121+
color: blue;
122+
text-decoration: underline;
123+
}
124+
125+
// Category Average Styling (Adjusted for spacing)
126+
.categoryAverage {
127+
font-size: 14px;
128+
text-align: right;
129+
padding: 10px;
130+
font-weight: bold;
131+
margin-top: 10px; // 🟢 FIX: Added spacing so it doesn’t overlap
132+
}
133+
134+
// Page Wrapper & Title
135+
.pageWrapper {
136+
padding: 20px;
137+
}
138+
139+
.gradebookTitle {
140+
text-align: center;
141+
font-size: 2rem;
142+
font-weight: bold;
143+
}
144+
145+
// 🟢 FIX: "Back to Course" Button Alignment
146+
.backToCourseButton {
147+
background-color: #5a3d8a;
148+
color: white;
149+
padding: 8px 15px;
150+
border-radius: 30px;
151+
border: none;
152+
cursor: pointer;
153+
position: absolute;
154+
top: 137px;
155+
right: 30px;
156+
}
157+
158+
// Section Headers (Purple Background)
159+
.sectionHeader {
160+
background-color: #5a3d8a;
161+
color: white;
162+
padding: 12px 20px;
163+
border-radius: 8px 8px 0 0;
164+
font-weight: bold;
165+
display: flex;
166+
justify-content: space-between; // 🟢 FIX: Ensures Late Days & Score are in the same row
167+
align-items: center;
168+
}
169+
170+
.headerRight {
171+
display: flex;
172+
gap: 20px; // 🟢 FIX: Adds spacing between Late Days and Score
173+
}
174+
175+
// Gradebook Layout (Using Grid)
176+
.gradebookGrid {
177+
display: grid;
178+
grid-template-columns: 1fr 1fr;
179+
grid-gap: 20px;
180+
width: 100%; // 🟢 FIX: Ensures the grid container spans full width
181+
}
182+
183+
// 🟢 FIX: Project Section Width Adjusted
184+
.sectionLeft {
185+
grid-column: 1;
186+
}
187+
188+
.sectionRight {
189+
grid-column: 2;
190+
}
191+
192+
.sectionFull {
193+
grid-column: 1 / span 1; // 🟢 FIX: Project is same width as Homeworks
194+
}
195+
196+
// Empty Assignments Text
197+
.noAssignments {
198+
text-align: center;
199+
padding: 10px;
200+
font-style: italic;
201+
}
202+
203+
// Course Average Box Styling
204+
.courseAverage {
205+
border: 2px solid #5a3d8a;
206+
padding: 14px;
207+
display: flex;
208+
justify-content: space-between; // 🟢 FIX: Pushes the value to the rightmost side
209+
font-weight: bold;
210+
width: 99.01%;
211+
grid-column: span 2;
212+
margin-top: 20px;
213+
border-radius: 13px;
214+
}
215+
216+
// 🟢 FIX: Mobile Responsive Adjustments
101217
@media (max-width: 650px) {
102218
.pageWrapper {
103219
padding: 0 20px;
104220
}
105221

106222
.category {
107-
width: calc(100%/2 - 14px);
223+
width: calc(100% / 2 - 14px);
224+
}
225+
226+
.gradebookGrid {
227+
display: flex;
228+
flex-direction: column;
229+
}
230+
231+
.section {
232+
width: 100%;
108233
}
109234
}
110235

111236
@media (max-width: 450px) {
112237
.category {
113238
width: 100%;
114239
}
240+
241+
.backToCourseButton {
242+
position: relative; // 🟢 FIX: Prevents it from overlapping content on small screens
243+
margin-top: 10px;
244+
}
115245
}

0 commit comments

Comments
 (0)