Skip to content

Commit 52445d9

Browse files
neotagamatsuda
authored andcommitted
Restore styles
1 parent a65008e commit 52445d9

6 files changed

Lines changed: 77 additions & 0 deletions

File tree

app/assets/stylesheets/application.postcss.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,6 @@
4545
@import "./modules/teammates.css";
4646
@import "./modules/staff-website-page.css";
4747

48+
@import "./override/index.css";
49+
4850
@import "tailwindcss/utilities";
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
/* Override navbar styles for RubyKaigi fork */
2+
.navbar-default {
3+
background-color: var(--gray-lightest);
4+
border: none;
5+
box-shadow: 0 2px 1px var(--gray-light);
6+
}
7+
8+
.navbar-default .navbar-brand,
9+
.navbar-default .navbar-nav .nav-link {
10+
color: var(--text-color);
11+
}
12+
13+
.navbar-default .navbar-brand:hover,
14+
.navbar-default .navbar-brand:focus,
15+
.navbar-default .navbar-brand:active,
16+
.navbar-default .navbar-nav .nav-link:hover,
17+
.navbar-default .navbar-nav .nav-link:focus,
18+
.navbar-default .navbar-nav .nav-link:active {
19+
color: var(--gray-light);
20+
}
21+
22+
.navbar-default .navbar-brand {
23+
font-family: var(--font-family-sans-serif);
24+
font-weight: bold;
25+
padding-left: 0;
26+
}
27+
28+
@media (min-width: 992px) {
29+
.navbar-default .navbar-nav .nav-item.active .nav-link,
30+
.navbar-default .navbar-nav .nav-item .nav-link.active {
31+
background-color: var(--gray-dark) !important;
32+
color: white;
33+
border-radius: 4px;
34+
padding-top: 5px;
35+
padding-bottom: 5px;
36+
margin-top: 7px;
37+
}
38+
}
39+
40+
@media (max-width: 991px) {
41+
.navbar-default .navbar-nav .nav-item.active .nav-link,
42+
.navbar-default .navbar-nav .nav-item .nav-link.active {
43+
background-color: transparent;
44+
color: var(--text-color);
45+
}
46+
}
47+
48+
.navbar-default .navbar-toggler{
49+
border-color: var(--gray);
50+
background-color: var(--gray);
51+
color: var(--text-color);
52+
}
53+
54+
.navbar-toggler:focus {
55+
box-shadow: 0 0 0 2px;
56+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
@import "./variables.css";
2+
@import "./layout.css";
3+
@import "./bootstrap.css";
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
body {
2+
background-color: var(--body-bg);
3+
color: var(--text-color);
4+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/* Override variables for RubyKaigi fork */
2+
:root {
3+
--body-bg: white;
4+
--gray-lightest: hsl(from var(--black) h s calc(l + 97));
5+
6+
--font-family-sans-serif: 'Montserrat', sans-serif;
7+
--font-family-outfit: 'Outfit', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
8+
}

app/views/layouts/application.html.haml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66

77
= stylesheet_link_tag 'application', media: 'all'
88
= stylesheet_link_tag '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', media: 'all'
9+
10+
%link{rel:'preconnect', href:'//fonts.googleapis.com'}
11+
%link{rel:'preconnect', href:'//fonts.gstatic.com', crossorigin: ''}
912
= stylesheet_link_tag "//fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600"
13+
= stylesheet_link_tag '//fonts.googleapis.com/css2?family=Montserrat:wght@400;700&display=swap'
1014

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

0 commit comments

Comments
 (0)