Skip to content

Commit

Permalink
Add about content
Browse files Browse the repository at this point in the history
  • Loading branch information
ixkaito committed Aug 11, 2017
1 parent 67f5b0b commit 320db9c
Show file tree
Hide file tree
Showing 19 changed files with 35 additions and 15 deletions.
Binary file added assets/_images/hero-1500.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/_images/hero.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions assets/_sass/_color.scss

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ $default-line-height: 1.75;
// Breakpoints
$wide-menu: 590px;

$tablet: 768px;

$desktop: 1024px;
File renamed without changes.
File renamed without changes.
11 changes: 11 additions & 0 deletions assets/_sass/dojoconjapan2017/project/_about.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
section.about {
background: url(../images/hero.png) no-repeat center top;
background-color: $flamingo;
background-size: contain;
padding-top: 343.75%;

@media (min-width: $tablet) {
background-image: url(../images/hero-1500.png);
background-size: auto;
}
}
17 changes: 9 additions & 8 deletions assets/_sass/main.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@charset "UTF-8";
@import "variables";
@import "dojoconjapan2017/foundation/variables";
@import "bourbon/bourbon";
@import "neat/neat";
@import "reset";
@import "fonts";
@import "button";
@import "hamburger";
@import "sliding-panel";
@import "dojoconjapan2017/foundation/reset";
@import "dojoconjapan2017/foundation/fonts";
@import "dojoconjapan2017/component/button";
@import "dojoconjapan2017/component/hamburger";
@import "dojoconjapan2017/component/sliding-panel";

html{
box-sizing:border-box;
Expand Down Expand Up @@ -38,5 +38,6 @@ button {
line-height: $default-line-height;
}

@import "header";
@import "footer";
@import "dojoconjapan2017/layout/header";
@import "dojoconjapan2017/layout/footer";
@import "dojoconjapan2017/project/about";
2 changes: 1 addition & 1 deletion assets/css/main.css

Large diffs are not rendered by default.

Binary file added assets/images/hero-1500.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/hero.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion footer.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?php get_sidebar(); ?>
<?php // get_sidebar(); ?>

<footer class="footer">

Expand Down
11 changes: 11 additions & 0 deletions front-page.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php get_header(); ?>

<section class="about">
<h2>日本最大のCoderDojoの祭典</h2>
<p>DojoCon Japanは日本のCoderDojo関係者(見守る大人、学ぶ子供)とその活動に賛同・協賛する人が全国各地から集まる大きなイベントです。</p>

<p>CoderDojoは2011年にアイルランドから始まった子供達にプログラミングを学ぶ場を提供するボランティア主導の世界的な非営利活動です。その数は世界中で1241(2017年4月現在)にも及びます。<br>
昨年初めてDojoCon Japanを開催したとき、日本には36の道場しかありませんでした。しかし、開催後にはその数を飛躍的に伸ばし、現在では82の道場が日本で活動しています(2017年5月現在)。</p>
</section>

<?php get_footer(); ?>
2 changes: 0 additions & 2 deletions header.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,3 @@
<span class="hamburger-inner">Menu</span>
</span>
</button>

<h1><a href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo( 'name' ); ?></a></h1>

0 comments on commit 320db9c

Please sign in to comment.