Skip to content

Commit

Permalink
Merge branch 'style/typography' into gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
klutzy committed Feb 5, 2013
2 parents b676727 + 1567190 commit 87bf7b7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Binary file modified media/typography_sizes.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions style/typography.html
Expand Up @@ -14,8 +14,8 @@
이런 타이포그래피 활용을 위해 아이스크림 샌드위치에서는 로보토(Roboto)라는 이름의 새 글꼴을 소개합니다. 이 글꼴은 UI 요구사항과 고해상도 화면을 위해 특별히 고안되었습니다.
현재 TextView 프레임워크는 일반, 볼드, 이탤릭, 볼드 이탤릭을 기본으로 지원합니다.</p>

<img src="../media/typography_alphas.png"><p><a href="https://dl-ssl.google.com/android/design/Roboto_Hinted_20111129.zip">로보토 다운로드</a></p>
<p><a href="https://dl-ssl.google.com/android/design/Roboto_Specimen_Book_20111129.pdf">견본 문서</a></p>
<img src="../media/typography_alphas.png"><p><a href="http://developer.android.com/downloads/design/Roboto_Hinted_20111129.zip">로보토 다운로드</a></p>
<p><a href="http://developer.android.com/downloads/design/Roboto_Specimen_Book_20111129.pdf">견본 문서</a></p>

</div>
</div>
Expand Down

0 comments on commit 87bf7b7

Please sign in to comment.