Skip to content

Commit

Permalink
Merge pull request #19 from mlegait/rebranding-1st-round
Browse files Browse the repository at this point in the history
Rebranding 1st round
  • Loading branch information
FroMage authored Jan 28, 2025
2 parents f1d89f7 + 112b02e commit 6af80ee
Show file tree
Hide file tree
Showing 57 changed files with 159 additions and 50 deletions.
2 changes: 1 addition & 1 deletion src/main/resources/messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ views.application.becomeSponsor.download=Sponsoring leaflet

views.application.schedule.title=Program
views.application.schedule.subtitle=Organize your day. Choose the talks and workshops you want to attend.
views.application.schedule.unavailable=The detailed program is not available yet, but you can have a look at the <a href="http://2024.rivieradev.fr/programme" target="_blank">2024&nbsp;session</a> to get an idea&nbsp;:)
views.application.schedule.unavailable=The detailed program is not available yet, but you can have a look at the <a href="http://2024.rivieradev.fr/schedule" target="_blank">2024&nbsp;session</a> to get an idea&nbsp;:)
views.application.schedule.unavailable.speakers.available=The detailed program will be available soon, in the meantime you can already have a look at <a href="/talks">the&nbsp;talks</a> as well as <a href="/speakers">the&nbsp;speakers</a>.
views.application.schedule.unavailable.talks=Discover the talks
views.application.schedule.unavailable.intro=In the meantime, you can see below how the days will be organized:
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/messages_fr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ views.application.becomeSponsor.download=Plaquette de sponsoring

views.application.schedule.title=Programme
views.application.schedule.subtitle=Organisez votre journée. Choisissez les talks et ateliers auxquels vous souhaitez assister.
views.application.schedule.unavailable=Le programme n'est pas encore disponible, mais vous pouvez consulter <a href="http://2024.rivieradev.fr/programme" target="_blank">le programme de l'édition 2024</a> pour avoir une idée&nbsp;:)
views.application.schedule.unavailable=Le programme n'est pas encore disponible, mais vous pouvez consulter <a href="http://2024.rivieradev.fr/schedule" target="_blank">le programme de l'édition 2024</a> pour avoir une idée&nbsp;:)
views.application.schedule.unavailable.speakers.available=Le programme heure par heure sera annoncé prochainement, en attendant vous pouvez déjà consulter <a href="/talks">les&nbsp;sessions</a> et <a href="/speakers">les&nbsp;orateurs</a>.
views.application.schedule.unavailable.talks=Découvrez les sessions
views.application.schedule.unavailable.intro=En attendant, voici comment seront organisées les journées :
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/Application/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="parallax__content">
<div class="parallax__logosContainer">
<div class="parallax__logos">
<img class="parallax__logo--rdev" src="/static/images/logos/logo_RD_full_white.svg" alt="Riviera DEV">
<img class="parallax__logo--rdev" src="/static/images/logos/Riviera_Dev_Logo_Principal_Blanc.svg" alt="Riviera DEV">
<img class="parallax__logo--judcon" src="/static/images/logos/quarkus_world_tour_white.svg" alt="Quarkus World Tour">
</div>
</div>
Expand Down
9 changes: 5 additions & 4 deletions src/main/resources/templates/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@

<!-- Google Fonts -->
<link href="https://fonts.googleapis.com/css?family=Muli:300,400,600,700" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Tomorrow:wght@300;400;600;700&display=swap" rel="stylesheet">

<!-- Font awesome -->
<script
Expand Down Expand Up @@ -102,7 +103,7 @@
<div class="burgerMenu__welcome">
<img
class="burgerMenu__welcome--logo"
src="/static/images/logos/logo_RD_full_white.svg"
src="/static/images/logos/Riviera_Dev_Logo_Secondaire_Blanc.svg"
alt="RivieraDEV"
/>
<div class="burgerMenu__welcome--info">
Expand Down Expand Up @@ -217,8 +218,8 @@
>
<span class="navbar-rivieradev navbar-animated-logo">
<img
src="/static/images/logo_RD_black.svg"
alt="RivieraDEV"
src="/static/images/logos/Riviera_Dev_Logo_Secondaire_Bleu_Ciel.svg"
alt="Riviera DEV"
/>
</span>
<span
Expand Down Expand Up @@ -349,7 +350,7 @@
<div class="footer__logo">
<img
class="footer__logoImg"
src="/static/images/logos/logo_RD_full_white.svg"
src="/static/images/logos/Riviera_Dev_Logo_Secondaire_Blanc.svg"
alt="RivieraDEV"
/>
</div>
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/web/app/stylesheets/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ $border-radius-xs: 4px;
$border-radius-sm: 10px;
$border-radius-md: 16px;

$font-title: 'Humant', sans-serif;

