Skip to content

Commit

Permalink
Merge branch 'main' of github.com:CyberAula/cyberaula.github.io
Browse files Browse the repository at this point in the history
  • Loading branch information
clara7227 committed Jun 13, 2024
2 parents 4644143 + 582877a commit 80b2a87
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 13 deletions.
2 changes: 2 additions & 0 deletions app/sass/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,8 @@ button {
}

main {
max-width: 1440px;
margin: 2.5rem auto;
.our_projects {
.project {
display: flex;
Expand Down
3 changes: 1 addition & 2 deletions app/sass/partials/_courses.sass
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ $windowWidth: 100vw

@media (min-width: 770px)
.course
min-height: 300px
display: flex
color: white
font-weight: 400
height: 250px
overflow: hidden
.card_container_top
height: 32px
Expand Down Expand Up @@ -106,7 +106,6 @@ $windowWidth: 100vw

@media (min-width: 1400px)
.course
height: 300px
.course_text_block
max-width: 100rem

Expand Down
16 changes: 5 additions & 11 deletions app/sass/partials/_recentPublications.sass
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
@import "../lib/_mixins.sass"

._publications._recent_publications
// display: grid
// display: grid
// grid-template-rows: repeat(3, 1fr)
// grid-template-columns: repeat(2, 1fr)
Expand Down Expand Up @@ -48,26 +47,21 @@
border: 4px solid $ca-blue-400

.article_content
@apply min-h-[350px]
@apply flex flex-col justify-between
gap: $spacing_xsm
display: flex
flex-direction: column
padding-left: $spacing_sm
padding-bottom: $spacing_sm
padding-right: $spacing_md
padding-top: $spacing_sm
padding: $spacing_md $spacing_sm
.article_date
span
display: flex
small
display: flex
@include border-tag



.article_title
font-weight: $bold
@apply text-gray-800
margin-top: 0.6rem
margin-bottom: 0
margin: 0.6rem 0 0 0

.article_author
font-weight: $regular
Expand Down

0 comments on commit 80b2a87

Please sign in to comment.