From c9f35b9aa0782c7e765ca0e71196db11356caed1 Mon Sep 17 00:00:00 2001 From: Wu Cheng-Han Date: Thu, 24 Sep 2015 13:48:12 +0800 Subject: [PATCH] Updated overall font-family, font-size, line-height, letter-spacing and some other minor adjustments --- public/css/index.css | 23 ++++++++------------- public/css/markdown.css | 2 ++ public/css/site.css | 4 +++- public/vendor/select2/select2-bootstrap.css | 4 ++-- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/public/css/index.css b/public/css/index.css index b78be36..2628152 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -1,25 +1,20 @@ -@import url(https://fonts.googleapis.com/css?family=Source+Code+Pro&subset=latin,latin-ext); - body { +html, body { + height: 100%; +} +body { margin: 0; padding: 0; max-width: inherit; min-width: 200px; - height: 100%; /*margin-right: 15px;*/ - padding-top: 50px; + padding-top: 51px; /*overflow: hidden;*/ } -html, -form, -.row, -.row > * { - height: 100%; - min-height: 100%; -} .CodeMirror { - font-family: 'Source Code Pro', Consolas, monaco, monospace; - line-height: 18px; - font-size: 16px; + font-family: "Source Code Pro", Consolas, monaco, "Microsoft JhengHei", Meiryo, "MS ゴシック", "MS Gothic", monospace; + letter-spacing: 0.025em; + line-height: 1.25; + font-size: 18px; min-height: 100%; overflow-y: hidden !important; -webkit-overflow-scrolling: touch; diff --git a/public/css/markdown.css b/public/css/markdown.css index 95d72a6..ffceb05 100644 --- a/public/css/markdown.css +++ b/public/css/markdown.css @@ -1,9 +1,11 @@ /* for markdown-body */ .markdown-body { + font-family: "Helvetica Neue", Helvetica, Arial, "Microsoft JhengHei", Meiryo, "MS ゴシック", "MS Gothic", sans-serif; padding-top: 40px; padding-bottom: 40px; max-width: 758px; + overflow: visible !important; } /*fixed style for bootstrap comflict*/ diff --git a/public/css/site.css b/public/css/site.css index 29426b1..a6c0f3a 100644 --- a/public/css/site.css +++ b/public/css/site.css @@ -1,4 +1,5 @@ /* for all pages should include this */ +@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400italic,600,600italic,300italic,300|Source+Serif+Pro|Source+Code+Pro:400,300,500&subset=latin,latin-ext); body { font-smoothing: subpixel-antialiased !important; -webkit-font-smoothing: subpixel-antialiased !important; @@ -6,7 +7,8 @@ body { text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.004); /*text-rendering: optimizeLegibility;*/ -webkit-overflow-scrolling: touch; - font-family: "Helvetica Neue", Helvetica, Arial, "Microsoft JhengHei", sans-serif !important; + font-family: "Source Sans Pro", Helvetica, Arial, "Microsoft JhengHei UI", "Meiryo UI", "MS Pゴシック", "MS PGothic", sans-serif; + letter-spacing: 0.025em; } :focus { outline: none !important; diff --git a/public/vendor/select2/select2-bootstrap.css b/public/vendor/select2/select2-bootstrap.css index 1e392c9..b701eaf 100644 --- a/public/vendor/select2/select2-bootstrap.css +++ b/public/vendor/select2/select2-bootstrap.css @@ -29,7 +29,7 @@ border-color: #cccccc; border-radius: 4px; color: #555555; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: inherit; background-color: white; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); @@ -40,7 +40,7 @@ border-color: #cccccc; border-radius: 4px; color: #555555; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: inherit; background-color: white; filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);