Skip to content

Commit

Permalink
Merge changes from master, including new SCSS fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
LswaN58 committed Aug 23, 2024
2 parents 8f5edf1 + 7020a17 commit 8500ec2
Show file tree
Hide file tree
Showing 8 changed files with 518 additions and 502 deletions.
53 changes: 53 additions & 0 deletions site/assets/styles/scss/about.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/* About */
#about {
.container-fluid {
padding-left: 7vw;
padding-right: 7vw;
padding-top: 4rem;
}
.about-robot{
text-align: center;
img{
width: 65%;
}
}
.about-data{
text-align: center;
img{
width: 90%;
}
}
.top-buffer{
margin-top: 26px;
}
.blue-grad {
background: no-repeat linear-gradient(137deg, #41F9EC, #44CAFC);
> div {
border: 1px solid #89F1DB;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
> p {
max-width: 20rem;
}
}
}
.img-fluid-box {
max-width: 75%;
height: auto;
}
hr { color: #C2CCDA; border-top: 6px solid; border-radius: .625rem !important; }
h3 {
font-size: 1.875rem;
}
.staff-photo {
width: 100%;
max-width: 330px;
height: auto;
margin-top: 6rem;
@media (max-width: 575.98px) {
margin-top: 4rem;
}
}
}
39 changes: 39 additions & 0 deletions site/assets/styles/scss/dashboard.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/* Dashboard */
#dashboard {
line-height: 1.5;
.container-fluid {
padding-left: 7vw;
padding-right: 7vw;
padding-top: 4rem;
}
.card-img-top {
height: 65%;
object-fit: cover;
// XL
@media(max-width: 1399.98px) {
height:60%
}
// LG
@media(max-width: 1199.98px) {
height:55%
}
// MD
@media(max-width: 991.98px) {
height:50%
}
// SM
@media(max-width: 767.98px) {
height:50%
}
// XS
@media(max-width: 575.98px) {
height:65%
}
}
.card:hover {
transform: scale(1.05);
}
.top-buffer{
margin-top: 26px;
}
}
66 changes: 66 additions & 0 deletions site/assets/styles/scss/footer.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
footer {
background-color: #f5f7fa;
width: 100%;
color: var(--bs-body-color);

.ogd-logo {
max-width: 367px;
width: 100%;
}
.fd-logo-wrapper{

a{
text-decoration: none;
color: inherit;
padding: .35rem;
display: inline-block;
}

font-size: 1.5rem;
vertical-align: middle;

em{
vertical-align: middle;
}
}
.uw-logo-wrapper{
a{
display: inline-block;
padding: .35rem;
}
}
.border-end{
border-top-right-radius: .625rem !important;
border-bottom-right-radius: .625rem !important;
border-right-color: #DAE2EB !important;
border-right-width: 5px !important;
}
.vr-wrapper{
text-align: center;
margin-left: -17px;
margin-right: -17px;
@media(max-width: 767.98px){
display: none;
}
}
.vr{
width: 5px;
color: #DAE2EB;
height: 100%;
border-radius: .625rem !important;
}
.btn-signup{
background-color: var(--bs-body-color);
color: white;
font-weight: normal;
font-size: 12px;

&:hover, &:focus {
color: var(--bs-body-color);
background-color: white;
border: 1px solid var(--bs-body-color);
font-size: 12px;
font-weight: normal;
}
}
}
Loading

0 comments on commit 8500ec2

Please sign in to comment.