caojiezi2003/Stackedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:benweet/stackedit

Browse Source
This commit is contained in:
benweet 2015-10-12 22:48:23 +01:00
commit 11ed30c686
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -16,7 +16,7 @@
"request": "~2.40.0", "request": "~2.40.0",
"ssh2": "^0.3.5", "ssh2": "^0.3.5",
"compression": "^1.0.11", "compression": "^1.0.11",
"serve-static": "^1.5.3" "serve-static": "^1.6.5"
}, },
"devDependencies": { "devDependencies": {
"gulp": "^3.8.7", "gulp": "^3.8.7",

6
public/res/html/bodyEditor.html
View File

@ -1129,6 +1129,12 @@
Rich Rich
</label> </label>
</div> </div>
<div class="radio">
<label> <input type="radio"
name="radio-settings-editor-font-class" value="font-rich-monospaced">
Rich Monospaced
</label>
</div>
<div class="radio"> <div class="radio">
<label> <input type="radio" <label> <input type="radio"
name="radio-settings-editor-font-class" value="font-monospaced"> name="radio-settings-editor-font-class" value="font-monospaced">

8
public/res/styles/main.less
View File

@ -1190,6 +1190,10 @@ a {
color: fade(@tertiary-color, 25%); color: fade(@tertiary-color, 25%);
} }
&.font-rich-monospaced * {
font-family: @font-family-monospace !important;
}
&.font-monospaced * { &.font-monospaced * {
font-family: @font-family-monospace !important; font-family: @font-family-monospace !important;
line-height: @editor-line-weight !important; line-height: @editor-line-weight !important;
@ -1630,6 +1634,10 @@ div.jGrowl {
**************************************/ **************************************/
@media print { @media print {
* {
.box-shadow(none) !important;
}
html, body { html, body {
background: transparent !important; background: transparent !important;
overflow: visible !important; overflow: visible !important;