Skip to content

Commit

Permalink
Merge pull request #252 from bangkokrb/release/4.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
olivierobert authored Dec 5, 2022
2 parents b5317b1 + dc4a644 commit ef9e0e7
Show file tree
Hide file tree
Showing 11 changed files with 104 additions and 9 deletions.
10 changes: 9 additions & 1 deletion frontend/stylesheets/components/_app-footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,19 @@
}

.app-footer__footnote {
padding-bottom: 2rem;
padding-block: 1rem 2rem;

.container {
display: flex;
align-items: center;
justify-content: space-between;
}

.app-footer__community {
display: none;

@include media-breakpoint-up('sm') {
display: initial;
}
}
}
2 changes: 1 addition & 1 deletion frontend/stylesheets/components/_app-header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
position: relative;
z-index: map-get($zIndex, 'highest');

@include media-breakpoint-up('lg') {
@include media-breakpoint-up('xl') {
display: none;
}
}
Expand Down
14 changes: 9 additions & 5 deletions frontend/stylesheets/components/_app-navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
background: var(--bs-white);
box-shadow: 0 0 3rem rgb(0 0 0 / 40%);

@include media-breakpoint-up('lg') {
@include media-breakpoint-up('xl') {
position: revert;
inset: revert;
box-shadow: none;
Expand All @@ -24,7 +24,7 @@

padding-top: var(--app-header-height);

@include media-breakpoint-up('lg') {
@include media-breakpoint-up('xl') {
flex-direction: row;
align-items: center;
justify-content: end;
Expand Down Expand Up @@ -53,7 +53,7 @@
line-height: 1.75;
font-weight: 500;

@include media-breakpoint-up('lg') {
@include media-breakpoint-up('xl') {
display: block;
padding: 0 1rem;

Expand All @@ -80,7 +80,7 @@
}

&__link:hover {
@include media-breakpoint-up('lg') {
@include media-breakpoint-up('xl') {
color: var(--bs-white);
}
}
Expand All @@ -89,8 +89,12 @@
width: 100%;
height: 100%;

@include media-breakpoint-up('lg') {
@include media-breakpoint-up('xl') {
opacity: 1;
}
}

&__text {
white-space: pre;
}
}
2 changes: 1 addition & 1 deletion frontend/stylesheets/screens/_home.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ body.home .sponsors {
justify-content: center;
padding-left: 0;

&--silver {
&--silver,&--speaker {
.list-sponsor__company {
@include media-breakpoint-up('sm') {
@include make-col(3);
Expand Down
2 changes: 1 addition & 1 deletion src/_components/header.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{% for menu_item in menu_items %}
<li class="app-navigation__item">
<a href="{{ menu_item.permalink | relative_url }}" class="app-navigation__link">
<spn class="app-navigation__text">{{ menu_item.title }}</span>
<span class="app-navigation__text">{{ menu_item.title }}</span>
</a>
</li>
{% endfor %}
Expand Down
2 changes: 2 additions & 0 deletions src/_data/menu/header.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@
permalink: /speakers
- title: Sponsors
permalink: /sponsors
- title: Code of Conduct
permalink: /code-of-conduct
1 change: 1 addition & 0 deletions src/_data/speakers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
last_name: Jaszewska
photo_url: /images/speakers/anita-jaszewska.jpg
twitter_handle: anita_jaszewska
type: speaker
bio: |
Anita is a self-learner who entered the Ruby world in 2013 as a backend developer. Since then, she has started a master’s degree in psychology. Initially a hobby, with time, psychology turned into a valuable experience that helped her transition to a managerial path in IT.
- id: charles-nutter
Expand Down
10 changes: 10 additions & 0 deletions src/_data/sponsors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@
logo_url: /images/sponsors/beeees.png
url: "https://beescm.com/"
level: silver
- name: Bluethumb
about: "Bluethumb is Australia's largest online art gallery. Built on top of Ruby On Rails in 2012, we represent over 20,000 emerging and established artists from Australia and work with 20 of Australia's most remote Aboriginal Art Centres."
logo_url: /images/sponsors/bluethumb.svg
url: "https://bluethumb.com.au/"
level: speaker
- name: BuildKite
about: "Buildkite is a next generation CI/CD platform for building, testing, and deploying at scale. Use your own cloud infrastructure to turbo charge build speed, increase reliability, and reduce cost."
logo_url: /images/sponsors/buildkite.svg
url: "https://buildkite.com/"
level: speaker
- name: Cloud 66
about: "Cloud 66 is the best deployment tool for Rails. Deploy your Rails and Rack applications directly from your repo to any cloud, with native support for Rails conventions, full databases support, replication and backups, powerful access management, and traffic control features. Try it today for free with an extra $200 in free credits with the code: RubyConfTH."
url: https://www.cloud66.com/frameworks/rails/?utm_source=e&utm_medium=l&utm_campaign=RubyConfTH
Expand Down
31 changes: 31 additions & 0 deletions src/code-of-conduct.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
---
layout: default
page_class: code-of-conduct
title: "Code of Conduct"
---

All attendees, speakers, sponsors and volunteers at our conference are required to agree with the following code of conduct. Organisers will enforce this code throughout the event. We expect cooperation from all participants to help ensure a safe environment for everybody.

{% rendercontent "section_text", title: "The Quick Version" %}
Our conference is dedicated to providing a harassment-free conference experience for everyone, regardless of gender, gender identity and expression, age, sexual orientation, disability, physical appearance, body size, race, ethnicity, religion (or lack thereof), or technology choices. We do not tolerate harassment of conference participants in any form. Sexual language and imagery is not appropriate for any conference venue, including talks, workshops, parties, Twitter and other online media. Conference participants violating these rules may be sanctioned or expelled from the conference without a refund at the discretion of the conference organisers.
{% endrendercontent %}

{% rendercontent "section_text", title: "The Less Quick Version" %}
Harassment includes offensive verbal comments related to gender, gender identity and expression, age, sexual orientation, disability, physical appearance, body size, race, ethnicity, religion, technology choices, sexual images in public spaces, deliberate intimidation, stalking, following, harassing photography or recording, sustained disruption of talks or other events, inappropriate physical contact, and unwelcome sexual attention.

Participants asked to stop any harassing behavior are expected to comply immediately.

Sponsors are also subject to the anti-harassment policy. In particular, sponsors should not use sexualised images, activities, or other material. Booth staff (including volunteers) should not use sexualised clothing/uniforms/costumes, or otherwise create a sexualised environment.

If a participant engages in harassing behavior, the conference organisers may take any action they deem appropriate, including warning the offender or expulsion from the conference with no refund.

If you are being harassed, notice that someone else is being harassed, or have any other concerns, please contact a member of conference staff immediately. Conference staff can be identified as they'll be wearing branded clothing and/or badges.

Conference staff will be happy to help participants contact hotel/venue security or local law enforcement, provide escorts, or otherwise assist those experiencing harassment to feel safe for the duration of the conference. We value your attendance.

We expect participants to follow these rules at conference and workshop venues and conference-related social events.
{% endrendercontent %}

{% rendercontent "section_text", title: "How to find support" %}
If you are concerned by the conduct of any attendees, speakers, sponsors and volunteers, please contact any member of event staff. They can be identified with a red STAFF badge and red STAFF t-shirt. You can also contact us privately by direct message on our [event Slack](https://join.slack.com/t/rubyconfth/shared_invite/zt-1l7w5r4uo-Mhch68kpqpYomhnjhltCvA)
{% endrendercontent %}
Loading

0 comments on commit ef9e0e7

Please sign in to comment.