$font-xxxl: 4rem; // 40px
$font-xxl: 3rem; // 30px
$font-xl: 2.5rem; // 25px
Expand Down
64 changes: 63 additions & 1 deletion src/main/resources/web/app/stylesheets/partials/_common.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,70 @@
/* Humant font for titles */

@font-face {
font-family: 'Humant';
src: url('/static/fonts/Humant/Humant-Bold.otf') format('opentype');
font-weight: 700; /* bold */
font-style: normal;
}

@font-face {
font-family: 'Humant';
src: url('/static/fonts/Humant/Humant-Medium.otf') format('opentype');
font-weight: 600; /* semi-bold */
font-style: normal;
}

@font-face {
font-family: 'Humant';
src: url('/static/fonts/Humant/Humant-Light.otf') format('opentype');
font-weight: 400; /* regular */
font-style: normal;
}

@font-face {
font-family: 'Humant';
src: url('/static/fonts/Humant/Humant-ExtraLight.otf') format('opentype');
font-weight: 300; /* light */
font-style: normal;
}

/* Neulis font for common text */

@font-face {
font-family: 'Neulis';
src: url('/static/fonts/Neulis/NeulisAlt-Bold.ttf') format('truetype');
font-weight: 700; /* bold */
font-style: normal;
}

@font-face {
font-family: 'Neulis';
src: url('/static/fonts/Neulis/NeulisAlt-Medium.ttf') format('truetype');
font-weight: 600; /* semi-bold */
font-style: normal;
}

@font-face {
font-family: 'Neulis';
src: url('/static/fonts/Neulis/NeulisAlt-Light.ttf') format('truetype');
font-weight: 400; /* regular */
font-style: normal;
}

@font-face {
font-family: 'Neulis';
src: url('/static/fonts/Neulis/NeulisAlt-ExtraLight.ttf') format('truetype');
font-weight: 300; /* light */
font-style: normal;
}

html {
height: 100%;
font-size: 10px;
}

body {
font-family: 'Muli', sans-serif;
font-family: 'Neulis', sans-serif;
font-size: $font-sm;
position: relative;
min-height: 100vh;
Expand Down Expand Up @@ -164,6 +224,7 @@ a {

.home {
&__title {
font-family: $font-title;
font-size: $font-lg;
font-weight: $bold;
margin: $space-xs 0;
Expand Down Expand Up @@ -199,6 +260,7 @@ a {
}

&__mainTitle {
font-family: $font-title;
font-size: $font-xl;
font-weight: bold;
margin: $space-xs 0;
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/web/app/stylesheets/partials/_days.scss
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ $days-illustration-size-sm: 10rem;
&__title {
display: inline;
margin-top: 0;
font-family: $font-title;
font-weight: bold;
font-size: $font-md;

Expand Down Expand Up @@ -172,6 +173,7 @@ $days-illustration-size-sm: 10rem;
}

&__subtitle {
font-family: $font-title;
font-weight: bold;

&:first-child {
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/web/app/stylesheets/partials/_footer.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$footer-logo-height-xs: 5rem;
$footer-logo-height-sm: 7rem;
$footer-logo-height-xs: 4rem;
$footer-logo-height-sm: 5rem;

.footer {
background: linear-gradient($color-blue, $color-blue-medium);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ $counter-item-size: 12rem;
&__title {
grid-area: title;
align-self: center;
font-family: $font-title;
font-size: $font-lg;
font-weight: $bold;
margin-bottom: $space-sm;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
background-repeat: no-repeat;
background-size: cover;
color: $color-white;
font-family: $font-title;
font-size: $font-md;
font-weight: $semi-bold;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ body.burgerMenu--open .burgerMenu:before {
margin: 0;

img {
height: 100%;
height: 80%;
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ $background-height: 192px;
&__title {
margin: 0 $content-space-xs $space-md $content-space-xs;
text-align: left;
font-family: $font-title;

@media (min-width: $screen-sm-min) {
text-align: center;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
}

&__logo--rdev {
width: 45vw;
width: 65vw;
margin-bottom: $space-sm;

@media (min-width: $screen-sm-min) {
Expand All @@ -76,6 +76,7 @@

&__info {
color: white;
font-family: 'Tomorrow';
font-size: $font-lg;
font-weight: $light;
margin-bottom: 3rem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ $avatar-size: 30px;
cursor: pointer;
color: inherit;
transition: color 0.2s;
font-family: $font-title;

&--selected {
color: $color-yellow;
Expand Down Expand Up @@ -264,6 +265,11 @@ $avatar-size: 30px;
}
}

&__breakTitle {
font-family: $font-title;
font-size: $font-xxl;
}

&__track {
text-align: center;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ $sponsor-silver-height: 92px;
&__levelTitle {
margin: 0 $content-space-xs $space-md $content-space-xs;
text-align: center;
font-family: $font-title;
font-size: $font-xl;
font-weight: 300;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
License: Free for Personal Use
Link: https://befonts.com/humant-font-family.html
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 6af80ee

Please sign in to comment.