summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWu Cheng-Han2015-09-24 13:48:12 +0800
committerWu Cheng-Han2015-09-24 13:48:12 +0800
commitc9f35b9aa0782c7e765ca0e71196db11356caed1 (patch)
tree5610d87fa319e32645bcd5a2e700c08f475f4d4a
parentf239b53972268294dd964d3b2c352e5decd62500 (diff)
Updated overall font-family, font-size, line-height, letter-spacing and some other minor adjustments
Diffstat (limited to '')
-rw-r--r--public/css/index.css23
-rw-r--r--public/css/markdown.css2
-rw-r--r--public/css/site.css4
-rw-r--r--public/vendor/select2/select2-bootstrap.css4
4 files changed, 16 insertions, 17 deletions
diff --git a/public/css/index.css b/public/css/index.css
index b78be36f..26281525 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 95d72a6d..ffceb052 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 29426b15..a6c0f3a2 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 1e392c93..b701eaf6 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);