Skip to content

Commit

Permalink
Merge pull request #148 from makeopensource/Gradebook-Page-styling-Ca…
Browse files Browse the repository at this point in the history
…rds#78&82

Gradebook page styling cards#78&82
  • Loading branch information
jessehartloff authored Oct 16, 2024
2 parents f9e5ade + 4a22c58 commit a6e77bc
Show file tree
Hide file tree
Showing 9 changed files with 451 additions and 202 deletions.
19 changes: 12 additions & 7 deletions devU-client/src/assets/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,9 @@
background-color: var(--background);
color: var(--text-color);

--background: #FFF;
--text-color: #000;
--background: white;
--text-color: black;
--text-color2: white;
--text-color-secondary: #363636;
--focus: var(--blue);

Expand All @@ -83,6 +84,9 @@
--list-simple-item-background-hover: #a0a0a0;
--list-simple-item-subtext: #4b4b4b;

--blue-lighter: #74b9ff;
--blue: #0984e3;
--blue-darker: #083967;
--btn-secondary-border: var(--primary);
--btn-secondary-background: #FFF;
--btn-secondary-text: var(--primary);
Expand All @@ -100,8 +104,8 @@
--grey: #555555;
--grey-dark: #333333;

--blue-lighter: #78B7FF;
--blue: #1F3D7A;
//--blue-lighter: #78B7FF;
//--blue: #1F3D7A;

--red-lighter: #FFA3A3;
--red: #8A2626;
Expand All @@ -123,11 +127,12 @@
--background: #1e1e1e;
--text-color: #FFF;
--text-color-secondary: #9b9b9b;
--focus: var(--blue-lighter);

--blue-darker: #2767a3;
--primary-lighter: #3796bc;
--primary: #5c36c3;
// --primary-darker: rgb(92, 54, 195);

--primary: #7257EB;
//--primary: #7257EB;
// --primary-darker: #2F2363;

// --primary: #636666;
Expand Down
8 changes: 7 additions & 1 deletion devU-client/src/assets/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@
$background: var(--background);
$text-color: var(--text-color);
$text-color-secondary: var(--text-color-secondary);

$text-color2 : var(--text-color2);
$primary-lighter: var(--primary-lighter);
$primary: var(--primary);
$primary-darker: var(--primary-darker);
$blue-darker: var(--blue-darker);



$secondary-lighter: var(--secondary-lighter);
$secondary: var(--secondary);
Expand All @@ -38,6 +41,9 @@ $grey: var(--grey);
$blue-lighter: var(--blue-lighter);
$blue: var(--blue);




$red-lighter: var(--red-lighter);
$red: var(--red);

Expand Down
10 changes: 8 additions & 2 deletions devU-client/src/components/listItems/courseListItem.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@

.name {
font-size: 1.2rem;
font-weight: 700;
margin-bottom: 0.4rem;
font-weight: 600;
margin-bottom: 0;
padding:15px;
width:100%;
text-align:center;
box-sizing:border-box;


}

.tag {
Expand Down
2 changes: 2 additions & 0 deletions devU-client/src/components/listItems/courseListItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ const CourseListItem = ({course, isOpen}: Props) => {
setIsOpen(isOpen);
}, [isOpen]);



return (
<div className={styles.courseContainer} onClick={toggleOpen}>
<div className={styles.name}>
Expand Down
23 changes: 19 additions & 4 deletions devU-client/src/components/misc/globalToolbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,19 @@ $font-size: 16px;
@extend .flex;

text-decoration: none;

color: #d9d9d9;
font-size: $font-size;

//height: $bar-height;

margin:3vw;
height: 4vh;
flex-grow: .05;
border-radius: 3vw;
font-weight: 550;
//font-size: 14px;

font-size: 14px;
padding:0.5vw;

Expand All @@ -33,16 +39,25 @@ $font-size: 16px;

.header {
@extend .link;

font-size: 40px;
border-radius: 30px;
color: #D9D9D9;
font-weight: 550;
//font-size: 2em;
//font-weight: bold;
}

.bar {
height: 60px;
background-color: #52468A;
height: 80px;
background-color: $purple;
//height: $bar-height;

font-size: 40px;
border-radius: 30px;
color: #D9D9D9;
font-weight: 550;
}

@extend .flex;
justify-content: space-between;
}
Expand Down Expand Up @@ -88,7 +103,7 @@ $font-size: 16px;
background: transparent;
border: none;

