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 12, 2024
2 parents e0253c8 + 6827e6e commit e2bb808
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 40 deletions.
23 changes: 11 additions & 12 deletions app/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,22 +42,20 @@ export default function Home() {
/>
</div>
</div>


<div className="body lg:mx-36 md:mx-14 sm:mx-8 mx-4 lg:my-12 md:my-8 sm:my-4 my-4 xl:mx-44 2xl:mx-60">
<section className="award_section">
<FontAwesomeIcon className="award_icon" icon={faTrophy} />
<div className="award_title">

<div>
<FontAwesomeIcon className="award_icon" icon={faTrophy} />
<div className="award_title">
<div>
<h3> {t("front.awardH2")} </h3>
<h5>{t("front.awardTitle")}</h5>
</div>
<div className="award_card_text">

<small>{t("front.awardBody")}</small>
</div>
</div>


<div className="award_card_text">
<small>{t("front.awardBody")}</small>
</div>
</div>
</section>

<section className="latest_publications">
Expand All @@ -80,7 +78,8 @@ export default function Home() {

<GridElement />
</section>
</div>
</div>

</section>
</main>
<Footer />
Expand Down
7 changes: 4 additions & 3 deletions app/sass/lib/_mixins.sass
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,11 @@
width: 100vw
display: flex
flex-flow: wrap row
gap: 1.5rem
justify-content: space-between
align-items: center
transition: 0.5s
padding: 1.5rem 2.5rem 1.5rem 2.25rem
padding: 1.5rem 2.25rem 1.5rem 2.25rem
.imagotype
width: 100%
display: flex
Expand Down Expand Up @@ -271,13 +272,13 @@
justify-content: space-between
flex-wrap: nowrap
align-items: center
padding: 1.6rem 0rem 0 0rem
// padding: 1.6rem 0rem 0 0rem
ul
display: flex
flex-flow: row nowrap
justify-content: space-between
font-size: 1.2rem
gap: 1.2rem
gap: 2rem

@mixin nav_bar_one_line
.imagotype
Expand Down
8 changes: 4 additions & 4 deletions app/sass/lib/_type.sass
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
$icon: 14px,14px, 16px,400
$xs-text: 14px, 13px, 16px, 400, 140%, 1rem, 0.6rem //small
$body-text: 14px, 16px, 19px, 400, 140%, 1rem, 0.6rem
$button: 14px, 16px, 19px, semibold //buttons
$sm-text: 16px, 18px, 22px, 600, 140%, 1rem, 0.6rem //h5
$md-text: 18px, 20px, 24px, 600, 140%, 1rem //h4
$body-text: 14px, 16px, 18px, 400, 140%, 1rem, 0.6rem
$button: 14px, 16px, 18px, semibold //buttons
$sm-text: 16px, 18px, 20px, 600, 140%, 1rem, 0.6rem //h5
$md-text: 18px, 20px, 22px, 600, 140%, 1rem //h4
$lg-text: 22px, 26px, 30px, 600,140%, 1rem //h3
$xl-text: 25px, 30px, 36px, bold, 140%, 1rem //h2
$xxl-text: 28px, 36px, 42px, bold, 140%, 1rem //h1
Expand Down
2 changes: 1 addition & 1 deletion app/sass/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ TYPOGRAPHY
margin: 0;
padding: 0;
box-sizing: border-box;

text-wrap: balance; // equilibra los párrafos evitando viudas
&::selection {
background-color: lighten($color: $blue-primary, $amount: 20);
}
Expand Down
1 change: 1 addition & 0 deletions app/sass/partials/_courses.sass
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ $windowWidth: 100vw

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

Expand Down
15 changes: 6 additions & 9 deletions app/sass/partials/_home.sass
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
object-position: 50% 0
.award_section
display: flex
margin: $spacing_xl auto
background: #fff9e6
gap: 0.2rem
border-radius:24px
padding: 0.8rem
gap: $spacing_md
border-radius: 24px
border: 2px $ca-or-100 solid
@apply text-orange-500
width:100%
Expand Down Expand Up @@ -65,20 +65,17 @@
padding: 0.75rem
margin-bottom: 0.8rem
background: #ffe489
border-radius:80px
border-radius: 80px
@apply text-orange-400
@include drop-shadow-lighter





@media (min-width: 600px)
.award_section
width:85%
padding: 1rem 2rem 1rem 2rem
padding: 1.5rem 2rem 1rem 2rem
flex-direction: column

.award_icon
min-width: 4rem
height: 4rem
Expand All @@ -95,7 +92,7 @@
flex-direction: row
width:70%
text-align: left
gap: 1.2rem
// gap: 1.2rem
align-self: flex-start
.award_title
display: flex
Expand Down
8 changes: 4 additions & 4 deletions app/sass/partials/_publications.sass
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
text-align: left
display: flex
flex-wrap: wrap
padding-bottom: $spacing_sm
padding-bottom: $spacing_lg
border-bottom: solid 1px $ca-blue-200
justify-content: left
.filter
Expand Down Expand Up @@ -169,7 +169,7 @@
display: flex
flex-wrap: wrap
gap: 4px
padding-bottom: $spacing_sm
padding-bottom: $spacing_lg
border-bottom: solid 1px $ca-blue-100
justify-content: space-between
.filter
Expand All @@ -192,9 +192,9 @@
gap: $spacing_xsm
display: flex
flex-direction: column
padding: $spacing_xsm 0 $spacing_sm 0
padding: $spacing_sm 0 $spacing_md 0
.paper
padding: 6px 0 $spacing_sm 0
padding: $spacing_sm 0 $spacing_md 0



Expand Down
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e2bb808

Please sign in to comment.