diff --git a/.gitignore b/.gitignore index 37d80057..0d224936 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,3 @@ yarn-debug.log* # Yarn Integrity file .yarn-integrity - -# Git Submodules -src/past diff --git a/.gitmodules b/.gitmodules index f041f1a7..1510941f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "src/past/2019"] path = src/past/2019 url = https://github.com/bangkokrb/rubyconfth-2019.git +[submodule "src/past/2022"] + path = src/past/2022 + url = https://github.com/bangkokrb/rubyconfth-2022.git diff --git a/Gemfile.lock b/Gemfile.lock index a27bfe91..5cf9ca61 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GEM remote: https://rubygems.org/ specs: - activemodel (7.0.4) - activesupport (= 7.0.4) - activesupport (7.0.4) + activemodel (7.0.4.1) + activesupport (= 7.0.4.1) + activesupport (7.0.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -96,7 +96,7 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) - minitest (5.16.3) + minitest (5.17.0) multipart-post (2.2.3) nio4r (2.5.8) nokogiri (1.13.10-aarch64-linux) diff --git a/frontend/stylesheets/components/_app-footer.scss b/frontend/stylesheets/components/_app-footer.scss index d3ef948d..4271e6e5 100644 --- a/frontend/stylesheets/components/_app-footer.scss +++ b/frontend/stylesheets/components/_app-footer.scss @@ -1,39 +1,3 @@ -.app-footer__mailing-list { - padding: 2rem; - - color: $white; - text-align: center; - - background-color: black; - - &__text { - padding: 0 2rem; - - @include media-breakpoint-up('md') { - padding: 0; - } - } - - .form-mailing-list { - @include media-breakpoint-up('md') { - @include make-col(6); - @include make-col-offset(3); - } - } - - .form-mailing-list .form__control { - font-size: map-get($font-sizes, 'xs'); - - @include media-breakpoint-up('sm') { - font-size: map-get($font-sizes, 'sm'); - } - - @include media-breakpoint-up('lg') { - font-size: map-get($font-sizes, 'lg'); - } - } -} - .app-footer__social-platform { padding-block: 1rem; text-align: center; @@ -53,15 +17,24 @@ .container { display: flex; - align-items: center; justify-content: space-between; + + @include media-breakpoint-up('sm') { + display: grid; + grid-template-columns: repeat(3, 1fr); + } } .app-footer__community { display: none; + text-align: center; @include media-breakpoint-up('sm') { display: initial; } } + + .app-footer__link { + text-align: right; + } } diff --git a/frontend/stylesheets/components/_app-hero.scss b/frontend/stylesheets/components/_app-hero.scss index 4aafeb8b..fce49e82 100644 --- a/frontend/stylesheets/components/_app-hero.scss +++ b/frontend/stylesheets/components/_app-hero.scss @@ -3,7 +3,7 @@ align-items: center; padding: 2rem 0; - background-color: $primary; + background-color: $black; &__heading { font-weight: 500; diff --git a/frontend/stylesheets/components/_app-navigation.scss b/frontend/stylesheets/components/_app-navigation.scss index e5aae1ac..9a49ee09 100644 --- a/frontend/stylesheets/components/_app-navigation.scss +++ b/frontend/stylesheets/components/_app-navigation.scss @@ -74,7 +74,7 @@ height: 75%; opacity: 0; - background-color: var(--color-brand-primary); + background-color: $black; border-radius: 1rem; transition: all variables.$base-animation-duration variables.$base-animation-timing; } diff --git a/frontend/stylesheets/components/_error.scss b/frontend/stylesheets/components/_error.scss index b9484a3a..18916234 100644 --- a/frontend/stylesheets/components/_error.scss +++ b/frontend/stylesheets/components/_error.scss @@ -30,7 +30,8 @@ &__action { display: flex; - margin-top: 45px; + margin-top: 30px; + margin-bottom:30px; } &__action a { diff --git a/frontend/stylesheets/components/_form-mailing-list.scss b/frontend/stylesheets/components/_form-mailing-list.scss index 6b7ccca0..bd4f055f 100644 --- a/frontend/stylesheets/components/_form-mailing-list.scss +++ b/frontend/stylesheets/components/_form-mailing-list.scss @@ -2,11 +2,21 @@ position: relative; .form__control { + font-size: map-get($font-sizes, 'xs'); + border-radius: var(--bs-border-radius-lg); + @include media-breakpoint-up('sm') { + font-size: map-get($font-sizes, 'sm'); + } + @include media-breakpoint-up('md') { padding-right: 155px; } + + @include media-breakpoint-up('lg') { + font-size: map-get($font-sizes, 'lg'); + } } .btn { diff --git a/frontend/stylesheets/layouts/_default.scss b/frontend/stylesheets/layouts/_default.scss index b62bb8a4..a5d8fb76 100755 --- a/frontend/stylesheets/layouts/_default.scss +++ b/frontend/stylesheets/layouts/_default.scss @@ -40,5 +40,29 @@ .app-hero ~ .app-content { padding-top: 0; - } + } + + .mailing-list { + padding: 2rem; + + color: $white; + text-align: center; + + background-color: black; + + &__text { + padding: 0 2rem; + + @include media-breakpoint-up('md') { + padding: 0; + } + } + + .form-mailing-list { + @include media-breakpoint-up('md') { + @include make-col(6); + @include make-col-offset(3); + } + } + } } diff --git a/frontend/stylesheets/screens/_home.scss b/frontend/stylesheets/screens/_home.scss index 6c04e488..fa9ab82b 100644 --- a/frontend/stylesheets/screens/_home.scss +++ b/frontend/stylesheets/screens/_home.scss @@ -1,15 +1,9 @@ body.home .app-hero { + + color: $primary; text-align: center; - background: { - image: url('/images/home/hero-background.png'); - repeat: no-repeat; - position: center; - } - - @include media-breakpoint-up('md') { - height: rem(460px); - } + background: $white; &__subheading { display: block; @@ -17,10 +11,18 @@ body.home .app-hero { text-transform: uppercase; } - .btn { - margin-top: 2rem; - font-size: map-get($font-sizes, 'lg'); - border-radius: var(--bs-border-radius-lg); + &__mailing-list { + width: 80%; + margin: 2rem auto 0; + + @include media-breakpoint-up('lg') { + width: 50%; + margin-top: 3rem; + } + } + + &__text { + color: $body-color; } } @@ -32,30 +34,11 @@ body.home .app-content { } } -body.home .speaker-lineup { - .list-speaker, - .btn { - margin-top: 1rem; - - @include media-breakpoint-up('sm') { - margin-top: 2rem; - } - } -} - body.home .sponsors { .list-sponsor { justify-content: center; padding-left: 0; - - &--silver,&--speaker { - .list-sponsor__company { - @include media-breakpoint-up('sm') { - @include make-col(3); - } - } - } @include media-breakpoint-up('sm') { margin-inline: auto; @@ -63,14 +46,16 @@ body.home .sponsors { } &.list-sponsor--silver { - @include media-breakpoint-up('sm') { - width: 75% + @include media-breakpoint-up('md') { + width: 85% } } - &.list-sponsor--speaker { + .btn { + width: 80%; + @include media-breakpoint-up('sm') { - width: 60% + width: auto; } } } diff --git a/src/404.html b/src/404.html index 84e30506..a749566f 100644 --- a/src/404.html +++ b/src/404.html @@ -14,6 +14,14 @@

404

+

+ Looking for something from our previous conferences?
+ Check our archived homepage for RubyConfTH 2022 or RubyConfTH 2019. +

+
+ 2022 site + 2019 site +

You may want to head back to the homepage.
If you think something is broken, report a problem. diff --git a/src/_components/footer.liquid b/src/_components/footer.liquid index b273a78d..3a95347b 100644 --- a/src/_components/footer.liquid +++ b/src/_components/footer.liquid @@ -1,12 +1,4 @@