From 81efb34a2fa07364292356f686a0476f806799f8 Mon Sep 17 00:00:00 2001 From: neotag Date: Sun, 14 Dec 2025 17:31:04 +0900 Subject: [PATCH 1/3] Restore styles --- .../stylesheets/application.postcss.css | 2 + app/assets/stylesheets/override/bootstrap.css | 56 +++++++++++++++++++ app/assets/stylesheets/override/index.css | 3 + app/assets/stylesheets/override/layout.css | 4 ++ app/assets/stylesheets/override/variables.css | 8 +++ app/views/layouts/application.html.haml | 4 ++ 6 files changed, 77 insertions(+) create mode 100644 app/assets/stylesheets/override/bootstrap.css create mode 100644 app/assets/stylesheets/override/index.css create mode 100644 app/assets/stylesheets/override/layout.css create mode 100644 app/assets/stylesheets/override/variables.css diff --git a/app/assets/stylesheets/application.postcss.css b/app/assets/stylesheets/application.postcss.css index ac3bfbe8e..fae126c42 100644 --- a/app/assets/stylesheets/application.postcss.css +++ b/app/assets/stylesheets/application.postcss.css @@ -45,4 +45,6 @@ @import "./modules/teammates.css"; @import "./modules/staff-website-page.css"; +@import "./override/index.css"; + @import "tailwindcss/utilities"; diff --git a/app/assets/stylesheets/override/bootstrap.css b/app/assets/stylesheets/override/bootstrap.css new file mode 100644 index 000000000..576552c29 --- /dev/null +++ b/app/assets/stylesheets/override/bootstrap.css @@ -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; +} diff --git a/app/assets/stylesheets/override/index.css b/app/assets/stylesheets/override/index.css new file mode 100644 index 000000000..1710b0fc7 --- /dev/null +++ b/app/assets/stylesheets/override/index.css @@ -0,0 +1,3 @@ +@import "./variables.css"; +@import "./layout.css"; +@import "./bootstrap.css"; diff --git a/app/assets/stylesheets/override/layout.css b/app/assets/stylesheets/override/layout.css new file mode 100644 index 000000000..49e79002c --- /dev/null +++ b/app/assets/stylesheets/override/layout.css @@ -0,0 +1,4 @@ +body { + background-color: var(--body-bg); + color: var(--text-color); +} diff --git a/app/assets/stylesheets/override/variables.css b/app/assets/stylesheets/override/variables.css new file mode 100644 index 000000000..d3f1345d9 --- /dev/null +++ b/app/assets/stylesheets/override/variables.css @@ -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'; +} diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 1a892abe1..33b669b16 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -6,7 +6,11 @@ = 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' = javascript_include_tag 'application', 'data-turbo-track': 'reload', type: 'module' From 02e6d6b6368ca80d72ced2e08d181fcaf656abc0 Mon Sep 17 00:00:00 2001 From: neotag Date: Sun, 14 Dec 2025 17:33:18 +0900 Subject: [PATCH 2/3] RubyKaigi 2026 --- app/assets/stylesheets/override/2026.css | 9 +++++++++ app/assets/stylesheets/override/index.css | 2 ++ app/views/layouts/_navbar.html.haml | 2 +- app/views/layouts/application.html.haml | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 app/assets/stylesheets/override/2026.css diff --git a/app/assets/stylesheets/override/2026.css b/app/assets/stylesheets/override/2026.css new file mode 100644 index 000000000..9c116683d --- /dev/null +++ b/app/assets/stylesheets/override/2026.css @@ -0,0 +1,9 @@ +/* For RubyKaigi 2026 */ +:root { + --body-bg: #F9EFEC; + --text-color: #000; +} + +h1, h2, h3 { + font-family: var(--font-family-outfit); +} diff --git a/app/assets/stylesheets/override/index.css b/app/assets/stylesheets/override/index.css index 1710b0fc7..c57cc998a 100644 --- a/app/assets/stylesheets/override/index.css +++ b/app/assets/stylesheets/override/index.css @@ -1,3 +1,5 @@ @import "./variables.css"; @import "./layout.css"; @import "./bootstrap.css"; + +@import "./2026.css" diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml index 74d4117f7..a4f996258 100644 --- a/app/views/layouts/_navbar.html.haml +++ b/app/views/layouts/_navbar.html.haml @@ -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" } } diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 33b669b16..7058df56b 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -11,6 +11,7 @@ %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' From 42cc8b0cc184a6681bc51e5b3d06d6e2624b4b9a Mon Sep 17 00:00:00 2001 From: neotag Date: Sun, 14 Dec 2025 17:42:40 +0900 Subject: [PATCH 3/3] Fix sign_in page layout --- app/views/devise/sessions/new.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index d6c7d75ef..fc7ae1083 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -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 @@ -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