color: $text-color;
color: $yellow;
font-size: $font-size;

&:hover {
Expand Down
154 changes: 134 additions & 20 deletions devU-client/src/components/pages/courses/courseDetailPage.scss
Original file line number Diff line number Diff line change
@@ -1,36 +1,150 @@
@import 'variables';

.courseFormWrapper {
display: flex;
margin: 16px 50px;
gap: 30px;
}

.categoriesContainer {
display: grid;
grid-template-columns: repeat(3, 1fr);
gap: 20px; /* adjust this value to set the space between the cards */
grid-template-rows: repeat(3, 1fr);
gap: 200px; /* adjust this value to set the space between the cards */
margin-bottom: 20px;
min-height: 200px;
max-height: 500px;
}


.color{
background-color: $purple;
color: $text-color2;
width: 100%;
padding: 20px;
text-align: center;
font-size: 1.2em;

}
.coursesContainer {
display: flex;
flex-wrap: wrap;
//flex-direction: row;
gap: 20px;
margin-top:20px;
}
.courseCard {
display: flex;
flex:1 0 250px;
max-width: 350px;
flex-direction: column;
justify-content: space-between;
align-items: stretch;
height: 100%;
padding: 0;
background-color: #D9D9D9;
border-radius: 5px;
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
overflow: hidden;
margin-bottom: 20px;

.MuiList-root {
padding: 20px;



.MuiListItemText-primary {
text-align: center; // Center the assignment name
}

.MuiListItemText-secondary {
text-align: center; // Center the dates
}
}
}



.courseDetailPage{
padding: 20px;


.header {
display: flex;
align-items: center;
}
flex-direction: column;
//justify-content: flex-start;
//grid-template-columns: 2fr 1fr;
justify-content: space-between;
align-items: flex-start;
background-color: $secondary;
// padding: 30px 60px;
padding: 20px;
//border-radius: 10px;
color: $text-color;
width: 70%;
h1{
margin: 0 0 10px 0;
font-size: 2.5rem;
}
h2{
margin: 0 0 20px 0;
font-size: 1.5rem;
}
.buttons-container {
display: flex;
// flex-wrap: wrap;
flex-direction: row;
justify-content: space-around;

.smallLine {
width: 50px; /* adjust this value to set the length of the small line */
border-top: 3px solid $text-color; /* adjust this value to set the color and thickness of the line */
margin-right: 10px; /* adjust this value to set the space between the line and the text */
.actual_button {
display: flex;
flex-direction: row;
border: 0; /* Primary button color */
/* Button text color */
padding: 10px 20px; /* Padding for button */
border-radius: 5px;
text-decoration: none;
font-weight: 600;
transition: background-color 0.3s ease;
//margin : 0 10px;
background-color: $purple;
color: white;
border: none;

&:hover { // Add a hover effect
background-color: darken(purple, 10%); // Slightly darken on hover
cursor: pointer;
}
}
}
}

.largeLine {
flex-grow: 1;
border-top: 3px solid $text-color; /* adjust this value to set the color and thickness of the line */
margin-left: 10px; /* adjust this value to set the space between the line and the text */
margin-right: 10px; /* add this line to create some space between the line and the button */
}








.input {
width: 400px;
padding: 8px;
border-radius: 5px;
border: none;
}

.buttons {
margin : 0 10px;

.assignment_card {
flex: 1;
color: $text-color2;
align-items: start;
text-align: center;
border-radius: 10px;
min-width : 200px;

}

.color{
background-color: $list-item-background;
color: $text-color;
max-width : 345px;
}
.assignment-card:hover {
transform: scale(1.05);
}
Loading

0 comments on commit a6e77bc

Please sign in to comment.