diff --git a/bower.json b/bower.json index accb06f6..294b04ac 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "stackedit", - "version": "2.2.2", + "version": "2.2.3", "description": "StackEdit is a free, open-source Markdown editor based on PageDown, the Markdown library used by Stack Overflow and the other Stack Exchange sites.", "dependencies": { "bootstrap": "3.0.0", diff --git a/package.json b/package.json index e25563b3..702d3f64 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "stackedit", - "version": "2.2.2", + "version": "2.2.3", "description": "StackEdit is a free, open-source Markdown editor based on PageDown, the Markdown library used by Stack Overflow and the other Stack Exchange sites.", "main": "res/main.js", "directories": { diff --git a/public/cache.manifest b/public/cache.manifest index b562af14..faad3ee9 100644 --- a/public/cache.manifest +++ b/public/cache.manifest @@ -1,5 +1,5 @@ CACHE MANIFEST -#Date Thu Oct 24 2013 22:54:22 +#Date Sun Oct 27 2013 22:43:37 CACHE: res/worker.js @@ -19,6 +19,7 @@ res-min/font/fontello.eot res-min/font/fontello.svg res-min/font/fontello.ttf res-min/font/fontello.woff +res-min/img/gittip.png res-min/img/glyphicons-halflings-white.png res-min/img/glyphicons-halflings.png res-min/img/icons.png diff --git a/public/res-min/main.js b/public/res-min/main.js index d76e21de..3bdfac25 100644 --- a/public/res-min/main.js +++ b/public/res-min/main.js @@ -13548,7 +13548,7 @@ printStackTrace.implementation = function() {}, printStackTrace.implementation.p }, utils; }); -var VERSION = "2.2.2", MAIN_URL = "https://stackedit.io/", GOOGLE_ANALYTICS_ACCOUNT_ID = "UA-39556145-1", GOOGLE_API_KEY = "AIzaSyAeCU8CGcSkn0z9js6iocHuPBX4f_mMWkw", GOOGLE_DRIVE_APP_ID = "241271498917", DROPBOX_APP_KEY = "lq6mwopab8wskas", DROPBOX_APP_SECRET = "851fgnucpezy84t", BITLY_ACCESS_TOKEN = "317e033bfd48cf31155a68a536b1860013b09c4c", DEFAULT_FILE_TITLE = "Title", DEFAULT_FOLDER_NAME = "New folder", GDRIVE_DEFAULT_FILE_TITLE = "New Markdown document", EDITOR_DEFAULT_PADDING = 15, CHECK_ONLINE_PERIOD = 12e4, AJAX_TIMEOUT = 3e4, ASYNC_TASK_DEFAULT_TIMEOUT = 6e4, ASYNC_TASK_LONG_TIMEOUT = 18e4, SYNC_PERIOD = 18e4, USER_IDLE_THRESHOLD = 3e5, IMPORT_FILE_MAX_CONTENT_SIZE = 1e5, IMPORT_IMG_MAX_CONTENT_SIZE = 1e7, TEMPORARY_FILE_INDEX = "file.tempIndex", WELCOME_DOCUMENT_TITLE = "Welcome document", DOWNLOAD_PROXY_URL = "https://stackedit-download-proxy.herokuapp.com/", PICASA_PROXY_URL = "https://stackedit-picasa-proxy.herokuapp.com/", SSH_PROXY_URL = "https://stackedit-ssh-proxy.herokuapp.com/", HTMLTOPDF_URL = "https://stackedit-htmltopdf.herokuapp.com/", delayedFunction = void 0, BASE_URL = "http://localhost/", GOOGLE_CLIENT_ID = "241271498917-lev37kef013q85avc91am1gccg5g8lrb.apps.googleusercontent.com", GITHUB_CLIENT_ID = "e47fef6055344579799d", GATEKEEPER_URL = "https://stackedit-gatekeeper-localhost.herokuapp.com/", TUMBLR_PROXY_URL = "https://stackedit-tumblr-proxy-local.herokuapp.com/", WORDPRESS_CLIENT_ID = "23361", WORDPRESS_PROXY_URL = "https://stackedit-io-wordpress-proxy.herokuapp.com/"; +var VERSION = "2.2.3", MAIN_URL = "https://stackedit.io/", GOOGLE_ANALYTICS_ACCOUNT_ID = "UA-39556145-1", GOOGLE_API_KEY = "AIzaSyAeCU8CGcSkn0z9js6iocHuPBX4f_mMWkw", GOOGLE_DRIVE_APP_ID = "241271498917", DROPBOX_APP_KEY = "lq6mwopab8wskas", DROPBOX_APP_SECRET = "851fgnucpezy84t", BITLY_ACCESS_TOKEN = "317e033bfd48cf31155a68a536b1860013b09c4c", DEFAULT_FILE_TITLE = "Title", DEFAULT_FOLDER_NAME = "New folder", GDRIVE_DEFAULT_FILE_TITLE = "New Markdown document", EDITOR_DEFAULT_PADDING = 15, CHECK_ONLINE_PERIOD = 12e4, AJAX_TIMEOUT = 3e4, ASYNC_TASK_DEFAULT_TIMEOUT = 6e4, ASYNC_TASK_LONG_TIMEOUT = 18e4, SYNC_PERIOD = 18e4, USER_IDLE_THRESHOLD = 3e5, IMPORT_FILE_MAX_CONTENT_SIZE = 1e5, IMPORT_IMG_MAX_CONTENT_SIZE = 1e7, TEMPORARY_FILE_INDEX = "file.tempIndex", WELCOME_DOCUMENT_TITLE = "Welcome document", DOWNLOAD_PROXY_URL = "https://stackedit-download-proxy.herokuapp.com/", PICASA_PROXY_URL = "https://stackedit-picasa-proxy.herokuapp.com/", SSH_PROXY_URL = "https://stackedit-ssh-proxy.herokuapp.com/", HTMLTOPDF_URL = "https://stackedit-htmltopdf.herokuapp.com/", delayedFunction = void 0, BASE_URL = "http://localhost/", GOOGLE_CLIENT_ID = "241271498917-lev37kef013q85avc91am1gccg5g8lrb.apps.googleusercontent.com", GITHUB_CLIENT_ID = "e47fef6055344579799d", GATEKEEPER_URL = "https://stackedit-gatekeeper-localhost.herokuapp.com/", TUMBLR_PROXY_URL = "https://stackedit-tumblr-proxy-local.herokuapp.com/", WORDPRESS_CLIENT_ID = "23361", WORDPRESS_PROXY_URL = "https://stackedit-io-wordpress-proxy.herokuapp.com/"; 0 === location.hostname.indexOf("stackedit.io") && (BASE_URL = MAIN_URL, GOOGLE_CLIENT_ID = "241271498917-t4t7d07qis7oc0ahaskbif3ft6tk63cd.apps.googleusercontent.com", GITHUB_CLIENT_ID = "710fc67886ab1ae8fee6", GATEKEEPER_URL = "https://stackedit-io-gatekeeper.herokuapp.com/", @@ -13657,6 +13657,7 @@ define("config", function() {}), define("storage", [ "underscore", "utils" ], fu gdriveFullAccess: !0, template: [ "\n", "\n", "\n", '\n', "<%= documentTitle %>\n", '\n', '\n', "\n", '
<%= documentHTML %>
\n', "" ].join(""), pdfTemplate: [ "\n", "\n", "\n", '\n', "<%= documentTitle %>\n", '\n', '\n", '\n', "\n", '<%= documentHTML %>\n', "" ].join(""), + pdfPageSize: "A4", sshProxy: SSH_PROXY_URL, shortcuts: {}, extensionSettings: {} @@ -14785,7 +14786,8 @@ define("config", function() {}), define("storage", [ "underscore", "utils" ], fu s.onPeriodicRun = function() { r(); }, s.onReady = function() { - _gaq.push([ "_setAccount", GOOGLE_ANALYTICS_ACCOUNT_ID ]), r(), _gaq.push([ "_trackEvent", "Settings", "layoutOrientation", "" + o.layoutOrientation ]), + _gaq.push([ "_setAccount", GOOGLE_ANALYTICS_ACCOUNT_ID ]), r(), _gaq.push([ "_trackEvent", "About", "version", VERSION ]), + _gaq.push([ "_trackEvent", "Settings", "layoutOrientation", "" + o.layoutOrientation ]), _gaq.push([ "_trackEvent", "Settings", "theme", "" + theme ]), _gaq.push([ "_trackEvent", "Settings", "lazyRendering", "" + o.lazyRendering ]), _gaq.push([ "_trackEvent", "Settings", "editorFontFamily", "" + o.editorFontFamily ]), _gaq.push([ "_trackEvent", "Settings", "editorFontSize", "" + o.editorFontSize ]), @@ -14823,7 +14825,7 @@ define("config", function() {}), define("storage", [ "underscore", "utils" ], fu !t.isString(e) && e.message && _gaq.push([ "_trackEvent", "Error", "message", e.message + n.formatEventList() ]); }, s; }), define("text!html/dialogAbout.html", [], function() { - return '\n\n'; + return '\n'; }), define("extensions/dialogAbout", [ "underscore", "utils", "classes/Extension", "text!html/dialogAbout.html", "config" ], function(e, t, n, i) { var o = new n("dialogAbout", 'Dialog "About"'), r = { ACE: "http://ace.c9.io/", @@ -20968,7 +20970,7 @@ if (hljs.LANGUAGES.glsl = function(e) { var n = t.template(s.config.template, { documentTitle: l.title, documentMarkdown: l.content, - trimmedDocumentMarkdown: l.content.substring(l.frontMatter ? l.frontMatter._frontMatter.length : 0), + strippedDocumentMarkdown: l.content.substring(l.frontMatter ? l.frontMatter._frontMatter.length : 0), documentHTML: e, frontMatter: l.frontMatter, publishAttributes: void 0 @@ -22506,11 +22508,11 @@ if (hljs.LANGUAGES.glsl = function(e) { }); }, r; }), define("text!html/bodyIndex.html", [], function() { - return '\n
\n
\n
\n
\n\n\n\n\n
\n \n \n
\n
\n
\n
\n
\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
\n
'; + return '\n
\n
\n
\n
\n\n\n\n\n
\n \n \n
\n
\n
\n
\n
\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
\n
'; }), define("text!html/bodyViewer.html", [], function() { return '\n\n
\n
\n
\n\n\n\n
\n \n \n
\n
\n
\n
\n
\n\n\n'; }), define("text!html/settingsTemplateTooltip.html", [], function() { - return 'Available variables:\n
\n\nExamples:\n
<title><%= documentTitle %></title>\n
<div><%- documentHTML %></div>\n
<%\n
if(publishAttributes.provider.providerId == "github") print(documentMarkdown);\n%>\n
\n
\nMore\n info\n
\n
\n\n Careful! Template is subject to malicious code. Don\'t copy/paste untrusted\n content.'; + return 'Available variables:\n
\n\nExamples:\n
<title><%= documentTitle %></title>\n
<div><%- documentHTML %></div>\n
<%\n
if(publishAttributes.provider.providerId == "github") print(documentMarkdown);\n%>\n
\n
\nMore\n info\n
\n
\n\n Careful! Template is subject to malicious code. Don\'t copy/paste untrusted\n content.'; }), define("text!html/settingsUserCustomExtensionTooltip.html", [], function() { return 'Extension variable name:\nuserCustom\n
\n
\nExample:\n
\nuserCustom.onPreviewFinished = function() {\n
\n  eventMgr.onMessage("Finished!");\n
\n};\n
\n
\nMore\n info\n
\n
\n Careful! This is subject to malicious code. Don\'t copy/paste untrusted content.'; }), function(e, t) { @@ -26262,8 +26264,9 @@ if (hljs.LANGUAGES.glsl = function(e) { o.setInputValue("#input-settings-editor-font-family", r.editorFontFamily), o.setInputValue("#input-settings-editor-font-size", r.editorFontSize), o.setInputValue("#input-settings-max-width", r.maxWidth), o.setInputValue("#textarea-settings-default-content", r.defaultContent), o.setInputValue("#input-settings-publish-commit-msg", r.commitMsg), o.setInputChecked("#input-settings-gdrive-full-access", r.gdriveFullAccess), - o.setInputValue("#textarea-settings-publish-template", r.template), o.setInputValue("#textarea-settings-publish-pdf-template", r.pdfTemplate), - o.setInputValue("#input-settings-ssh-proxy", r.sshProxy), a.loadSettings(), s.onLoadSettings(); + o.setInputValue("#textarea-settings-publish-template", r.template), o.setInputValue("#textarea-settings-pdf-template", r.pdfTemplate), + o.setInputValue("#input-settings-pdf-page-size", r.pdfPageSize), o.setInputValue("#input-settings-ssh-proxy", r.sshProxy), + a.loadSettings(), s.onLoadSettings(); } function y(t) { var n = {}; @@ -26273,8 +26276,8 @@ if (hljs.LANGUAGES.glsl = function(e) { n.editorFontSize = o.getInputIntValue("#input-settings-editor-font-size", t, 1, 99), n.maxWidth = o.getInputIntValue("#input-settings-max-width", t, 1), n.defaultContent = o.getInputValue("#textarea-settings-default-content"), n.commitMsg = o.getInputTextValue("#input-settings-publish-commit-msg", t), n.gdriveFullAccess = o.getInputChecked("#input-settings-gdrive-full-access"), - n.template = o.getInputTextValue("#textarea-settings-publish-template", t), n.pdfTemplate = o.getInputTextValue("#textarea-settings-publish-pdf-template", t), - n.sshProxy = o.checkUrl(o.getInputTextValue("#input-settings-ssh-proxy", t), !0), + n.template = o.getInputTextValue("#textarea-settings-publish-template", t), n.pdfTemplate = o.getInputTextValue("#textarea-settings-pdf-template", t), + n.pdfPageSize = o.getInputValue("#input-settings-pdf-page-size"), n.sshProxy = o.checkUrl(o.getInputTextValue("#input-settings-ssh-proxy", t), !0), a.saveSettings(n), n.extensionSettings = {}, s.onSaveSettings(n.extensionSettings, t), t.isPropagationStopped() || (e.extend(r, n), localStorage.settings = JSON.stringify(r), localStorage.theme = i); @@ -28205,19 +28208,27 @@ if (hljs.LANGUAGES.glsl = function(e) { h(e); }), p.enqueue(); }, c; -}), define("providers/tumblrProvider", [ "underscore", "utils", "classes/Provider", "helpers/tumblrHelper" ], function(e, t, n, i) { - var o = new n("tumblr", "Tumblr"); - return o.publishPreferencesInputIds = [ "tumblr-hostname" ], o.publish = function(t, n, o, r, s) { - var a = t.tags || []; - n && void 0 !== n.tags && (a = n.tags), e.isString(a) && (a = e.compact(a.split(/[\s,]/))), - i.upload(t.blogHostname, t.postId, a.join(","), "markdown" == t.format ? "markdown" : "html", o, r, function(e, n) { - return e ? (s(e), void 0) : (t.postId = n, s(), void 0); +}), define("providers/tumblrProvider", [ "underscore", "settings", "utils", "classes/Provider", "helpers/tumblrHelper" ], function(e, t, n, i, o) { + var r = new i("tumblr", "Tumblr"); + return r.publishPreferencesInputIds = [ "tumblr-hostname" ], r.publish = function(n, i, r, s, a) { + var l = n.tags || []; + i && void 0 !== i.tags && (l = i.tags), e.isString(l) && (l = e.compact(l.split(/[\s,]/))); + var c = function() { + if ("html" == n.format) return "html"; + if ("template" == n.format) { + var e = n.customTmpl || t.template; + if (-1 !== e.indexOf("documentHTML")) return "html"; + } + return "markdown"; + }(); + o.upload(n.blogHostname, n.postId, l.join(","), c, r, s, function(e, t) { + return e ? (a(e), void 0) : (n.postId = t, a(), void 0); }); - }, o.newPublishAttributes = function(e) { - var n = {}; - return n.blogHostname = t.getInputTextValue("#input-publish-tumblr-hostname", e, /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$/), - n.postId = t.getInputTextValue("#input-publish-postid"), e.isPropagationStopped() ? void 0 : n; - }, o; + }, r.newPublishAttributes = function(e) { + var t = {}; + return t.blogHostname = n.getInputTextValue("#input-publish-tumblr-hostname", e, /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$/), + t.postId = n.getInputTextValue("#input-publish-postid"), e.isPropagationStopped() ? void 0 : t; + }, r; }), define("helpers/wordpressHelper", [ "jquery", "core", "utils", "eventMgr", "classes/AsyncTask" ], function(e, t, n, i, o) { function r(e) { e.onRun(function() { @@ -28397,7 +28408,7 @@ if (hljs.LANGUAGES.glsl = function(e) { return t.template(s, { documentTitle: e.title, documentMarkdown: e.content, - trimmedDocumentMarkdown: e.content.substring(e.frontMatter ? e.frontMatter._frontMatter.length : 0), + strippedDocumentMarkdown: e.content.substring(e.frontMatter ? e.frontMatter._frontMatter.length : 0), documentHTML: r, frontMatter: e.frontMatter, publishAttributes: n @@ -28471,7 +28482,7 @@ if (hljs.LANGUAGES.glsl = function(e) { void 0; var e = new XMLHttpRequest(); e.open("POST", HTMLTOPDF_URL, !0), e.setRequestHeader("Content-type", "application/x-www-form-urlencoded"), - e.responseType = "blob", e.onreadystatechange = function() { + e.setRequestHeader("page-size", i.pdfPageSize), e.responseType = "blob", e.onreadystatechange = function() { 4 == this.readyState && (200 == this.status ? a = this.response : o.onError("Error when trying to generate PDF: " + this.status), r.chain()); }, e.send(t); diff --git a/public/res-min/themes/blue-gray.css b/public/res-min/themes/blue-gray.css index df311397..9fdbdce6 100644 --- a/public/res-min/themes/blue-gray.css +++ b/public/res-min/themes/blue-gray.css @@ -518,7 +518,7 @@ img{vertical-align:middle} .img-rounded{border-radius:6px} .img-thumbnail{padding:4px;line-height:1.428571429;background-color:#f0f3f4;border:1px solid #dddddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto} .img-circle{border-radius:50%} -hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #f0f3f4} +hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #e0e0e0} .sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0 0 0 0);border:0} p{margin:0 0 10px} .lead{margin-bottom:20px;font-size:16.099999999999998px;font-weight:200;line-height:1.4} @@ -570,7 +570,7 @@ blockquote.pull-right small:after{content:'\00A0 \2014'} q:before,q:after,blockquote:before,blockquote:after{content:""} address{display:block;margin-bottom:20px;font-style:normal;line-height:1.428571429} code,pre{font-family:Monaco,Menlo,Consolas,"Courier New",monospace} -code{padding:2px 4px;font-size:90%;color:#333333;background-color:rgba(0,0,0,0.05);white-space:nowrap;border-radius:4px} +code{padding:2px 4px;font-size:90%;color:#333333;background-color:rgba(0,0,0,0.03);white-space:nowrap;border-radius:4px} pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.428571429;word-break:break-all;word-wrap:break-word;color:#333333;background-color:#f5f5f5;border:1px solid #d9dfe3;border-radius:4px} pre.prettyprint{margin-bottom:20px} pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border:0} @@ -1591,7 +1591,7 @@ h2{margin:30px 0} h3{margin:20px 0} h4,h5,h6{margin:15px 0} p,pre,blockquote{margin:0 0 15px} -hr{border-top:1px solid #ddd;margin:30px 0} +hr{margin:30px 0} code,pre{font-family:Menlo,Consolas,"Courier New",monospace;font-size:12px !important} pre{padding:9.5px !important;border:1px solid #d9dfe3 !important} pre code{background-color:transparent !important} @@ -1603,7 +1603,7 @@ table th{font-weight:bold} table thead th{vertical-align:bottom} table caption+thead tr:first-child th,table caption+thead tr:first-child td,table colgroup+thead tr:first-child th,table colgroup+thead tr:first-child td,table thead:first-child tr:first-child th,table thead:first-child tr:first-child td{border-top:0} table tbody+tbody{border-top:2px solid #dddddd} -blockquote{border-left-width:10px} +blockquote{border-left-width:10px;background-color:rgba(0,0,0,0.03);border-top-right-radius:5px;border-bottom-right-radius:5px;padding:15px 20px} blockquote p{margin-bottom:15px;font-size:14px;line-height:1.428571429} blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0} ul,ol{margin-bottom:15px} @@ -1619,7 +1619,7 @@ ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} .ace-tm .ace_strong{font-weight:bold} .ace-tm .ace_emphasis{color:#333333;font-style:italic} .ace-tm .ace_blockquote{color:#8c8c8c;font-style:italic} -.ace-tm .ace_code{color:#666666;background-color:rgba(136,136,136,0.1)} +.ace-tm .ace_code{color:#333333;background-color:rgba(0,0,0,0.03)} .ace-tm .ace_code_block{color:#333333} .ace-tm .ace_description{color:#666666} .ace-tm .ace_constant{color:#545454} @@ -1662,8 +1662,9 @@ div.dropdown-menu textarea{width:250px;height:150px;resize:none} .icon-provider-wordpress{background-position:-108px 0} .icon-provider-ssh{background-position:-126px 0} .icon-provider-gplus{background-position:-144px 0} -.title-icon-category{display:inline-block;opacity:0.1;margin-top:-4px;margin-left:-2px;margin-right:3px;font-size:12px;vertical-align:top} -.file-title-navbar .title-icon-category{font-size:14px;margin-top:-2px;margin-left:-4px;margin-right:4px} +.btn-gittip{width:52px;height:25px} +.title-icon-category{display:inline-block;opacity:0.1;margin-top:-2px;margin-left:-2px;margin-right:3px;font-size:14px;vertical-align:top} +.file-title-navbar .title-icon-category{font-size:16px;margin-left:-3px} .picker-dialog{z-index:1050 !important} .picker-dialog-bg{z-index:1040 !important} .action-import-image-gplus{float:left} diff --git a/public/res-min/themes/default.css b/public/res-min/themes/default.css index dba345d1..604cc42f 100644 --- a/public/res-min/themes/default.css +++ b/public/res-min/themes/default.css @@ -518,7 +518,7 @@ img{vertical-align:middle} .img-rounded{border-radius:6px} .img-thumbnail{padding:4px;line-height:1.428571429;background-color:#f1f1f1;border:1px solid #dddddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto} .img-circle{border-radius:50%} -hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #f1f1f1} +hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #e0e0e0} .sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0 0 0 0);border:0} p{margin:0 0 10px} .lead{margin-bottom:20px;font-size:16.099999999999998px;font-weight:200;line-height:1.4} @@ -570,7 +570,7 @@ blockquote.pull-right small:after{content:'\00A0 \2014'} q:before,q:after,blockquote:before,blockquote:after{content:""} address{display:block;margin-bottom:20px;font-style:normal;line-height:1.428571429} code,pre{font-family:Monaco,Menlo,Consolas,"Courier New",monospace} -code{padding:2px 4px;font-size:90%;color:#333333;background-color:rgba(0,0,0,0.05);white-space:nowrap;border-radius:4px} +code{padding:2px 4px;font-size:90%;color:#333333;background-color:rgba(0,0,0,0.03);white-space:nowrap;border-radius:4px} pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.428571429;word-break:break-all;word-wrap:break-word;color:#333333;background-color:#f5f5f5;border:1px solid #dddddd;border-radius:4px} pre.prettyprint{margin-bottom:20px} pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border:0} @@ -1591,7 +1591,7 @@ h2{margin:30px 0} h3{margin:20px 0} h4,h5,h6{margin:15px 0} p,pre,blockquote{margin:0 0 15px} -hr{border-top:1px solid #ddd;margin:30px 0} +hr{margin:30px 0} code,pre{font-family:Menlo,Consolas,"Courier New",monospace;font-size:12px !important} pre{padding:9.5px !important;border:1px solid #dddddd !important} pre code{background-color:transparent !important} @@ -1603,7 +1603,7 @@ table th{font-weight:bold} table thead th{vertical-align:bottom} table caption+thead tr:first-child th,table caption+thead tr:first-child td,table colgroup+thead tr:first-child th,table colgroup+thead tr:first-child td,table thead:first-child tr:first-child th,table thead:first-child tr:first-child td{border-top:0} table tbody+tbody{border-top:2px solid #dddddd} -blockquote{border-left-width:10px} +blockquote{border-left-width:10px;background-color:rgba(0,0,0,0.03);border-top-right-radius:5px;border-bottom-right-radius:5px;padding:15px 20px} blockquote p{margin-bottom:15px;font-size:14px;line-height:1.428571429} blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0} ul,ol{margin-bottom:15px} @@ -1619,7 +1619,7 @@ ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} .ace-tm .ace_strong{font-weight:bold} .ace-tm .ace_emphasis{color:#333333;font-style:italic} .ace-tm .ace_blockquote{color:#8c8c8c;font-style:italic} -.ace-tm .ace_code{color:#666666;background-color:rgba(136,136,136,0.1)} +.ace-tm .ace_code{color:#333333;background-color:rgba(0,0,0,0.03)} .ace-tm .ace_code_block{color:#333333} .ace-tm .ace_description{color:#666666} .ace-tm .ace_constant{color:#545454} @@ -1662,8 +1662,9 @@ div.dropdown-menu textarea{width:250px;height:150px;resize:none} .icon-provider-wordpress{background-position:-108px 0} .icon-provider-ssh{background-position:-126px 0} .icon-provider-gplus{background-position:-144px 0} -.title-icon-category{display:inline-block;opacity:0.1;margin-top:-4px;margin-left:-2px;margin-right:3px;font-size:12px;vertical-align:top} -.file-title-navbar .title-icon-category{font-size:14px;margin-top:-2px;margin-left:-4px;margin-right:4px} +.btn-gittip{width:52px;height:25px} +.title-icon-category{display:inline-block;opacity:0.1;margin-top:-2px;margin-left:-2px;margin-right:3px;font-size:14px;vertical-align:top} +.file-title-navbar .title-icon-category{font-size:16px;margin-left:-3px} .picker-dialog{z-index:1050 !important} .picker-dialog-bg{z-index:1040 !important} .action-import-image-gplus{float:left} diff --git a/public/res-min/themes/night.css b/public/res-min/themes/night.css index c22dc0cc..17134416 100644 --- a/public/res-min/themes/night.css +++ b/public/res-min/themes/night.css @@ -518,7 +518,7 @@ img{vertical-align:middle} .img-rounded{border-radius:6px} .img-thumbnail{padding:4px;line-height:1.428571429;background-color:#232323;border:1px solid #dddddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto} .img-circle{border-radius:50%} -hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #232323} +hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #e0e0e0} .sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0 0 0 0);border:0} p{margin:0 0 10px} .lead{margin-bottom:20px;font-size:16.099999999999998px;font-weight:200;line-height:1.4} @@ -1591,7 +1591,7 @@ h2{margin:30px 0} h3{margin:20px 0} h4,h5,h6{margin:15px 0} p,pre,blockquote{margin:0 0 15px} -hr{border-top:1px solid #ddd;margin:30px 0} +hr{margin:30px 0} code,pre{font-family:Menlo,Consolas,"Courier New",monospace;font-size:12px !important} pre{padding:9.5px !important;border:1px solid #444444 !important} pre code{background-color:transparent !important} @@ -1603,7 +1603,7 @@ table th{font-weight:bold} table thead th{vertical-align:bottom} table caption+thead tr:first-child th,table caption+thead tr:first-child td,table colgroup+thead tr:first-child th,table colgroup+thead tr:first-child td,table thead:first-child tr:first-child th,table thead:first-child tr:first-child td{border-top:0} table tbody+tbody{border-top:2px solid #dddddd} -blockquote{border-left-width:10px} +blockquote{border-left-width:10px;background-color:rgba(255,255,255,0.05);border-top-right-radius:5px;border-bottom-right-radius:5px;padding:15px 20px} blockquote p{margin-bottom:15px;font-size:14px;line-height:1.428571429} blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0} ul,ol{margin-bottom:15px} @@ -1619,7 +1619,7 @@ ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} .ace-tm .ace_strong{font-weight:bold} .ace-tm .ace_emphasis{color:#ffffff;font-style:italic} .ace-tm .ace_blockquote{color:#a6a6a6;font-style:italic} -.ace-tm .ace_code{color:#cccccc;background-color:rgba(68,68,68,0.1)} +.ace-tm .ace_code{color:#ffffff;background-color:rgba(255,255,255,0.1)} .ace-tm .ace_code_block{color:#ffffff} .ace-tm .ace_description{color:#cccccc} .ace-tm .ace_constant{color:#dedede} @@ -1662,8 +1662,9 @@ div.dropdown-menu textarea{width:250px;height:150px;resize:none} .icon-provider-wordpress{background-position:-108px 0} .icon-provider-ssh{background-position:-126px 0} .icon-provider-gplus{background-position:-144px 0} -.title-icon-category{display:inline-block;opacity:0.1;margin-top:-4px;margin-left:-2px;margin-right:3px;font-size:12px;vertical-align:top} -.file-title-navbar .title-icon-category{font-size:14px;margin-top:-2px;margin-left:-4px;margin-right:4px} +.btn-gittip{width:52px;height:25px} +.title-icon-category{display:inline-block;opacity:0.1;margin-top:-2px;margin-left:-2px;margin-right:3px;font-size:14px;vertical-align:top} +.file-title-navbar .title-icon-category{font-size:16px;margin-left:-3px} .picker-dialog{z-index:1050 !important} .picker-dialog-bg{z-index:1040 !important} .action-import-image-gplus{float:left} diff --git a/public/res-min/themes/school.css b/public/res-min/themes/school.css index 3df87f4c..468f0e58 100644 --- a/public/res-min/themes/school.css +++ b/public/res-min/themes/school.css @@ -518,7 +518,7 @@ img{vertical-align:middle} .img-rounded{border-radius:6px} .img-thumbnail{padding:4px;line-height:1.428571429;background-color:#ede9e6;border:1px solid #dddddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto} .img-circle{border-radius:50%} -hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #ede9e6} +hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #e0e0e0} .sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0 0 0 0);border:0} p{margin:0 0 10px} .lead{margin-bottom:20px;font-size:16.099999999999998px;font-weight:200;line-height:1.4} @@ -570,7 +570,7 @@ blockquote.pull-right small:after{content:'\00A0 \2014'} q:before,q:after,blockquote:before,blockquote:after{content:""} address{display:block;margin-bottom:20px;font-style:normal;line-height:1.428571429} code,pre{font-family:Monaco,Menlo,Consolas,"Courier New",monospace} -code{padding:2px 4px;font-size:90%;color:#284f72;background-color:rgba(0,0,0,0.05);white-space:nowrap;border-radius:4px} +code{padding:2px 4px;font-size:90%;color:#284f72;background-color:rgba(0,0,0,0.03);white-space:nowrap;border-radius:4px} pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.428571429;word-break:break-all;word-wrap:break-word;color:#333333;background-color:#f5f5f5;border:1px solid #dbd4ce;border-radius:4px} pre.prettyprint{margin-bottom:20px} pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border:0} @@ -1591,7 +1591,7 @@ h2{margin:30px 0} h3{margin:20px 0} h4,h5,h6{margin:15px 0} p,pre,blockquote{margin:0 0 15px} -hr{border-top:1px solid #ddd;margin:30px 0} +hr{margin:30px 0} code,pre{font-family:Menlo,Consolas,"Courier New",monospace;font-size:12px !important} pre{padding:9.5px !important;border:1px solid #dbd4ce !important} pre code{background-color:transparent !important} @@ -1603,7 +1603,7 @@ table th{font-weight:bold} table thead th{vertical-align:bottom} table caption+thead tr:first-child th,table caption+thead tr:first-child td,table colgroup+thead tr:first-child th,table colgroup+thead tr:first-child td,table thead:first-child tr:first-child th,table thead:first-child tr:first-child td{border-top:0} table tbody+tbody{border-top:2px solid #dddddd} -blockquote{border-left-width:10px} +blockquote{border-left-width:10px;background-color:rgba(0,0,0,0.03);border-top-right-radius:5px;border-bottom-right-radius:5px;padding:15px 20px} blockquote p{margin-bottom:15px;font-size:14px;line-height:1.428571429} blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0} ul,ol{margin-bottom:15px} @@ -1619,7 +1619,7 @@ ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} .ace-tm .ace_strong{font-weight:bold} .ace-tm .ace_emphasis{color:#284f72;font-style:italic} .ace-tm .ace_blockquote{color:#7ca9d1;font-style:italic} -.ace-tm .ace_code{color:#4383bd;background-color:rgba(136,136,136,0.1)} +.ace-tm .ace_code{color:#284f72;background-color:rgba(0,0,0,0.03)} .ace-tm .ace_code_block{color:#284f72} .ace-tm .ace_description{color:#4383bd} .ace-tm .ace_constant{color:#3971a3} @@ -1662,8 +1662,9 @@ div.dropdown-menu textarea{width:250px;height:150px;resize:none} .icon-provider-wordpress{background-position:-108px 0} .icon-provider-ssh{background-position:-126px 0} .icon-provider-gplus{background-position:-144px 0} -.title-icon-category{display:inline-block;opacity:0.1;margin-top:-4px;margin-left:-2px;margin-right:3px;font-size:12px;vertical-align:top} -.file-title-navbar .title-icon-category{font-size:14px;margin-top:-2px;margin-left:-4px;margin-right:4px} +.btn-gittip{width:52px;height:25px} +.title-icon-category{display:inline-block;opacity:0.1;margin-top:-2px;margin-left:-2px;margin-right:3px;font-size:14px;vertical-align:top} +.file-title-navbar .title-icon-category{font-size:16px;margin-left:-3px} .picker-dialog{z-index:1050 !important} .picker-dialog-bg{z-index:1040 !important} .action-import-image-gplus{float:left} diff --git a/public/res/config.js b/public/res/config.js index 6d1a3df0..ef4780f7 100644 --- a/public/res/config.js +++ b/public/res/config.js @@ -1,4 +1,4 @@ -var VERSION = "2.2.2"; +var VERSION = "2.2.3"; var MAIN_URL = "https://stackedit.io/"; var GOOGLE_ANALYTICS_ACCOUNT_ID = "UA-39556145-1";