Skip to content

ヘッダーに検索機能を再追加 #972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions app/assets/stylesheets/custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,6 @@ img.emoji {
border-radius: 0px;
}

/* DocSearch by Algolia */
.search {
padding-top: 17px;
padding-left: 15px;
padding-right: 20px;
padding-bottom: 10px;
}

#searchbox {
padding-left: 5px;
font-size: 90%;
Expand Down
58 changes: 57 additions & 1 deletion app/assets/stylesheets/extension/header.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "color";

body {
padding: 64px 0 0;
}
Expand Down Expand Up @@ -120,7 +122,7 @@ body {
}
}

@media only screen and (max-width:865px) {
@media only screen and (max-width:900px) {
.container-fluid {
padding: 5px 10px;
}
Expand Down Expand Up @@ -177,3 +179,57 @@ body {
max-height: 540px;
}
}

/* DocSearch by Algolia */
.search {
padding-top: 17px;
padding-left: 15px;
padding-right: 20px;
padding-bottom: 10px;
position: absolute;
right: 0;
#searchbox {
width: 0;
transition: all .3s;
padding: 4px 0;
border: none;
border-radius: 4px;
}
}
.search-icon {
width: 16px;
border-radius: 0;
}
.collapse > .navbar-nav > li.search-li {
position: static;
&::before, &::after {
display: none;
}
@media only screen and (max-width: 768px) {
display: none;
}
}
.search-label {
margin: 0;
padding: 15px 8px;
color: #fff;
font-size: 14px;
line-height: 26px;
cursor: pointer;
}
.search-checkbox {
display: none;
}
.search-checkbox:checked + .search {
#searchbox {
width: 190px;
transition: all .3s;
padding: 4px;
box-shadow: 0 0 6px 1px rgba(88, 88, 88, 41%);
border: #fff solid 1px;
&:focus{
border: $main-blue solid 2px;
outline: none;
}
}
}
27 changes: 12 additions & 15 deletions app/views/layouts/application.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
%meta{content: "#{meta_image(yield(:meta_image))}", property: "og:image"}/
%meta{content: "image/png", property: "og:image:type"}/
%meta{content: "CoderDojo Japan", property: "og:site_name"}/

%meta{content: "summary_large_image", name: "twitter:card"}/
%meta{content: "@CoderDojoJapan", name: "twitter:site"}/
%meta{content: "@CoderDojoJapan", name: "twitter:creator"}/
Expand Down Expand Up @@ -68,9 +68,7 @@


/ at the end of the HEAD
/ TODO: Fix this later - https://github.com/coderdojo-japan/coderdojo.jp/issues/912
/- if is_kata?
/ %link{href: "https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css", rel: "stylesheet"}
%link{href: "https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css", rel: "stylesheet"}

%body
= render 'shared/header'
Expand All @@ -84,17 +82,16 @@
:javascript
twemoji.parse(document.body);

/ TODO: Fix this later - https://github.com/coderdojo-japan/coderdojo.jp/issues/912
/- if is_kata?
/ %script{:src => "https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js",
/ type: "text/javascript"}
/ :javascript
/ docsearch({
/ apiKey: '315da3c406c3fa374a0696590f4821a3',
/ indexName: 'coderdojo',
/ inputSelector: '#searchbox',
/ debug: false // Set debug to true if you want to inspect the dropdown
/ });

%script{:src => "https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.js", type: "text/javascript"}

:javascript
docsearch({
apiKey: '315da3c406c3fa374a0696590f4821a3',
indexName: 'coderdojo',
inputSelector: '#searchbox',
debug: false // Set debug to true if you want to inspect the dropdown
});

#fb-root
:javascript
Expand Down
11 changes: 9 additions & 2 deletions app/views/shared/_header.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
.navbar-header-logos
= link_to image_tag('/img/header-logo.png', alt: 'CoderDojo logo'), '/', id: "header-logo"
= link_to image_tag('/img/header-brand.png', alt: 'CoderDojo brand'), '/', id: "header-brand"
.collapse#header-nav-toggle.navbar-collapse
#bs-example-navbar-collapse-1.collapse#header-nav-toggle.navbar-collapse
%ul.nav.navbar-nav.navbar-right
%li= link_to '全国の道場', '/#dojos'
%li= link_to '近日開催の道場', '/events'
Expand All @@ -27,5 +27,12 @@
%li= link_to '立ち上げる', '/kata#startup'
%li= link_to '支援', '/kata#support'
%li= link_to 'FAQ', '/kata#faq'

/ DocSearch: https://github.com/algolia/docsearch-configs/blob/master/configs/coderdojo.json
%li.search-li
<label for="search" class="search-label"><img src="/img/search.svg" alt="検索" class="search-icon" /></label>
= check_box_tag :search, "検索アイコン", false, class: 'search-checkbox'
.search
%input#searchbox{ :placeholder => "資料を検索", :type => "text" }
#hits
#pagination
%li= link_to 'お問い合わせ', '/#contact'
4 changes: 4 additions & 0 deletions public/img/search.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.