Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/assets/stylesheets/application.postcss.css
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,6 @@
@import "./modules/teammates.css";
@import "./modules/staff-website-page.css";

@import "./override/index.css";

@import "tailwindcss/utilities";
9 changes: 9 additions & 0 deletions app/assets/stylesheets/override/2026.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/* For RubyKaigi 2026 */
:root {
--body-bg: #F9EFEC;
--text-color: #000;
}

h1, h2, h3 {
font-family: var(--font-family-outfit);
}
56 changes: 56 additions & 0 deletions app/assets/stylesheets/override/bootstrap.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/* Override navbar styles for RubyKaigi fork */
.navbar-default {
background-color: var(--gray-lightest);
border: none;
box-shadow: 0 2px 1px var(--gray-light);
}

.navbar-default .navbar-brand,
.navbar-default .navbar-nav .nav-link {
color: var(--text-color);
}

.navbar-default .navbar-brand:hover,
.navbar-default .navbar-brand:focus,
.navbar-default .navbar-brand:active,
.navbar-default .navbar-nav .nav-link:hover,
.navbar-default .navbar-nav .nav-link:focus,
.navbar-default .navbar-nav .nav-link:active {
color: var(--gray-light);
}

.navbar-default .navbar-brand {
font-family: var(--font-family-sans-serif);
font-weight: bold;
padding-left: 0;
}

@media (min-width: 992px) {
.navbar-default .navbar-nav .nav-item.active .nav-link,
.navbar-default .navbar-nav .nav-item .nav-link.active {
background-color: var(--gray-dark) !important;
color: white;
border-radius: 4px;
padding-top: 5px;
padding-bottom: 5px;
margin-top: 7px;
}
}

@media (max-width: 991px) {
.navbar-default .navbar-nav .nav-item.active .nav-link,
.navbar-default .navbar-nav .nav-item .nav-link.active {
background-color: transparent;
color: var(--text-color);
}
}

.navbar-default .navbar-toggler{
border-color: var(--gray);
background-color: var(--gray);
color: var(--text-color);
}

.navbar-toggler:focus {
box-shadow: 0 0 0 2px;
}
5 changes: 5 additions & 0 deletions app/assets/stylesheets/override/index.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@import "./variables.css";
@import "./layout.css";
@import "./bootstrap.css";

@import "./2026.css"
4 changes: 4 additions & 0 deletions app/assets/stylesheets/override/layout.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
body {
background-color: var(--body-bg);
color: var(--text-color);
}
8 changes: 8 additions & 0 deletions app/assets/stylesheets/override/variables.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/* Override variables for RubyKaigi fork */
:root {
--body-bg: white;
--gray-lightest: hsl(from var(--black) h s calc(l + 97));

--font-family-sans-serif: 'Montserrat', sans-serif;
--font-family-outfit: 'Outfit', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
}
4 changes: 2 additions & 2 deletions app/views/devise/sessions/new.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|

.form-inputs
.col-sm-5.col-centered
.col-sm-10.col-md-7.col-lg-6.col-centered
.card
.card-body
= f.error_notification
Expand All @@ -20,7 +20,7 @@
.form-group= render "devise/shared/links"

- unless Rails.env.production?
.col-sm-5.col-centered.mt-3
.col-sm-10.col-md-7.col-lg-6.col-centered.mt-3
.card
.card-body
.form-group
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/_navbar.html.haml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.navbar.navbar-expand-lg.navbar-default.fixed-top
.container-fluid
- if current_event
= link_to "#{current_event.name} CFP", event_path(current_event), class: 'navbar-brand'
= link_to "RubyKaigi 2026", event_path(current_event), class: 'navbar-brand'
- else
= link_to "CFP App", events_path, class: 'navbar-brand'
%button.navbar-toggler{ type: "button", data: { bs_toggle: "collapse", bs_target: ".navbar-collapse" }, aria: { controls: "navbarNav", expanded: "false", label: "Toggle navigation" } }
Expand Down
5 changes: 5 additions & 0 deletions app/views/layouts/application.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@

= stylesheet_link_tag 'application', media: 'all'
= stylesheet_link_tag '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', media: 'all'

%link{rel:'preconnect', href:'//fonts.googleapis.com'}
%link{rel:'preconnect', href:'//fonts.gstatic.com', crossorigin: ''}
= stylesheet_link_tag "//fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600"
= stylesheet_link_tag '//fonts.googleapis.com/css2?family=Montserrat:wght@400;700&display=swap'
= stylesheet_link_tag '//fonts.googleapis.com/css2?family=Outfit:wght@100..900&display=swap'

= javascript_include_tag 'application', 'data-turbo-track': 'reload', type: 'module'

Expand Down
Loading