Skip to content

Commit

Permalink
Merge pull request #46 from irene84111/develop-2018
Browse files Browse the repository at this point in the history
講者位置調整 / 修正手機版字體問題
  • Loading branch information
ryudoawaru authored Oct 3, 2017
2 parents e745774 + 0f65ce7 commit 678a33e
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions 2018/data/site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ site:
speakers:
- name: 'Yukihiro (Matz) Matsumoto'
avatar: 'matz.png'
- name: 'Akira Matsuda'
avatar: 'akira-matsuda.jpg'
- name: 'José Valim'
avatar: 'jose-valim.jpg'
- name: 'Akira Matsuda'
avatar: 'akira-matsuda.jpg'
Binary file modified 2018/source/images/speakers/akira-matsuda.jpg
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 2018/source/layouts/_head.slim
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ head
link rel="apple-touch-icon-precomposed" href=image_path("icon.png")
link rel="apple-touch-icon-120x120-precomposed" href=image_path("icon.png")
link rel="icon" size="32x32" href=image_path("icon.png")
link rel="stylesheet" href="//fonts.googleapis.com/css?family=Righteous"
link rel="stylesheet" href="//fonts.googleapis.com/css?family=Righteous|Lato"
link rel="stylesheet" href="//fonts.googleapis.com/earlyaccess/notosanstc.css"

meta content="IE=edge" http-equiv="X-UA-Compatible"
Expand Down
1 change: 0 additions & 1 deletion 2018/source/stylesheets/sections/_cover.sass
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
max-width: 320px

.event
max-width: 240px
margin: 40px auto
color: $midnight

Expand Down

0 comments on commit 678a33e

Please sign in to comment.