Merge pull request #32 from megaya/rubykaigi2025

2025用にフォントを変更
ruby-no-kai · Dec 13, 2024 · 987287e · 987287e
2 parents d768ea7 + c7c91dd
commit 987287e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/app/assets/stylesheets/base/_variables.scss b/app/assets/stylesheets/base/_variables.scss
@@ -1,3 +1,5 @@
+@import url('https://fonts.googleapis.com/css2?family=Aoboshi+One&family=Lexend:[email protected]&family=Noto+Sans+JP:[email protected]&display=swap');
+
 $bootstrap-sass-asset-helper: false !default;
 //
 // Variables
@@ -81,9 +83,10 @@ $link-hover-decoration: underline !default;
 
 $font-family-sans-serif:  "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif !default;
 $font-family-serif:       Georgia, "Times New Roman", Times, serif !default;
+$font-family-lexend:  'Lexend', sans-serif, Helvetica, Arial, sans-serif !default;;
 //** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
 $font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace !default;
-$font-family-base:        $font-family-sans-serif !default;
+$font-family-base:        $font-family-lexend !default;
 
 $font-size-base:          14px !default;
 $font-size-large:         ceil(($font-size-base * 1.25)) !default; // ~18px
@@ -939,6 +942,7 @@ $brand-info-alt:#4E6994;
 
 $headings-font-weight: 600;
 $font-family-sans-serif:  'Montserrat', sans-serif;
+$font-family-lexend:  'Lexend', sans-serif;
 
 $navbar-default-link-active-bg: $color-accent;
 $navbar-default-link-hover-color: $color-accent;

diff --git a/app/assets/stylesheets/override/_base.scss b/app/assets/stylesheets/override/_base.scss
@@ -1,5 +1,5 @@
 body {
-  font-family: $font-family-sans-serif;
+  font-family: $font-family-lexend;
   background-color: $color-base;
   color: $color-main;
 }

diff --git a/app/assets/stylesheets/override/_nav.scss b/app/assets/stylesheets/override/_nav.scss
@@ -49,7 +49,7 @@
 
 .navbar-brand {
   color: $color-main;
-  font-family: $font-family-sans-serif;
+  font-family: $font-family-lexend;
   font-weight: bold;
 }
 

diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml
@@ -6,7 +6,7 @@
         %span.icon-bar
         %span.icon-bar
       - if current_event
-        = link_to 'RubyKaigi 2024', event_path(current_event), class: 'navbar-brand'
+        = link_to 'RubyKaigi 2025', event_path(current_event), class: 'navbar-brand'
       - else
         = link_to "CFP App", events_path, class: 'navbar-brand'