Skip to content

Commit 8d47441

Browse files
attsumiamatsuda
authored andcommitted
2023年 RubyKaigi のデザインを当てる
1 parent a8a6441 commit 8d47441

File tree

6 files changed

+20
-19
lines changed

6 files changed

+20
-19
lines changed

app/assets/stylesheets/application.css.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,5 @@
7575
@import "modules/teammates";
7676
@import "modules/staff-website-page";
7777

78-
// override for 2022
78+
// override for 2023
7979
@import "override/index";

app/assets/stylesheets/base/_variables.scss

+6-7
Original file line numberDiff line numberDiff line change
@@ -923,23 +923,22 @@ $dl-horizontal-breakpoint: $grid-float-breakpoint !default;
923923
$hr-border: $gray-lighter !default;
924924

925925
/////////////////////////////////////////////////////
926-
// 2022
926+
// 2023
927927
// --------------------------------------------------
928-
929-
$color-base: #F0E7E0;
928+
$color-base: #F8F8F8;
930929
$color-base-light: #F3EDE2;
931-
$color-main: #2C2C31;
930+
$color-main: #333333;
932931
$color-main-light: #606069;
933-
$color-accent: #BF4545;
934-
$color-link: #3E6199;
932+
$color-accent: #BA083D;
933+
$color-link: #1E4EC4;
935934
$color-link-hover: #2364C9;
936935
$color-light-gray: #D1BEAC;
937936

938937
$brand-primary: $color-accent;
939938
$brand-info-alt:#4E6994;
940939

941940
$headings-font-weight: 600;
942-
$font-family-sans-serif: 'Poppins', sans-serif;
941+
$font-family-sans-serif: 'Montserrat', sans-serif;
943942

944943
$navbar-default-link-active-bg: $color-accent;
945944
$navbar-default-link-hover-color: $color-accent;

app/assets/stylesheets/override/_base.scss

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
body {
2-
background-image: url('background.png');
3-
font-family: 'Poppins', sans-serif;
4-
background-repeat: repeat;
5-
background-position: center top;
2+
font-family: $font-family-sans-serif;
3+
background-color: $color-base;
4+
color: $color-main;
65
}
76

87
body[id*=staff_],

app/assets/stylesheets/override/_nav.scss

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
.navbar-default {
2-
background-color: #fcf9f6;
2+
background-color: $color-base;
33
border: none;
44
box-shadow: 0 2px 1px rgba(black, .1);
55
}
66

77
.navbar-default .navbar-nav > .active > a,
88
.navbar-default .navbar-nav > .active > a:hover,
99
.navbar-default .navbar-nav > .active > a:focus {
10+
background-color: $color-main;
1011
border-radius: 4px;
1112
}
1213

1314
.navbar-default .navbar-nav > .open > a,
1415
.navbar-default .navbar-nav > .open > a:hover,
1516
.navbar-default .navbar-nav > .open > a:focus {
16-
background-color: rgba($color-accent, .1);
17-
color: $color-accent;
17+
background-color: rgba($color-base, .1);
18+
color: $color-base;
1819
}
1920

2021
.navbar-nav > li:not(:first-child) {
@@ -46,19 +47,22 @@
4647
}
4748

4849
.navbar-brand {
49-
font-family: inherit;
50+
color: $color-main;
51+
font-family: $font-family-sans-serif;
52+
font-weight: bold;
5053
}
5154

5255
.navbar-fixed-top.program-subnav,
5356
.navbar-fixed-top.schedule-subnav {
5457
border: none;
5558
li.active {
5659
border-bottom: none;
60+
color: $color-base;
5761
}
5862
}
5963

6064
.dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus {
61-
background-color: $color-accent;
65+
background-color: $color-base;
6266
}
6367

6468
.subnavbar .subnavbar-inner {

app/views/layouts/_navbar.html.haml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
%span.icon-bar
77
%span.icon-bar
88
- if current_event
9-
= link_to 'RubyKaigi 2022', event_path(current_event), class: 'navbar-brand'
9+
= link_to 'RubyKaigi 2023', event_path(current_event), class: 'navbar-brand'
1010
- else
1111
= link_to "CFP App", events_path, class: 'navbar-brand'
1212

docs/website_documentation.md

-1
Original file line numberDiff line numberDiff line change
@@ -388,4 +388,3 @@ careful since this cannot be undone.
388388
## Sponsors
389389

390390
## Themes
391-

0 commit comments

Comments
 (0)