From e45e4254cc8d355c1f9ce44b703e7f9337771eef Mon Sep 17 00:00:00 2001 From: benweet Date: Fri, 27 Dec 2013 22:17:59 +0100 Subject: [PATCH] Prepare release --- public/cache.manifest | 42 +- public/res-min/main.js | 687 ++++++++++++++++-------------- public/res-min/themes/default.css | 36 +- public/res-min/themes/gray.css | 36 +- public/res-min/themes/night.css | 6 +- public/res-min/themes/school.css | 122 +++--- 6 files changed, 485 insertions(+), 444 deletions(-) diff --git a/public/cache.manifest b/public/cache.manifest index c4b01666..7a7e3c07 100644 --- a/public/cache.manifest +++ b/public/cache.manifest @@ -1,5 +1,5 @@ CACHE MANIFEST -#Date Wed Dec 25 2013 23:14:56 +#Date Fri Dec 27 2013 22:17:35 CACHE: res/worker.js @@ -53,20 +53,22 @@ libs/dictionaries/es_ES.aff.lz libs/dictionaries/es_ES.dic.lz libs/dictionaries/fr_FR.aff.lz libs/dictionaries/fr_FR.dic.lz +libs/MathJax/extensions/asciimath2jax.js libs/MathJax/extensions/FontWarnings.js -libs/MathJax/extensions/HTML-CSS/handle-floats.js libs/MathJax/extensions/HelpDialog.js +libs/MathJax/extensions/HTML-CSS/handle-floats.js +libs/MathJax/extensions/jsMath2jax.js libs/MathJax/extensions/MatchWebFonts.js libs/MathJax/extensions/MathEvents.js -libs/MathJax/extensions/MathML/content-mathml.js libs/MathJax/extensions/MathMenu.js +libs/MathJax/extensions/MathML/content-mathml.js libs/MathJax/extensions/MathZoom.js +libs/MathJax/extensions/mml2jax.js libs/MathJax/extensions/Safe.js +libs/MathJax/extensions/TeX/action.js libs/MathJax/extensions/TeX/AMScd.js libs/MathJax/extensions/TeX/AMSmath.js libs/MathJax/extensions/TeX/AMSsymbols.js -libs/MathJax/extensions/TeX/HTML.js -libs/MathJax/extensions/TeX/action.js libs/MathJax/extensions/TeX/autobold.js libs/MathJax/extensions/TeX/autoload-all.js libs/MathJax/extensions/TeX/bbox.js @@ -76,6 +78,7 @@ libs/MathJax/extensions/TeX/cancel.js libs/MathJax/extensions/TeX/color.js libs/MathJax/extensions/TeX/enclose.js libs/MathJax/extensions/TeX/extpfeil.js +libs/MathJax/extensions/TeX/HTML.js libs/MathJax/extensions/TeX/mathchoice.js libs/MathJax/extensions/TeX/mhchem.js libs/MathJax/extensions/TeX/newcommand.js @@ -83,9 +86,6 @@ libs/MathJax/extensions/TeX/noErrors.js libs/MathJax/extensions/TeX/noUndefined.js libs/MathJax/extensions/TeX/unicode.js libs/MathJax/extensions/TeX/verb.js -libs/MathJax/extensions/asciimath2jax.js -libs/MathJax/extensions/jsMath2jax.js -libs/MathJax/extensions/mml2jax.js libs/MathJax/extensions/tex2jax.js libs/MathJax/extensions/toMathML.js libs/MathJax/fonts/HTML-CSS/TeX/woff/MathJax_AMS-Regular.woff @@ -125,9 +125,9 @@ libs/MathJax/jax/element/mml/optable/MiscMathSymbolsB.js libs/MathJax/jax/element/mml/optable/MiscSymbolsAndArrows.js libs/MathJax/jax/element/mml/optable/MiscTechnical.js libs/MathJax/jax/element/mml/optable/SpacingModLetters.js -libs/MathJax/jax/element/mml/optable/SuppMathOperators.js libs/MathJax/jax/element/mml/optable/SupplementalArrowsA.js libs/MathJax/jax/element/mml/optable/SupplementalArrowsB.js +libs/MathJax/jax/element/mml/optable/SuppMathOperators.js libs/MathJax/jax/output/HTML-CSS/autoload/annotation-xml.js libs/MathJax/jax/output/HTML-CSS/autoload/maction.js libs/MathJax/jax/output/HTML-CSS/autoload/menclose.js @@ -158,6 +158,8 @@ libs/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/SpacingModLetters.js libs/MathJax/jax/output/HTML-CSS/fonts/TeX/AMS/Regular/SuppMathOperators.js libs/MathJax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Bold/Main.js libs/MathJax/jax/output/HTML-CSS/fonts/TeX/Caligraphic/Regular/Main.js +libs/MathJax/jax/output/HTML-CSS/fonts/TeX/fontdata-extra.js +libs/MathJax/jax/output/HTML-CSS/fonts/TeX/fontdata.js libs/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/BasicLatin.js libs/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/Main.js libs/MathJax/jax/output/HTML-CSS/fonts/TeX/Fraktur/Bold/Other.js @@ -185,8 +187,8 @@ libs/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MiscMathSymbolsA.js libs/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MiscSymbols.js libs/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/MiscTechnical.js libs/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/SpacingModLetters.js -libs/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/SuppMathOperators.js libs/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/SupplementalArrowsA.js +libs/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Bold/SuppMathOperators.js libs/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/CombDiacritMarks.js libs/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/GeneralPunctuation.js libs/MathJax/jax/output/HTML-CSS/fonts/TeX/Main/Italic/Latin1Supplement.js @@ -226,8 +228,10 @@ libs/MathJax/jax/output/HTML-CSS/fonts/TeX/WinChrome/Regular/Main.js libs/MathJax/jax/output/HTML-CSS/fonts/TeX/WinIE6/Regular/AMS.js libs/MathJax/jax/output/HTML-CSS/fonts/TeX/WinIE6/Regular/Bold.js libs/MathJax/jax/output/HTML-CSS/fonts/TeX/WinIE6/Regular/Main.js -libs/MathJax/jax/output/HTML-CSS/fonts/TeX/fontdata-extra.js -libs/MathJax/jax/output/HTML-CSS/fonts/TeX/fontdata.js +libs/MathJax/jax/output/HTML-CSS/fonts/STIX/fontdata-1.0.js +libs/MathJax/jax/output/HTML-CSS/fonts/STIX/fontdata-beta.js +libs/MathJax/jax/output/HTML-CSS/fonts/STIX/fontdata-extra.js +libs/MathJax/jax/output/HTML-CSS/fonts/STIX/fontdata.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/AlphaPresentForms.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/Arrows.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Bold/BBBold.js @@ -298,6 +302,7 @@ libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/EnclosedAlphanum.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/GeneralPunctuation.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/GreekAndCoptic.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/GreekItalic.js +libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/ij.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/IPAExtensions.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/Latin1Supplement.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/LatinExtendedA.js @@ -307,10 +312,9 @@ libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/LetterlikeSymbols.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/Main.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/MathItalic.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/MathOperators.js -libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/MathSSItalic.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/MathScript.js +libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/MathSSItalic.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/SpacingModLetters.js -libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Italic/ij.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/AlphaPresentForms.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/Arrows.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/BBBold.js @@ -335,6 +339,7 @@ libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/GreekItalic.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/GreekSSBold.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/GreekSSBoldItalic.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/Hiragana.js +libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/ij.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/IPAExtensions.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/Latin1Supplement.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/LatinExtendedA.js @@ -348,11 +353,11 @@ libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathBoldItalic.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathBoldScript.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathItalic.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathOperators.js +libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathScript.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathSS.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathSSBold.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathSSItalic.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathSSItalicBold.js -libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathScript.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MathTT.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MiscMathSymbolsA.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/MiscMathSymbolsB.js @@ -364,10 +369,9 @@ libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/PhoneticExtensions.j libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/SpacingModLetters.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/Specials.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/SuperAndSubscripts.js -libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/SuppMathOperators.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/SupplementalArrowsA.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/SupplementalArrowsB.js -libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/ij.js +libs/MathJax/jax/output/HTML-CSS/fonts/STIX/General/Regular/SuppMathOperators.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/IntegralsD/Bold/All.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/IntegralsD/Regular/All.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/IntegralsD/Regular/Main.js @@ -414,10 +418,6 @@ libs/MathJax/jax/output/HTML-CSS/fonts/STIX/Variants/Bold/All.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/Variants/Bold/Main.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/Variants/Regular/All.js libs/MathJax/jax/output/HTML-CSS/fonts/STIX/Variants/Regular/Main.js -libs/MathJax/jax/output/HTML-CSS/fonts/STIX/fontdata-1.0.js -libs/MathJax/jax/output/HTML-CSS/fonts/STIX/fontdata-beta.js -libs/MathJax/jax/output/HTML-CSS/fonts/STIX/fontdata-extra.js -libs/MathJax/jax/output/HTML-CSS/fonts/STIX/fontdata.js #DynamicResourcesEnd NETWORK: diff --git a/public/res-min/main.js b/public/res-min/main.js index c84ee577..78a22b27 100644 --- a/public/res-min/main.js +++ b/public/res-min/main.js @@ -13677,6 +13677,7 @@ var saveAs = saveAs || "undefined" != typeof navigator && navigator.msSaveOrOpen gdriveMultiAccount: 1, gdriveFullAccess: !0, dropboxFullAccess: !0, + githubFullAccess: !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", @@ -14681,7 +14682,7 @@ var saveAs = saveAs || "undefined" != typeof navigator && navigator.msSaveOrOpen }); }, i; }), define("text!html/markdownExtraSettingsBlock.html", [], function() { - return '

Adds extra features to the original Markdown syntax.

\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
\nMore info'; + return '

Adds extra features to the original Markdown syntax.

\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 \n
\n \n
\n
\n
\nMore info'; }), window.PR_SHOULD_USE_CONTINUATION = !0; var prettyPrintOne, prettyPrint; @@ -18917,7 +18918,7 @@ function() { }, Markdown.Converter = function() { function e(e) { return e = e.replace(/^[ ]{0,3}\[(.+)\]:[ \t]*\n?[ \t]*?(?=\s|$)[ \t]*\n?[ \t]*((\n*)["(](.+?)[")][ \t]*)?(?:\n+)/gm, function(e, t, n, i, o, r) { - return t = t.toLowerCase(), R.set(t, E(n)), o ? i : (r && M.set(t, r.replace(/"/g, """)), + return t = t.toLowerCase(), M.set(t, E(n)), o ? i : (r && N.set(t, r.replace(/"/g, """)), ""); }); } @@ -18929,19 +18930,19 @@ function() { } function o(e, t) { var n = t; - return n = n.replace(/^\n+/, ""), n = n.replace(/\n+$/g, ""), n = "\n\n~K" + (N.push(n) - 1) + "K\n\n"; + return n = n.replace(/^\n+/, ""), n = n.replace(/\n+$/g, ""), n = "\n\n~K" + (B.push(n) - 1) + "K\n\n"; } function r(e, n) { - e = I.preBlockGamut(e, P), e = p(e); + e = R.preBlockGamut(e, O), e = p(e); var i = "
\n"; return e = e.replace(/^[ ]{0,2}([ ]?\*[ ]?){3,}[ \t]*$/gm, i), e = e.replace(/^[ ]{0,2}([ ]?-[ ]?){3,}[ \t]*$/gm, i), e = e.replace(/^[ ]{0,2}([ ]?_[ ]?){3,}[ \t]*$/gm, i), e = f(e), e = m(e), e = x(e), - e = I.postBlockGamut(e, P), e = t(e), e = C(e, n); + e = R.postBlockGamut(e, O), e = t(e), e = C(e, n); } function s(e) { - return e = I.preSpanGamut(e), e = b(e), e = a(e), e = k(e), e = u(e), e = l(e), - e = S(e), e = e.replace(/~P/g, "://"), e = E(e), e = w(e), e = e.replace(/ +\n/g, "
\n"), - e = I.postSpanGamut(e); + return e = R.preSpanGamut(e), e = b(e), e = a(e), e = k(e), e = u(e), e = l(e), + e = S(e), e = e.replace(/~P/g, "://"), e = E(e), e = I._DoItalicsAndBold ? I._DoItalicsAndBold(e) : w(e), + e = e.replace(/ +\n/g, "
\n"), e = R.postSpanGamut(e); } function a(e) { var t = /(<[a-z\/!$]("[^"]*"|'[^']*'|[^'">])*>|-]|-[^>])(?:[^-]|-[^-])*)--)>)/gi; @@ -18959,7 +18960,7 @@ function() { void 0 == a && (a = ""); var l = t, c = n.replace(/:\/\//g, "~P"), u = i.toLowerCase(), h = o, p = a; if ("" == h) if ("" == u && (u = c.toLowerCase().replace(/ ?\n/g, " ")), h = "#" + u, - void 0 != R.get(u)) h = R.get(u), void 0 != M.get(u) && (p = M.get(u)); else { + void 0 != M.get(u)) h = M.get(u), void 0 != N.get(u) && (p = N.get(u)); else { if (!(l.search(/\(\s*\)$/m) > -1)) return l; h = ""; } @@ -18976,8 +18977,8 @@ function() { function h(e, t, n, i, o, r, s, a) { var l = t, c = n, u = i.toLowerCase(), h = o, p = a; if (p || (p = ""), "" == h) { - if ("" == u && (u = c.toLowerCase().replace(/ ?\n/g, " ")), h = "#" + u, void 0 == R.get(u)) return l; - h = R.get(u), void 0 != M.get(u) && (p = M.get(u)); + if ("" == u && (u = c.toLowerCase().replace(/ ?\n/g, " ")), h = "#" + u, void 0 == M.get(u)) return l; + h = M.get(u), void 0 != N.get(u) && (p = N.get(u)); } c = L(d(c), "*_[]()"), h = L(h, "*_"); var f = '' + c + ' -1 ? "ul" : "ol", s = g(o, r, t); return s = s.replace(/\s+$/, ""), s = "<" + r + ">" + s + "\n"; }) : (n = /(\n\n|^\n?)(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/g, @@ -19006,13 +19007,13 @@ function() { })), e = e.replace(/~0/, ""); } function g(e, t, n) { - B++, e = e.replace(/\n{2,}$/, "\n"), e += "~0"; - var i = O[t], o = new RegExp("(^[ \\t]*)(" + i + ")[ \\t]+([^\\r]+?(\\n+))(?=(~0|\\1(" + i + ")[ \\t]+))", "gm"), a = !1; + P++, e = e.replace(/\n{2,}$/, "\n"), e += "~0"; + var i = z[t], o = new RegExp("(^[ \\t]*)(" + i + ")[ \\t]+([^\\r]+?(\\n+))(?=(~0|\\1(" + i + ")[ \\t]+))", "gm"), a = !1; return e = e.replace(o, function(e, t, i, o) { var l = o, c = /\n\n$/.test(l), u = c || l.search(/\n{2,}/) > -1; return u || a ? l = r(F(l), !0) : (l = f(F(l), !0), l = l.replace(/\n$/, ""), n || (l = s(l))), a = c, "
  • " + l + "
  • \n"; - }), e = e.replace(/~0/g, ""), B--, e; + }), e = e.replace(/~0/g, ""), P--, e; } function m(e) { return e += "~0", e = e.replace(/(?:\n\n|^\n?)((?:(?:[ ]{4}|\t).*\n+)+)(\n*[ ]{0,3}[^ \t\n]|(?=~0))/g, function(e, t, n) { @@ -19022,7 +19023,7 @@ function() { }), e = e.replace(/~0/, ""); } function v(e) { - return e = e.replace(/(^\n+|\n+$)/g, ""), "\n\n~K" + (N.push(e) - 1) + "K\n\n"; + return e = e.replace(/(^\n+|\n+$)/g, ""), "\n\n~K" + (B.push(e) - 1) + "K\n\n"; } function b(e) { return e = e.replace(/(^|[^\\])(`+)([^\r]*?[^`])\2(?!`)/gm, function(e, t, n, i) { @@ -19059,7 +19060,7 @@ function() { if (!t) { r = i.length; for (var a = 0; r > a; a++) for (var c = !0; c; ) c = !1, i[a] = i[a].replace(/~K(\d+)K/g, function(e, t) { - return c = !0, N[t]; + return c = !0, B[t]; }); } return i.join("\n\n"); @@ -19083,14 +19084,14 @@ function() { } if (a) { var c = i.charAt(i.length - 1); - U.test(c) || (a = c + a, i = i.substr(0, i.length - 1)); + W.test(c) || (a = c + a, i = i.substr(0, i.length - 1)); } return "<" + n + i + ">" + a; } function S(e) { - e = e.replace(H, A); + e = e.replace(U, A); var t = function(e, t) { - return '' + I.plainLinkText(t) + ""; + return '' + R.plainLinkText(t) + ""; }; return e = e.replace(/<((https?|ftp):[^'">\s]+)>/gi, t); } @@ -19111,7 +19112,7 @@ function() { }); } function D(e) { - return e ? (e.length, e.replace(W, function(e) { + return e ? (e.length, e.replace(q, function(e) { return "~D" == e ? "%24" : ":" == e ? ":" : "%" + e.charCodeAt(0).toString(16); })) : ""; } @@ -19125,25 +19126,29 @@ function() { var n = t.charCodeAt(0); return "~E" + n + "E"; } - var I = this.hooks = new n(); - I.addNoop("plainLinkText"), I.addNoop("preConversion"), I.addNoop("postNormalization"), - I.addNoop("preBlockGamut"), I.addNoop("postBlockGamut"), I.addNoop("preSpanGamut"), - I.addNoop("postSpanGamut"), I.addNoop("postConversion"); - var R, M, N, B; - this.makeHtml = function(n) { - if (R) throw new Error("Recursive call to converter.makeHtml"); - return R = new i(), M = new i(), N = [], B = 0, n = I.preConversion(n), n = n.replace(/~/g, "~T"), - n = n.replace(/\$/g, "~D"), n = n.replace(/\r\n/g, "\n"), n = n.replace(/\r/g, "\n"), - n = "\n\n" + n + "\n\n", n = T(n), n = n.replace(/^[ \t]+$/gm, ""), n = I.postNormalization(n), - n = t(n), n = e(n), n = r(n), n = _(n), n = n.replace(/~D/g, "$$"), n = n.replace(/~T/g, "~"), - n = I.postConversion(n), N = M = R = null, n; + var I = {}; + this.setOptions = function(e) { + I = e; }; - var P = function(e) { + var R = this.hooks = new n(); + R.addNoop("plainLinkText"), R.addNoop("preConversion"), R.addNoop("postNormalization"), + R.addNoop("preBlockGamut"), R.addNoop("postBlockGamut"), R.addNoop("preSpanGamut"), + R.addNoop("postSpanGamut"), R.addNoop("postConversion"); + var M, N, B, P; + this.makeHtml = function(n) { + if (M) throw new Error("Recursive call to converter.makeHtml"); + return M = new i(), N = new i(), B = [], P = 0, n = R.preConversion(n), n = n.replace(/~/g, "~T"), + n = n.replace(/\$/g, "~D"), n = n.replace(/\r\n/g, "\n"), n = n.replace(/\r/g, "\n"), + n = "\n\n" + n + "\n\n", n = T(n), n = n.replace(/^[ \t]+$/gm, ""), n = R.postNormalization(n), + n = t(n), n = e(n), n = r(n), n = _(n), n = n.replace(/~D/g, "$$"), n = n.replace(/~T/g, "~"), + n = R.postConversion(n), B = N = M = null, n; + }; + var O = function(e) { return r(e); - }, O = { + }, z = { ol: "\\d+[.]", ul: "[*+-]" - }, z = "[-A-Z0-9+&@#/%?=~_|[\\]()!:,.;]", j = "[-A-Z0-9+&@#/%=~_|[\\])]", H = new RegExp('(="|<)?\\b(https?|ftp)(://' + z + "*" + j + ")(?=$|\\W)", "gi"), U = new RegExp(j, "i"), W = /(?:["'*()[\]:]|~D)/g; + }, j = "[-A-Z0-9+&@#/%?=~_|[\\]()!:,.;]", H = "[-A-Z0-9+&@#/%=~_|[\\])]", U = new RegExp('(="|<)?\\b(https?|ftp)(://' + j + "*" + H + ")(?=$|\\W)", "gi"), W = new RegExp(H, "i"), q = /(?:["'*()[\]:]|~D)/g; }; }(), define("bower-libs/pagedown-ace/Markdown.Converter", function() {}), function() { function e() {} @@ -20000,6 +20005,7 @@ function() { var a = new i("markdownExtra", "Markdown Extra", !0); a.settingsBlock = o, a.defaultConfig = { extensions: [ "fenced_code_gfm", "tables", "def_list", "attr_list", "footnotes", "smartypants", "strikethrough", "newlines" ], + intraword: !0, highlighter: "prettify" }, a.onLoadSettings = function() { function e(e) { @@ -20011,7 +20017,7 @@ function() { n.setInputChecked("#input-markdownextra-deflist", e("def_list")), n.setInputChecked("#input-markdownextra-attrlist", e("attr_list")), n.setInputChecked("#input-markdownextra-footnotes", e("footnotes")), n.setInputChecked("#input-markdownextra-smartypants", e("smartypants")), n.setInputChecked("#input-markdownextra-strikethrough", e("strikethrough")), n.setInputChecked("#input-markdownextra-newlines", e("newlines")), - n.setInputValue("#input-markdownextra-highlighter", a.config.highlighter); + n.setInputChecked("#input-markdownextra-intraword", a.config.intraword), n.setInputValue("#input-markdownextra-highlighter", a.config.highlighter); }, a.onSaveSettings = function(e) { e.extensions = [], n.getInputChecked("#input-markdownextra-fencedcodegfm") && e.extensions.push("fenced_code_gfm"), n.getInputChecked("#input-markdownextra-tables") && e.extensions.push("tables"), @@ -20021,25 +20027,35 @@ function() { n.getInputChecked("#input-markdownextra-smartypants") && e.extensions.push("smartypants"), n.getInputChecked("#input-markdownextra-strikethrough") && e.extensions.push("strikethrough"), n.getInputChecked("#input-markdownextra-newlines") && e.extensions.push("newlines"), - e.highlighter = n.getInputValue("#input-markdownextra-highlighter"); + e.intraword = n.getInputChecked("#input-markdownextra-intraword"), e.highlighter = n.getInputValue("#input-markdownextra-highlighter"); }; var l; return a.onEventMgrCreated = function(e) { l = e; }, a.onPagedownConfigure = function(e) { - var n = e.getConverter(), i = { + var n = e.getConverter(); + if (a.config.intraword === !0) { + var i = { + _DoItalicsAndBold: function(e) { + return e = e.replace(/([^\w*]|^)(\*\*|__)(?=\S)(.+?[*_]*)(?=\S)\2(?=[^\w*]|$)/g, "$1$3"), + e = e.replace(/([^\w*]|^)(\*|_)(?=\S)(.+?)(?=\S)\2(?=[^\w*]|$)/g, "$1$3"); + } + }; + n.setOptions(i); + } + var o = { extensions: a.config.extensions }; if ("highlight" == a.config.highlighter) { - i.highlighter = "prettify"; - var o = document.getElementById("preview-contents"); + o.highlighter = "prettify"; + var l = document.getElementById("preview-contents"); e.hooks.chain("onPreviewRefresh", function() { - t.each(o.querySelectorAll(".prettyprint > code"), function(e) { + t.each(l.querySelectorAll(".prettyprint > code"), function(e) { s.highlightBlock(e); }); }); - } else "prettify" == a.config.highlighter && (i.highlighter = "prettify", e.hooks.chain("onPreviewRefresh", r.prettyPrint)); - Markdown.Extra.init(n, i); + } else "prettify" == a.config.highlighter && (o.highlighter = "prettify", e.hooks.chain("onPreviewRefresh", r.prettyPrint)); + Markdown.Extra.init(n, o); }, a; }), define("text!html/mathJaxSettingsBlock.html", [], function() { return '

    Allows StackEdit to interpret LaTeX mathematical expressions.

    \n
    \n
    \n \n
    \n \n
    \n
    \n
    \n \n
    \n \n
    \n
    \n
    \nMore info'; @@ -20489,7 +20505,7 @@ function() { u = e(t.querySelectorAll(".msg-no-sync")); }, r; }), define("text!html/dialogManageSharingLocation.html", [], function() { - return '
    \n \n
    \n'; + return '
    \n \n
    \n'; }), define("extensions/dialogManageSharing", [ "jquery", "underscore", "classes/Extension", "text!html/dialogManageSharingLocation.html" ], function(e, t, n, i) { var o, r, s, a, l = new n("dialogManageSharing", 'Button "Share"', !1, !0), c = function(e) { if (void 0 === e || e === o) { @@ -21263,7 +21279,7 @@ function() { h(), E.text(t.size(l)), k.text(t.size(a) + 1), C = t.filter(l, function(e) { return void 0 === e.folder; }); - var n = [ '', '', '
    ', t.size(C), "
    ", '
    ', "ROOT folder
    " ].join(""), i = t.chain(C).sortBy(function(e) { + var n = [ '', '', '
    ', t.size(C), "
    ", '
    ', "ROOT folder
    " ].join(""), i = t.chain(C).sortBy(function(e) { return e.title.toLowerCase(); }).reduce(function(e, n) { return e + t.template(S, { @@ -21327,7 +21343,7 @@ function() { }).find("[type=checkbox]").change(function() { n.parent().next().find("[type=checkbox]").prop("checked", this.checked); }); - }), e(b.querySelectorAll("[type=checkbox]")).change(h); + }), e(b.querySelectorAll("[type=checkbox]")).change(h), e(b.querySelectorAll(".root-folder")).click(); } }, 50); return f.onFileCreated = L, f.onFileDeleted = L, f.onTitleChanged = L, f.onSyncExportSuccess = L, @@ -23552,7 +23568,7 @@ function() { }); }, 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\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\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() { @@ -28314,20 +28330,20 @@ function() { regex: /^#{1,6}(?=\s*[^ #]|\s+#.)/, next: "header" }, { - token: "code_block", + token: "constant.language.escape", regex: "^```\\s*[a-zA-Z]*(?:{.*?\\})?\\s*$", next: "githubblock" }, { - token: "blockquote", - regex: "^\\s*>\\s*(?:[*+-]|\\d+\\.)?\\s+", + token: [ "constant.language.escape", "blockquote" ], + regex: "(^\\s*>\\s*(?:[*+-]|\\d+\\.)?)(\\s+)", next: "blockquote" }, { token: "constant", regex: "^ {0,2}(?:(?: ?\\* ?){3,}|(?: ?\\- ?){3,}|(?: ?\\_ ?){3,})\\s*$", next: "allowBlock" }, { - token: "markup.list", - regex: "^\\s{0,3}(?:[*+-]|\\d+\\.)\\s+", + token: [ "constant.language.escape", "markup.list" ], + regex: "(^\\s{0,3}(?:[*+-]|\\d+\\.))(\\s+)", next: "listblock-start" }, { token: "constant.language.escape", @@ -28398,8 +28414,8 @@ function() { regex: "^$", next: "start" }, { - token: "markup.list", - regex: "^\\s{0,3}(?:[*+-]|\\d+\\.)\\s+", + token: [ "constant.language.escape", "markup.list" ], + regex: "(^\\s{0,3}(?:[*+-]|\\d+\\.))(\\s+)", next: "listblock-start" }, { include: "basic", @@ -28412,8 +28428,8 @@ function() { regex: "^\\s*$", next: "start" }, { - token: "blockquote", - regex: "^\\s*>\\s*(?:[*+-]|\\d+\\.)?\\s+", + token: [ "constant.language.escape", "blockquote" ], + regex: "(^\\s*>\\s*(?:[*+-]|\\d+\\.)?)(\\s+)", next: "blockquote" }, { include: "basic", @@ -28422,7 +28438,7 @@ function() { defaultToken: "blockquote" } ], githubblock: [ { - token: "code_block", + token: "constant.language.escape", regex: "^```", next: "start" }, { @@ -28741,9 +28757,10 @@ function() { r.setInputValue("#input-settings-max-width", a.maxWidth), r.setInputValue("#textarea-settings-default-content", a.defaultContent), r.setInputRadio("radio-settings-mode", s.mode || "_ace_"), r.setInputValue("#input-settings-publish-commit-msg", a.commitMsg), r.setInputValue("#input-settings-gdrive-multiaccount", a.gdriveMultiAccount), r.setInputChecked("#input-settings-gdrive-full-access", a.gdriveFullAccess), - r.setInputChecked("#input-settings-dropbox-full-access", a.dropboxFullAccess), r.setInputValue("#textarea-settings-publish-template", a.template), - r.setInputValue("#textarea-settings-pdf-template", a.pdfTemplate), r.setInputValue("#input-settings-pdf-page-size", a.pdfPageSize), - r.setInputValue("#input-settings-ssh-proxy", a.sshProxy), c.loadSettings(), l.onLoadSettings(); + r.setInputChecked("#input-settings-dropbox-full-access", a.dropboxFullAccess), r.setInputChecked("#input-settings-github-full-access", a.githubFullAccess), + r.setInputValue("#textarea-settings-publish-template", a.template), r.setInputValue("#textarea-settings-pdf-template", a.pdfTemplate), + r.setInputValue("#input-settings-pdf-page-size", a.pdfPageSize), r.setInputValue("#input-settings-ssh-proxy", a.sshProxy), + c.loadSettings(), l.onLoadSettings(); } function x(t) { var n = {}; @@ -28755,8 +28772,9 @@ function() { var o = r.getInputRadio("radio-settings-mode"); n.commitMsg = r.getInputTextValue("#input-settings-publish-commit-msg", t), n.gdriveMultiAccount = r.getInputIntValue("#input-settings-gdrive-multiaccount"), n.gdriveFullAccess = r.getInputChecked("#input-settings-gdrive-full-access"), n.dropboxFullAccess = r.getInputChecked("#input-settings-dropbox-full-access"), - n.template = r.getInputTextValue("#textarea-settings-publish-template", t), n.pdfTemplate = r.getInputTextValue("#textarea-settings-pdf-template", t), - n.pdfPageSize = r.getInputValue("#input-settings-pdf-page-size"), n.sshProxy = r.checkUrl(r.getInputTextValue("#input-settings-ssh-proxy", t), !0), + n.githubFullAccess = r.getInputChecked("#input-settings-github-full-access"), n.template = r.getInputTextValue("#textarea-settings-publish-template", t), + n.pdfTemplate = r.getInputTextValue("#textarea-settings-pdf-template", t), n.pdfPageSize = r.getInputValue("#input-settings-pdf-page-size"), + n.sshProxy = r.checkUrl(r.getInputTextValue("#input-settings-ssh-proxy", t), !0), c.saveSettings(n), n.extensionSettings = {}, l.onSaveSettings(n.extensionSettings, t), t.isPropagationStopped() || (a.dropboxFullAccess !== n.dropboxFullAccess && s.removeItem("dropbox.lastChangeId"), e.extend(a, n), s.settings = JSON.stringify(a), s.themeV3 = i, s.mode = o); @@ -28771,7 +28789,7 @@ function() { j = i.edit("wmd-input"), j.setOption("spellcheck", !0), j.renderer.setShowGutter(!1), j.renderer.setPrintMarginColumn(!1), j.renderer.setPadding(o.EDITOR_DEFAULT_PADDING), j.session.setUseWrapMode(!0), j.session.setNewLineMode("unix"), j.session.setMode("libs/ace_mode"), - function(e) { + j.session.$selectLongWords = !0, function(e) { function n(n) { var i = e.lines[n]; 0 !== i.length && 0 === i[0].type.indexOf("markup.heading.multi") && t.each(e.lines[n - 1], function(e) { @@ -28903,8 +28921,15 @@ function() { s.scroll(function() { void 0 !== Z && (Y.previewScrollTop = s.scrollTop()); }); - var h, p = new Markdown.Converter(); - K = window.lightMode ? new Markdown.EditorLight(p) : new Markdown.Editor(p, void 0, { + var h = new Markdown.Converter(), p = { + _DoItalicsAndBold: function(e) { + return e = e.replace(/(\*\*|__)(?=\S)(.+?[*_]*)(?=\S)\1/g, "$2"), + e = e.replace(/(\*|_)(?=\S)(.+?)(?=\S)\1/g, "$2"); + } + }; + h.setOptions(p); + var f; + K = window.lightMode ? new Markdown.EditorLight(h) : new Markdown.Editor(h, void 0, { keyStrokes: c.getPagedownKeyStrokes() }), K.hooks.set("insertLinkDialog", function(t) { return T.insertLinkCallback = t, r.resetModalInputs(), e(".modal-insert-link").modal(), @@ -28912,7 +28937,7 @@ function() { }), K.hooks.set("insertImageDialog", function(t) { return T.insertLinkCallback = t, T.catchModal ? !0 : (r.resetModalInputs(), e(".modal-insert-image").modal(), !0); - }), h = a.lazyRendering === !0 ? function(e) { + }), f = a.lazyRendering === !0 ? function(e) { var n = t.debounce(e, 500); return function() { void 0 === Z ? (e(), l.onFileOpen(Y), s.scrollTop(Y.previewScrollTop), window.lightMode ? X.scrollTop(Y.editorScrollTop) : t.defer(function() { @@ -28926,18 +28951,18 @@ function() { })), i(); }; }, l.onPagedownConfigure(K), K.hooks.chain("onPreviewRefresh", l.onAsyncPreview), - window.lightMode ? (K.run(h), K.undoManager.reinit(o, Y.editorStart, Y.editorEnd, Y.editorScrollTop), - X.focus()) : (K.run(j, h), j.selection.setSelectionRange(Y.editorSelectRange), j.focus()), + window.lightMode ? (K.run(f), K.undoManager.reinit(o, Y.editorStart, Y.editorEnd, Y.editorScrollTop), + X.focus()) : (K.run(j, f), j.selection.setSelectionRange(Y.editorSelectRange), j.focus()), e(".wmd-button-row li").addClass("btn btn-success").css("left", 0).find("span").hide(); - var f = e(".wmd-button-group1"); - e("#wmd-bold-button").append(e('')).appendTo(f), e("#wmd-italic-button").append(e('')).appendTo(f), - f = e(".wmd-button-group2"), e("#wmd-link-button").append(e('')).appendTo(f), - e("#wmd-quote-button").append(e('')).appendTo(f), e("#wmd-code-button").append(e('')).appendTo(f), - e("#wmd-image-button").append(e('')).appendTo(f), f = e(".wmd-button-group3"), - e("#wmd-olist-button").append(e('')).appendTo(f), - e("#wmd-ulist-button").append(e('')).appendTo(f), e("#wmd-heading-button").append(e('')).appendTo(f), - e("#wmd-hr-button").append(e('')).appendTo(f), f = e(".wmd-button-group4"), - e("#wmd-undo-button").append(e('')).appendTo(f), e("#wmd-redo-button").append(e('')).appendTo(f); + var g = e(".wmd-button-group1"); + e("#wmd-bold-button").append(e('')).appendTo(g), e("#wmd-italic-button").append(e('')).appendTo(g), + g = e(".wmd-button-group2"), e("#wmd-link-button").append(e('')).appendTo(g), + e("#wmd-quote-button").append(e('')).appendTo(g), e("#wmd-code-button").append(e('')).appendTo(g), + e("#wmd-image-button").append(e('')).appendTo(g), g = e(".wmd-button-group3"), + e("#wmd-olist-button").append(e('')).appendTo(g), + e("#wmd-ulist-button").append(e('')).appendTo(g), e("#wmd-heading-button").append(e('')).appendTo(g), + e("#wmd-hr-button").append(e('')).appendTo(g), g = e(".wmd-button-group4"), + e("#wmd-undo-button").append(e('')).appendTo(g), e("#wmd-redo-button").append(e('')).appendTo(g); }; var ot, rt; T.redirectConfirm = function(t, n, i) { @@ -29561,10 +29586,12 @@ function() { } function d(e) { e.onRun(function() { - return b === !0 ? (g = !1, e.error(new Error("Operation not available in offline mode.|stopPublish")), - void 0) : g === !0 ? (e.chain(), void 0) : (window.delayedFunction = function() { + return y === !0 ? (m = !1, e.error(new Error("Operation not available in offline mode.|stopPublish")), + void 0) : m === !0 ? (e.chain(), void 0) : (window.delayedFunction = function() { gapi.load("client,drive-realtime", function() { - g = !0, e.chain(); + gapi.client.load("drive", "v2", function() { + m = !0, e.chain(); + }); }); }, t.ajax({ url: "https://apis.google.com/js/api.js?onload=runDelayedFunction", @@ -29575,85 +29602,85 @@ function() { code: t.status, message: t.statusText }; - p(n, e); + f(n, e); }), void 0); }); } function h(o, r, s) { - var a = m[s]; - a || (a = new u(s), m[s] = a), o.onRun(function() { + var a = v[s]; + a || (a = new u(s), v[s] = a), o.onRun(function() { function s() { - return gapi.client.drive ? (o.chain(), void 0) : (gapi.client.load("drive", "v2", function() { - o.chain(); - }), void 0); - } - function l() { t.ajax({ url: "https://www.googleapis.com/oauth2/v1/tokeninfo", data: { - access_token: gapi.auth.getToken().access_token + access_token: d.access_token }, timeout: n.AJAX_TIMEOUT, type: "GET" }).done(function(e) { - a.getUserId() && a.getUserId() != e.user_id ? d() : (a.setUserId(e.user_id), a.add(r), - a.token = gapi.auth.getToken(), o.chain(s)); + a.getUserId() && a.getUserId() != e.user_id ? u() : (a.setUserId(e.user_id), a.add(r), + a.token = d, o.chain()); }).fail(function(e) { var t = { code: e.status, message: e.statusText }; - p(t, o); + f(t, o); }); } - function c() { - if (f > 5) return o.error(new Error("Unable to authenticate user " + a.getUserId() + ", please sign in with Google.")), + function l() { + if (g > 5) return o.error(new Error("Unable to authenticate user " + a.getUserId() + ", please sign in with Google.")), void 0; h === !1 && (o.timeout = n.ASYNC_TASK_LONG_TIMEOUT); - var t = e.chain(y).pick(a.getListWithNew(r)).flatten().value(); + var t = e.chain(w).pick(a.getListWithNew(r)).flatten().value(); gapi.auth.authorize({ client_id: n.GOOGLE_CLIENT_ID, scope: t, immediate: h, - authuser: h === !1 ? "" : f + authuser: h === !1 ? "" : g }, function(e) { - !e || e.error ? g === !0 && h === !0 ? (h = !1, o.chain(u)) : o.error(new Error("Access to Google account is not authorized.")) : (h === !0 && f++, - o.chain(l)); + d = gapi.auth.getToken(), gapi.auth.setToken(p), !e || e.error ? m === !0 && h === !0 ? (h = !1, + o.chain(c)) : o.error(new Error("Access to Google account is not authorized.")) : (h === !0 && g++, + o.chain(s)); }); } - function u() { - return h === !0 ? (o.chain(c), void 0) : (i.redirectConfirm("You are being redirected to Google authorization page.", function() { - o.chain(c); + function c() { + return h === !0 ? (o.chain(l), void 0) : (i.redirectConfirm("You are being redirected to Google authorization page.", function() { + o.chain(l); }, function() { o.error(new Error("Operation canceled.")); }), void 0); } - function d() { - return h = !0, a.token && a.isAuthorized(r) ? (gapi.auth.setToken(a.token), o.chain(), - void 0) : (a.getUserId() || (h = !1), o.chain(u), void 0); + function u() { + return h = !0, a.token && a.isAuthorized(r) ? (o.chain(), void 0) : (a.getUserId() || (h = !1), + o.chain(c), void 0); } - var h, f = 0; - d(); + var d, h, p = gapi.auth.getToken(), g = 0; + u(); }); } - function p(t, n) { + function p(e, t) { + var n = gapi.auth.getToken(), i = v[e]; + gapi.auth.setToken(i.token), t(), gapi.auth.setToken(n); + } + function f(t, n) { var o; if (t) if (s.error(t), "string" == typeof t) o = t; else { if (o = "Google error (" + t.code + ": " + t.message + ").", t.code >= 500 && t.code < 600) return n.retry(new Error(o)), void 0; - if (401 === t.code || 403 === t.code || "token_refresh_required" == t.code) return e.each(m, function(e) { + if (401 === t.code || 403 === t.code || "token_refresh_required" == t.code) return e.each(v, function(e) { e.setRefreshFlag(); }), o = "Access to Google account is not authorized.", n.retry(new Error(o), 1), void 0; - (0 === t.code || -1 === t.code) && (g = !1, e.each(m, function(e) { + (0 === t.code || -1 === t.code) && (m = !1, e.each(v, function(e) { e.setRefreshFlag(); }), i.setOffline(), o = "|stopPublish"); } n.error(new Error(o)); } - function f(e) { + function g(e) { e.onRun(function() { - return w === !0 ? (e.chain(), void 0) : (t.ajax({ + return x === !0 ? (e.chain(), void 0) : (t.ajax({ url: "//www.google.com/jsapi", data: { key: n.GOOGLE_API_KEY @@ -29665,34 +29692,34 @@ function() { callback: function() { e.chain(); } - }), w = !0; + }), x = !0; }).fail(function(t) { var n = { code: t.status, message: t.statusText }; - p(n, e); + f(n, e); }), void 0); }); } - var g = !1, m = {}, v = {}, b = !1; + var m = !1, v = {}, b = {}, y = !1; l.addListener("onOfflineChanged", function(e) { - b = e; + y = e; }); - var y = { + var w = { profile: [ "https://www.googleapis.com/auth/userinfo.profile" ], gdrive: [ "https://www.googleapis.com/auth/drive.install", a.gdriveFullAccess === !0 ? "https://www.googleapis.com/auth/drive" : "https://www.googleapis.com/auth/drive.file" ], blogger: [ "https://www.googleapis.com/auth/blogger" ], picasa: [ "https://picasaweb.google.com/data/" ] }; - v.refreshGdriveToken = function(e) { + b.refreshGdriveToken = function(e) { var t = new c(); d(t); - var n = m[e]; + var n = v[e]; n && n.setRefreshFlag(), h(t, "gdrive", e), t.enqueue(); - }, v.upload = function(e, t, n, i, s, a, l, u) { - var f, g = new c(); - d(g), h(g, "gdrive", l), g.onRun(function() { + }, b.upload = function(e, t, n, i, s, a, l, u) { + var g, m = new c(); + d(m), h(m, "gdrive", l), m.onRun(function() { var a = "-------314159265358979323846", c = "\r\n--" + a + "\r\n", u = "\r\n--" + a + "--"; s = s || "text/x-markdown"; var d = { @@ -29703,164 +29730,174 @@ function() { kind: "drive#fileLink", id: t } ]); - var h = "/upload/drive/v2/files", m = "POST"; - e && (h += "/" + e, m = "PUT"); - var v = { + var h = "/upload/drive/v2/files", v = "POST"; + e && (h += "/" + e, v = "PUT"); + var b = { "Content-Type": 'multipart/mixed; boundary="' + a + '"' - }, b = o.encodeBase64(i), y = [ c, "Content-Type: application/json\r\n\r\n", JSON.stringify(d), c, "Content-Type: ", s, "\r\n", "Content-Transfer-Encoding: base64\r\n", "\r\n", b, u ].join(""), w = gapi.client.request({ - path: h, - method: m, - params: { - uploadType: "multipart" - }, - headers: v, - body: y + }, y = o.encodeBase64(i), w = [ c, "Content-Type: application/json\r\n\r\n", JSON.stringify(d), c, "Content-Type: ", s, "\r\n", "Content-Transfer-Encoding: base64\r\n", "\r\n", y, u ].join(""); + p(l, function() { + var t = gapi.client.request({ + path: h, + method: v, + params: { + uploadType: "multipart" + }, + headers: b, + body: w + }); + t.execute(function(t) { + if (t && t.id) return g = t, g.content = i, m.chain(), void 0; + var n = t.error; + void 0 !== n && void 0 !== e && (404 === n.code ? n = 'File ID "' + e + '" not found on Google Drive.|removePublish' : 412 === n.code && (r.removeItem(l + ".gdrive.lastChangeId"), + n = 'Conflict on file ID "' + e + '". Please restart the synchronization.')), f(n, m); + }); }); - w.execute(function(t) { - if (t && t.id) return f = t, f.content = i, g.chain(), void 0; - var n = t.error; - void 0 !== n && void 0 !== e && (404 === n.code ? n = 'File ID "' + e + '" not found on Google Drive.|removePublish' : 412 === n.code && (r.removeItem(l + ".gdrive.lastChangeId"), - n = 'Conflict on file ID "' + e + '". Please restart the synchronization.')), p(n, g); - }); - }), g.onSuccess(function() { - u(void 0, f); - }), g.onError(function(e) { + }), m.onSuccess(function() { + u(void 0, g); + }), m.onError(function(e) { u(e); - }), g.enqueue(); - }, v.rename = function(e, t, n, i) { + }), m.enqueue(); + }, b.rename = function(e, t, n, i) { var o, r = new c(); d(r), h(r, "gdrive", n), r.onRun(function() { - var n = { + var i = { title: t - }, i = gapi.client.drive.files.patch({ - fileId: e, - resource: n - }); - i.execute(function(t) { - if (t && t.id) return o = t, r.chain(), void 0; - var n = t.error; - void 0 !== n && void 0 !== e && 404 === n.code && (n = 'File ID "' + e + '" not found on Google Drive.|removePublish'), - p(n, r); + }; + p(n, function() { + var t = gapi.client.drive.files.patch({ + fileId: e, + resource: i + }); + t.execute(function(t) { + if (t && t.id) return o = t, r.chain(), void 0; + var n = t.error; + void 0 !== n && void 0 !== e && 404 === n.code && (n = 'File ID "' + e + '" not found on Google Drive.|removePublish'), + f(n, r); + }); }); }), r.onSuccess(function() { i(void 0, o); }), r.onError(function(e) { i(e); }), r.enqueue(); - }, v.createRealtimeFile = function(e, t, n, i) { + }, b.createRealtimeFile = function(e, t, n, i) { var o, r = new c(); d(r), h(r, "gdrive", n), r.onRun(function() { - var n = { + var i = { title: t, mimeType: "application/vnd.google-apps.drive-sdk" }; - void 0 !== e && (n.parents = [ { + void 0 !== e && (i.parents = [ { kind: "drive#fileLink", id: e - } ]); - var i = gapi.client.drive.files.insert({ - resource: n - }); - i.execute(function(e) { - return e && e.id ? (o = e, r.chain(), void 0) : (p(e.error, r), void 0); + } ]), p(n, function() { + var e = gapi.client.drive.files.insert({ + resource: i + }); + e.execute(function(e) { + return e && e.id ? (o = e, r.chain(), void 0) : (f(e.error, r), void 0); + }); }); }), r.onSuccess(function() { i(void 0, o); }), r.onError(function(e) { i(e); }), r.enqueue(); - }, v.checkChanges = function(e, t, n) { + }, b.checkChanges = function(e, t, n) { var i = [], o = e || 0, r = new c(); d(r), h(r, "gdrive", t), r.onRun(function() { function e() { - var n; - n = void 0 === t ? gapi.client.drive.changes.list({ - startChangeId: o + 1 - }) : gapi.client.drive.changes.list({ - pageToken: t - }), n.execute(function(n) { - return n && n.largestChangeId ? (o = n.largestChangeId, t = n.nextPageToken, void 0 !== n.items && (i = i.concat(n.items)), - void 0 !== t ? r.chain(e) : r.chain(), void 0) : (p(n.error, r), void 0); + p(t, function() { + var t; + t = void 0 === n ? gapi.client.drive.changes.list({ + startChangeId: o + 1 + }) : gapi.client.drive.changes.list({ + pageToken: n + }), t.execute(function(t) { + return t && t.largestChangeId ? (o = t.largestChangeId, n = t.nextPageToken, void 0 !== t.items && (i = i.concat(t.items)), + void 0 !== n ? r.chain(e) : r.chain(), void 0) : (f(t.error, r), void 0); + }); }); } - var t; + var n; r.chain(e); }), r.onSuccess(function() { n(void 0, i, o); }), r.onError(function(e) { n(e); }), r.enqueue(); - }, v.downloadMetadata = function(e, i, o, r) { + }, b.downloadMetadata = function(e, i, o, r) { var s = [], a = new c(); d(a), r || h(a, "gdrive", i), a.onRun(function() { - function i() { + function o() { if (0 === e.length) return a.chain(), void 0; - var o = e[0], r = {}, l = gapi.auth.getToken(); - l && (r.Authorization = "Bearer " + l.access_token), t.ajax({ - url: "https://www.googleapis.com/drive/v2/files/" + o, - headers: r, + var r = e[0], l = {}, c = v[i]; + c && c.token && (l.Authorization = "Bearer " + c.token.access_token), t.ajax({ + url: "https://www.googleapis.com/drive/v2/files/" + r, + headers: l, data: { key: n.GOOGLE_API_KEY }, dataType: "json", timeout: n.AJAX_TIMEOUT }).done(function(t) { - s.push(t), e.shift(), a.chain(i); + s.push(t), e.shift(), a.chain(o); }).fail(function(e) { var t = { code: e.status, message: e.statusText }; - 404 === t.code && (t = 'File ID "' + o + '" not found on Google Drive.'), p(t, a); + 404 === t.code && (t = 'File ID "' + r + '" not found on Google Drive.'), f(t, a); }); } - a.chain(i); + a.chain(o); }), a.onSuccess(function() { o(void 0, s); }), a.onError(function(e) { o(e); }), a.enqueue(); - }, v.downloadContent = function(e, i, o, r) { + }, b.downloadContent = function(e, i, o, r) { var s = [], a = new c(); a.timeout = n.ASYNC_TASK_LONG_TIMEOUT, d(a), r || h(a, "gdrive", i), a.onRun(function() { - function i() { + function o() { if (0 === e.length) return a.chain(), void 0; - var o = e[0]; - s.push(o); - var r; - if ("drive#file" == o.kind ? r = o : "drive#change" == o.kind && (r = o.file), !r) return e.shift(), - a.chain(i), void 0; - if (0 === r.mimeType.indexOf("application/vnd.google-apps.drive-sdk")) return r.content = "", - r.isRealtime = !0, e.shift(), a.chain(i), void 0; - var l = {}, c = gapi.auth.getToken(); - c && (l.Authorization = "Bearer " + c.access_token), t.ajax({ - url: r.downloadUrl, - headers: l, + var r = e[0]; + s.push(r); + var l; + if ("drive#file" == r.kind ? l = r : "drive#change" == r.kind && (l = r.file), !l) return e.shift(), + a.chain(o), void 0; + if (0 === l.mimeType.indexOf("application/vnd.google-apps.drive-sdk")) return l.content = "", + l.isRealtime = !0, e.shift(), a.chain(o), void 0; + var c = {}, u = v[i]; + u && u.token && (c.Authorization = "Bearer " + u.token.access_token), t.ajax({ + url: l.downloadUrl, + headers: c, data: { key: n.GOOGLE_API_KEY }, dataType: "text", timeout: n.AJAX_TIMEOUT }).done(function(t) { - r.content = t, e.shift(), a.chain(i); + l.content = t, e.shift(), a.chain(o); }).fail(function(e) { var t = { code: e.status, message: e.statusText }; - p(t, a); + f(t, a); }); } - a.chain(i); + a.chain(o); }), a.onSuccess(function() { o(void 0, s); }), a.onError(function(e) { o(e); }), a.enqueue(); - }, v.loadRealtime = function(e, t, n, i, o) { + }, b.loadRealtime = function(e, t, n, i, o) { var r, s = new c(); d(s), h(s, "gdrive", n), s.onRun(function() { - gapi.drive.realtime.load(e, function(e) { + var i = v[n]; + gapi.auth.setToken(i.token), gapi.drive.realtime.load(e, function(e) { r = e, s.chain(); }, function(e) { var n = e.createString(t); @@ -29873,15 +29910,15 @@ function() { }), s.onError(function(e) { i(e); }), s.enqueue(); - }, v.uploadImg = function(e, i, o, r) { - var s, a = new c(); - d(a), h(a, "picasa", "google.picasa0"), a.onRun(function() { + }, b.uploadImg = function(e, i, o, r) { + var s, a = "google.picasa0", l = new c(); + d(l), h(l, "picasa", a), l.onRun(function() { var r = { Slug: e }; e.match(/.jpe?g$/i) ? r["Content-Type"] = "image/jpeg" : e.match(/.png$/i) ? r["Content-Type"] = "image/png" : e.match(/.gif$/i) && (r["Content-Type"] = "image/gif"); - var l = gapi.auth.getToken(); - l && (r.Authorization = "Bearer " + l.access_token), t.ajax({ + var c = v[a]; + c && c.token && (r.Authorization = "Bearer " + c.token.access_token), t.ajax({ url: n.PICASA_PROXY_URL + "upload/" + o, headers: r, data: i, @@ -29890,42 +29927,42 @@ function() { timeout: n.AJAX_TIMEOUT, type: "POST" }).done(function(e) { - s = e, a.chain(); + s = e, l.chain(); }).fail(function(e) { var t = { code: e.status, message: e.statusText }; - 200 == t.code && (t.message = e.responseText), p(t, a); + 200 == t.code && (t.message = e.responseText), f(t, l); }); - }), a.onSuccess(function() { + }), l.onSuccess(function() { r(void 0, s); - }), a.onError(function(e) { + }), l.onError(function(e) { r(e); - }), a.enqueue(); + }), l.enqueue(); }; - var w = !1; - return v.picker = function(e, i, r) { + var x = !1; + return b.picker = function(e, i, r) { function s() { void 0 !== a && (a.setVisible(!1), t(".modal-backdrop, .picker").remove()); } var a, l = [], u = new c(); u.timeout = n.ASYNC_TASK_LONG_TIMEOUT, d(u), ("doc" == i || "folder" == i) && h(u, "gdrive", r), - f(u), u.onRun(function() { - var e = new google.picker.PickerBuilder(); - e.setAppId(n.GOOGLE_DRIVE_APP_ID); - var r; - "doc" == i ? (r = new google.picker.DocsView(google.picker.ViewId.DOCS), r.setParent("root"), - r.setIncludeFolders(!0), r.setMimeTypes([ "text/x-markdown", "text/plain", "application/octet-stream", "application/vnd.google-apps.drive-sdk." + n.GOOGLE_DRIVE_APP_ID ].join(",")), - e.enableFeature(google.picker.Feature.NAV_HIDDEN), e.enableFeature(google.picker.Feature.MULTISELECT_ENABLED), - e.addView(r), e.setOAuthToken(gapi.auth.getToken().access_token)) : "folder" == i ? (r = new google.picker.DocsView(google.picker.ViewId.FOLDERS), - r.setParent("root"), r.setIncludeFolders(!0), r.setSelectFolderEnabled(!0), r.setMimeTypes("application/vnd.google-apps.folder"), - e.enableFeature(google.picker.Feature.NAV_HIDDEN), e.addView(r), e.setOAuthToken(gapi.auth.getToken().access_token)) : "img" == i && (r = new google.picker.PhotosView(), - r.setType("flat"), e.addView(r), r = new google.picker.PhotosView(), r.setType("ofuser"), - e.addView(r), e.addView(google.picker.ViewId.PHOTO_UPLOAD)), e.setCallback(function(e) { + g(u), u.onRun(function() { + var e = v[r], c = new google.picker.PickerBuilder(); + c.setAppId(n.GOOGLE_DRIVE_APP_ID); + var d; + "doc" == i ? (d = new google.picker.DocsView(google.picker.ViewId.DOCS), d.setParent("root"), + d.setIncludeFolders(!0), d.setMimeTypes([ "text/x-markdown", "text/plain", "application/octet-stream", "application/vnd.google-apps.drive-sdk." + n.GOOGLE_DRIVE_APP_ID ].join(",")), + c.enableFeature(google.picker.Feature.NAV_HIDDEN), c.enableFeature(google.picker.Feature.MULTISELECT_ENABLED), + c.addView(d), e && e.token && c.setOAuthToken(e.token.access_token)) : "folder" == i ? (d = new google.picker.DocsView(google.picker.ViewId.FOLDERS), + d.setParent("root"), d.setIncludeFolders(!0), d.setSelectFolderEnabled(!0), d.setMimeTypes("application/vnd.google-apps.folder"), + c.enableFeature(google.picker.Feature.NAV_HIDDEN), c.addView(d), e && e.token && c.setOAuthToken(e.token.access_token)) : "img" == i && (d = new google.picker.PhotosView(), + d.setType("flat"), c.addView(d), d = new google.picker.PhotosView(), d.setType("ofuser"), + c.addView(d), c.addView(google.picker.ViewId.PHOTO_UPLOAD)), c.setCallback(function(e) { (e.action == google.picker.Action.PICKED || e.action == google.picker.Action.CANCEL) && (e.action == google.picker.Action.PICKED && (l = e.docs), s(), u.chain()); - }), a = e.build(), t(o.createBackdrop()).click(function() { + }), a = c.build(), t(o.createBackdrop()).click(function() { s(), u.chain(); }), a.setVisible(!0); }), u.onSuccess(function() { @@ -29933,9 +29970,9 @@ function() { }), u.onError(function(t) { s(), e(t); }), u.enqueue(); - }, v.uploadBlogger = function(e, i, o, r, s, a, l, u, f) { - var g = new c(); - d(g), h(g, "blogger", "google.blogger0"), g.onRun(function() { + }, b.uploadBlogger = function(e, i, o, r, s, a, l, u, p) { + var g = "google.blogger0", m = new c(); + d(m), h(m, "blogger", g), m.onRun(function() { function c() { var e = "https://www.googleapis.com/blogger/v3/blogs/" + i + "/posts/", s = { kind: "blogger#post", @@ -29949,20 +29986,20 @@ function() { void 0 !== o && (e += o, s.id = o, a = "PUT"), t.ajax({ url: e, data: JSON.stringify(s), - headers: f, + headers: p, type: a, contentType: "application/json", dataType: "json", timeout: n.AJAX_TIMEOUT }).done(function(e) { - o = e.id, g.chain(d); + o = e.id, m.chain(d); }).fail(function(e) { var t = { code: e.status, message: e.statusText }; 404 === t.code && void 0 !== o && (t = "Post " + o + " not found on Blogger.|removePublish"), - p(t, g); + f(t, m); }); } function d() { @@ -29970,50 +30007,50 @@ function() { s ? e += "/revert" : (e += "/publish", a && (e += "?publishDate=" + a.toISOString())), t.ajax({ url: e, - headers: f, + headers: p, type: "POST", dataType: "json", timeout: n.AJAX_TIMEOUT }).done(function() { - g.chain(); + m.chain(); }).fail(function(e) { var t = { code: e.status, message: e.statusText }; - 404 === t.code && (t = "Post " + o + " not found on Blogger.|removePublish"), p(t, g); + 404 === t.code && (t = "Post " + o + " not found on Blogger.|removePublish"), f(t, m); }); } function h() { - return void 0 !== i ? (g.chain(c), void 0) : (t.ajax({ + return void 0 !== i ? (m.chain(c), void 0) : (t.ajax({ url: "https://www.googleapis.com/blogger/v3/blogs/byurl", data: { url: e }, - headers: f, + headers: p, dataType: "json", timeout: n.AJAX_TIMEOUT }).done(function(e) { - i = e.id, g.chain(c); + i = e.id, m.chain(c); }).fail(function(t) { var n = { code: t.status, message: t.statusText }; 404 === n.code && (n = 'Blog "' + e + '" not found on Blogger.|removePublish'), - p(n, g); + f(n, m); }), void 0); } - var f = {}, m = gapi.auth.getToken(); - m && (f.Authorization = "Bearer " + m.access_token), g.chain(h); - }), g.onSuccess(function() { - f(void 0, i, o); - }), g.onError(function(e) { - f(e); - }), g.enqueue(); + var p = {}, b = v[g]; + b && b.token && (p.Authorization = "Bearer " + b.token.access_token), m.chain(h); + }), m.onSuccess(function() { + p(void 0, i, o); + }), m.onError(function(e) { + p(e); + }), m.enqueue(); }, window.delayedFunction = void 0, window.runDelayedFunction = function() { void 0 !== window.delayedFunction && window.delayedFunction(); - }, v; + }, b; }), define("text!html/dialogExportGdrive.html", [], function() { return '\n'; }), define("providers/gdriveProviderBuilder", [ "jquery", "underscore", "constants", "utils", "storage", "logger", "classes/Provider", "settings", "eventMgr", "fileMgr", "helpers/googleHelper", "text!html/dialogExportGdrive.html" ], function(e, t, n, i, o, r, s, a, l, c, u, d) { @@ -30098,16 +30135,16 @@ function() { var t = e.syncAttributes, n = t.syncIndex, o = c.getFileFromSyncIndex(n); if (void 0 !== o) { var r = o.title; - if (e.deleted === !0) return l.onError('"' + r + '" has been removed from Google Drive.'), + if (e.deleted === !0) return l.onError('"' + r + '" has been removed from ' + p + "."), o.removeSyncLocation(t), l.onSyncRemoved(o, t), t.isRealtime === !0 && c.currentFile === o && y.stopRealtimeSync(), void 0; - var s = t.titleCRC != i.crc32(r), a = o.content, u = t.contentCRC != i.crc32(a), d = e.file, h = i.crc32(d.title), p = t.titleCRC != h, f = r != d.title, g = i.crc32(d.content), m = t.contentCRC != g, v = a != d.content; - (f === !0 && s === !0 && p === !0 || !t.isRealtime && v === !0 && u === !0 && m === !0) && (c.createFile(r + " (backup)", a), + var s = t.titleCRC != i.crc32(r), a = o.content, u = t.contentCRC != i.crc32(a), d = e.file, h = i.crc32(d.title), f = t.titleCRC != h, g = r != d.title, m = i.crc32(d.content), v = t.contentCRC != m, b = a != d.content; + (g === !0 && s === !0 && f === !0 || !t.isRealtime && b === !0 && u === !0 && v === !0) && (c.createFile(r + " (backup)", a), l.onMessage('Conflict detected on "' + r + '". A backup has been created locally.')), - f && p === !0 && (o.title = d.title, l.onTitleChanged(o), l.onMessage('"' + r + '" has been renamed to "' + d.title + '" on Google Drive.')), - !t.isRealtime && v && m === !0 && (o.content = d.content, l.onContentChanged(o), - l.onMessage('"' + d.title + '" has been updated from Google Drive.'), c.currentFile === o && c.selectFile()), - t.etag = d.etag, t.isRealtime || (t.contentCRC = g), t.titleCRC = h, i.storeAttributes(t); + g && f === !0 && (o.title = d.title, l.onTitleChanged(o), l.onMessage('"' + r + '" has been renamed to "' + d.title + '" on ' + p + ".")), + !t.isRealtime && b && v === !0 && (o.content = d.content, l.onContentChanged(o), + l.onMessage('"' + d.title + '" has been updated from ' + p + "."), c.currentFile === o && c.selectFile()), + t.etag = d.etag, t.isRealtime || (t.contentCRC = m), t.titleCRC = h, i.storeAttributes(t); } }), o[b + ".gdrive.lastChangeId"] = s, e(), void 0); }); @@ -30181,7 +30218,7 @@ function() { }); } }, function(t) { - console.error(t), "token_refresh_required" == t.type ? u.refreshGdriveToken(b) : "not_found" == t.type ? (l.onError('"' + e.title + '" has been removed from Google Drive.'), + console.error(t), "token_refresh_required" == t.type ? u.refreshGdriveToken(b) : "not_found" == t.type ? (l.onError('"' + e.title + '" has been removed from ' + p + "."), e.removeSyncLocation(n), l.onSyncRemoved(e, n), y.stopRealtimeSync()) : t.isFatal && (l.onError("An error has forced real time synchronization to stop."), y.stopRealtimeSync()); }); @@ -30191,33 +30228,35 @@ function() { void 0 !== E && (w.uiManager.buttons.undo.execute = x, w.uiManager.buttons.redo.execute = C, w.uiManager.setUndoRedoButtonStates = E, w.uiManager.setUndoRedoButtonStates()); }, y.isPublishEnabled = a.gdriveMultiAccount > f, l.addListener("onReady", function() { - e(".submenu-sync-" + h).toggle(a.gdriveMultiAccount > f), document.querySelector(".modal-upload-" + h).innerHTML = t.template(d, { + e(".submenu-sync-" + h).toggle(a.gdriveMultiAccount > f); + var r = document.querySelector(".modal-upload-" + h); + r && (r.innerHTML = t.template(d, { providerId: h, providerName: p - }), e(".export-" + h + "-choose-folder").click(function() { + })), e(".export-" + h + "-choose-folder").click(function() { u.picker(function(t, n) { t || 0 === n.length || (e(".modal-upload-" + h).modal(), i.setInputValue("#input-sync-export-" + h + "-parentid", n[0].id)); }, "folder", b); }); - var r = e("#input-sync-export-" + h + "-realtime"), s = e("#input-sync-export-" + h + "-fileid"); + var s = e("#input-sync-export-" + h + "-realtime"), y = e("#input-sync-export-" + h + "-fileid"); e("#input-sync-export-" + h + "-realtime").change(function() { - s.prop("disabled", r.prop("checked")); + y.prop("disabled", s.prop("checked")); }); - var y = i.retrieveIgnoreError(h + ".state"); - if (void 0 !== y && y.userId == o[b + ".userId"]) if (o.removeItem(h + ".state"), - "create" == y.action) u.upload(void 0, y.folderId, n.GDRIVE_DEFAULT_FILE_TITLE, a.defaultContent, void 0, void 0, b, function(e, t) { + var w = i.retrieveIgnoreError(h + ".state"); + if (void 0 !== w && w.userId == o[b + ".userId"]) if (o.removeItem(h + ".state"), + "create" == w.action) u.upload(void 0, w.folderId, n.GDRIVE_DEFAULT_FILE_TITLE, a.defaultContent, void 0, void 0, b, function(e, t) { if (!e) { var n = m(t.id, t.etag, t.content, t.title), i = {}; i[n.syncIndex] = n; var o = c.createFile(t.title, t.content, i); - c.selectFile(o), l.onMessage('"' + t.title + '" created successfully on Google Drive.'); + c.selectFile(o), l.onMessage('"' + t.title + '" created successfully on ' + p + "."); } - }); else if ("open" == y.action) { - var w = []; - t.each(y.ids, function(e) { + }); else if ("open" == w.action) { + var x = []; + t.each(w.ids, function(e) { var t = g(e), n = c.getFileFromSyncIndex(t); - void 0 !== n ? n !== c.currentFile && c.selectFile(n) : w.push(e); - }), v(w); + void 0 !== n ? n !== c.currentFile && c.selectFile(n) : x.push(e); + }), v(x); } }), y; }; @@ -30380,105 +30419,107 @@ function() { }); }); }), a; -}), define("helpers/githubHelper", [ "jquery", "constants", "core", "utils", "storage", "logger", "eventMgr", "classes/AsyncTask" ], function(e, t, n, i, o, r, s, a) { - function l(n) { +}), define("helpers/githubHelper", [ "jquery", "constants", "core", "utils", "storage", "logger", "settings", "eventMgr", "classes/AsyncTask" ], function(e, t, n, i, o, r, s, a, l) { + function c(n) { n.onRun(function() { - return f === !0 ? (d = !1, n.error(new Error("Operation not available in offline mode.|stopPublish")), - void 0) : d === !0 ? (n.chain(), void 0) : (e.ajax({ + return g === !0 ? (h = !1, n.error(new Error("Operation not available in offline mode.|stopPublish")), + void 0) : h === !0 ? (n.chain(), void 0) : (e.ajax({ url: "libs/github.js", dataType: "script", timeout: t.AJAX_TIMEOUT }).done(function() { - d = !0, n.chain(); + h = !0, n.chain(); }).fail(function(e) { var t = { error: e.status, message: e.statusText }; - u(t, n); + d(t, n); }), void 0); }); } - function c(r) { - var s, a; + function u(r) { + var a, l; r.onRun(function() { - function l() { + function c() { n.redirectConfirm("You are being redirected to GitHub authorization page.", function() { - r.chain(c); + r.chain(u); }, function() { r.error(new Error("Operation canceled.")); }); } - function c() { - o.removeItem("githubCode"), s = i.popupWindow("html/github-oauth-client.html?client_id=" + t.GITHUB_CLIENT_ID, "stackedit-github-oauth", 960, 600), - s.focus(), a = setInterval(function() { - if (s.closed === !0) { - if (clearInterval(a), s = void 0, a = void 0, f = o.githubCode, void 0 === f) return r.error(new Error(p)), + function u() { + o.removeItem("githubCode"); + var e = s.githubFullAccess ? "repo,gist" : "public_repo,gist"; + a = i.popupWindow("html/github-oauth-client.html?client_id=" + t.GITHUB_CLIENT_ID + "&scope=" + e, "stackedit-github-oauth", 960, 600), + a.focus(), l = setInterval(function() { + if (a.closed === !0) { + if (clearInterval(l), a = void 0, l = void 0, g = o.githubCode, void 0 === g) return r.error(new Error(f)), void 0; - o.removeItem("githubCode"), r.chain(u); + o.removeItem("githubCode"), r.chain(d); } }, 500); } - function u() { - e.getJSON(t.GATEKEEPER_URL + "authenticate/" + f, function(e) { - void 0 !== e.token ? (d = e.token, o.githubToken = d, h = new Github({ - token: d, + function d() { + e.getJSON(t.GATEKEEPER_URL + "authenticate/" + g, function(e) { + void 0 !== e.token ? (h = e.token, o.githubToken = h, p = new Github({ + token: h, auth: "oauth" - }), r.chain()) : r.error(new Error(p)); + }), r.chain()) : r.error(new Error(f)); }); } - if (void 0 !== h) return r.chain(), void 0; - var d = o.githubToken; - if (void 0 !== d) return h = new Github({ - token: d, + if (void 0 !== p) return r.chain(), void 0; + var h = o.githubToken; + if (void 0 !== h) return p = new Github({ + token: h, auth: "oauth" }), r.chain(), void 0; - var p = "Failed to retrieve a token from GitHub."; + var f = "Failed to retrieve a token from GitHub."; r.timeout = t.ASYNC_TASK_LONG_TIMEOUT; - var f; - r.chain(l); + var g; + r.chain(c); }), r.onError(function() { - void 0 !== a && clearInterval(a), void 0 !== s && s.close(); + void 0 !== l && clearInterval(l), void 0 !== a && a.close(); }); } - function u(e, t) { + function d(e, t) { var i; if (e) if (r.error(e), "string" == typeof e) i = e; else { - if (i = "Could not publish on GitHub.", 401 === e.error || 403 === e.error) return h = void 0, + if (i = "Could not publish on GitHub.", 401 === e.error || 403 === e.error) return p = void 0, o.removeItem("githubToken"), i = "Access to GitHub account is not authorized.", t.retry(new Error(i), 1), void 0; - e.error <= 0 && (d = !1, h = void 0, n.setOffline(), i = "|stopPublish"); + e.error <= 0 && (h = !1, p = void 0, n.setOffline(), i = "|stopPublish"); } t.error(new Error(i)); } - var d, h, p = {}, f = !1; - return s.addListener("onOfflineChanged", function(e) { - f = e; - }), p.upload = function(e, t, n, i, o, r, s) { - var d = new a(); - l(d), c(d), d.onRun(function() { + var h, p, f = {}, g = !1; + return a.addListener("onOfflineChanged", function(e) { + g = e; + }), f.upload = function(e, t, n, i, o, r, s) { + var a = new l(); + c(a), u(a), a.onRun(function() { function s() { - var e = h.getUser(); + var e = p.getUser(); e.show(void 0, function(e, n) { - return e ? (u(e, d), void 0) : (t = n.login, d.chain(a), void 0); + return e ? (d(e, a), void 0) : (t = n.login, a.chain(l), void 0); }); } - function a() { - var s = h.getRepo(t, e); + function l() { + var s = p.getRepo(t, e); s.write(n, i, o, r, function(e) { - return e ? (u(e, d), void 0) : (d.chain(), void 0); + return e ? (d(e, a), void 0) : (a.chain(), void 0); }); } - t ? d.chain(a) : d.chain(s); - }), d.onSuccess(function() { + t ? a.chain(l) : a.chain(s); + }), a.onSuccess(function() { s(); - }), d.onError(function(e) { + }), a.onError(function(e) { s(e); - }), d.enqueue(); - }, p.uploadGist = function(e, t, n, i, o, r) { - var s = new a(); - l(s), c(s), s.onRun(function() { - var r = h.getGist(e), a = {}; + }), a.enqueue(); + }, f.uploadGist = function(e, t, n, i, o, r) { + var s = new l(); + c(s), u(s), s.onRun(function() { + var r = p.getGist(e), a = {}; a[t] = { content: o }; @@ -30489,16 +30530,16 @@ function() { files: a }, function(t, n) { return t ? (404 === t.error && void 0 !== e && (t = "Gist " + e + " not found on GitHub.|removePublish"), - u(t, s), void 0) : (e = n.id, s.chain(), void 0); + d(t, s), void 0) : (e = n.id, s.chain(), void 0); }); }), s.onSuccess(function() { r(void 0, e); }), s.onError(function(e) { r(e); }), s.enqueue(); - }, p.downloadGist = function(e, t, n) { - var i = new a(!0); - l(i); + }, f.downloadGist = function(e, t, n) { + var i = new l(!0); + c(i); var o, r; i.onRun(function() { var n = new Github({}), s = n.getGist(e); @@ -30514,7 +30555,7 @@ function() { }), i.onError(function(e) { n(e); }), i.enqueue(); - }, p; + }, f; }), define("providers/gistProvider", [ "utils", "classes/Provider", "helpers/githubHelper" ], function(e, t, n) { var i = new t("gist", "Gist"); return i.publishPreferencesInputIds = [ "gist-public" ], i.sharingAttributes = [ "gistId", "filename" ], diff --git a/public/res-min/themes/default.css b/public/res-min/themes/default.css index 51c936da..c79aba3d 100644 --- a/public/res-min/themes/default.css +++ b/public/res-min/themes/default.css @@ -1493,28 +1493,28 @@ a.list-group-item:hover,a.list-group-item:focus{color:#036;border-top-color:rgba .ui-layout-resizer-north{background-color:#e4ebf1;border-bottom:1px solid rgba(0,128,255,0.1)} .resizer-decorator{position:absolute;display:block !important}.ui-layout-resizer-east .resizer-decorator{width:35px;height:100%;border-left:1px solid rgba(0,128,255,0.06)} .ui-layout-resizer-south .resizer-decorator{height:35px;width:100%;border-top:1px solid rgba(0,128,255,0.06)} -.ace_editor{color:#414d58} +.ace_editor{color:#384654} .ace-tm{background-color:#fff}.ace-tm .ace_text-input{box-sizing:initial} .ace-tm .ace_marker-layer .ace_active-line{background-color:rgba(89,128,166,0.05)} .ace-tm .ace_cursor{color:#243342} .ace-tm .ace_print-margin{background-color:rgba(89,128,166,0.05)} -.ace-tm .ace_markup.ace_heading{color:#161a1d;font-weight:bold} -.ace-tm .ace_markup.ace_list{color:#6c8093} -.ace-tm .ace_constant.ace_language{color:rgba(108,128,147,0.75);font-weight:normal} -.ace-tm .ace_meta.ace_tag{color:#414d58;font-style:italic;font-weight:bold;background-color:rgba(102,128,153,0.075)} -.ace-tm .ace_keyword.ace_operator{color:#414d58;background-color:transparent} -.ace-tm .ace_keyword{color:#414d58;background-color:rgba(102,128,153,0.075);font-weight:bold} -.ace-tm .ace_string{color:#414d58;font-style:italic;background-color:rgba(102,128,153,0.075)} +.ace-tm .ace_markup.ace_heading{color:#1a2026;font-weight:bold} +.ace-tm .ace_markup.ace_list{color:#576c82} +.ace-tm .ace_constant.ace_language{color:rgba(87,108,130,0.6);font-weight:normal} +.ace-tm .ace_meta.ace_tag{color:#384654;font-style:italic;font-weight:bold;background-color:rgba(102,128,153,0.075)} +.ace-tm .ace_keyword.ace_operator{color:#384654;background-color:transparent} +.ace-tm .ace_keyword{color:#384654;background-color:rgba(102,128,153,0.075);font-weight:bold} +.ace-tm .ace_string{color:#384654;font-style:italic;background-color:rgba(102,128,153,0.075)} .ace-tm .ace_invalid{color:inherit;background:inherit} -.ace-tm .ace_strong{color:#414d58;font-weight:bold} -.ace-tm .ace_emphasis{color:#161a1d;font-style:italic} -.ace-tm .ace_blockquote{color:#6c8093} -.ace-tm .ace_code{color:#161a1d;background-color:rgba(102,128,153,0.075)} -.ace-tm .ace_code_block{color:#161a1d} -.ace-tm .ace_link{color:#6c8093;background-color:rgba(102,128,153,0.075)} -.ace-tm .ace_description{color:#6c8093} -.ace-tm .ace_constant{color:#414d58} -.ace-tm .ace_comment{color:rgba(108,128,147,0.75);font-style:italic} +.ace-tm .ace_strong{color:#384654;font-weight:bold} +.ace-tm .ace_emphasis{color:#1a2026;font-style:italic} +.ace-tm .ace_blockquote{color:#576c82} +.ace-tm .ace_code{color:#1a2026;background-color:rgba(102,128,153,0.075)} +.ace-tm .ace_code_block{color:#1a2026} +.ace-tm .ace_link{color:rgba(87,108,130,0.6)} +.ace-tm .ace_description{color:#576c82} +.ace-tm .ace_constant{color:#384654} +.ace-tm .ace_comment{color:rgba(87,108,130,0.6);font-style:italic} .ace-tm .ace_marker-layer .misspelled{position:absolute;z-index:-2;border-bottom:1px dotted red;margin-bottom:-1px} .ace_search{background-color:#f6f7f9;border:1px solid #ebf0f4;border-top:0;padding:10px 15px 5px;font-family:'Open Sans',"Trebuchet MS",Helvetica,sans-serif;min-width:318px}.ace_search .ace_search_form,.ace_search .ace_replace_form{border-color:#dee6ed;margin-bottom:10px} .ace_search .ace_search_field{width:185px} @@ -1524,7 +1524,7 @@ a.list-group-item:hover,a.list-group-item:focus{color:#036;border-top-color:rgba .ace_search .ace_replacebtn{padding:0 4px} .ace_search .ace_searchbtn_close{background:transparent;margin:0;font-size:21px;font-weight:bold;text-shadow:0 1px 0 #fff;opacity:.3;filter:alpha(opacity=30)}.ace_search .ace_searchbtn_close:before{content:'\d7'} .ace_search .ace_searchbtn_close:hover,.ace_search .ace_searchbtn_close:focus{color:#162029;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50);background:transparent} -#wmd-input{border-radius:0;color:#414d58;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none;padding:0 12px}div#wmd-input{padding:0} +#wmd-input{border-radius:0;color:#384654;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none;padding:0 12px}div#wmd-input{padding:0} .textarea-helper{top:-100px;height:1px;padding:0 12px;font-size:14px;line-height:1.428571429;position:absolute;overflow:auto;white-space:pre-wrap;word-wrap:break-word} .preview-container{overflow:auto;background-color:#f6f7f9} .wmd-prompt-background{display:none} diff --git a/public/res-min/themes/gray.css b/public/res-min/themes/gray.css index 3e4f23d7..39002110 100644 --- a/public/res-min/themes/gray.css +++ b/public/res-min/themes/gray.css @@ -1493,28 +1493,28 @@ a.list-group-item:hover,a.list-group-item:focus{color:#343434;border-top-color:r .ui-layout-resizer-north{background-color:#ebebeb;border-bottom:1px solid rgba(128,128,128,0.1)} .resizer-decorator{position:absolute;display:block !important}.ui-layout-resizer-east .resizer-decorator{width:35px;height:100%;border-left:1px solid rgba(128,128,128,0.06)} .ui-layout-resizer-south .resizer-decorator{height:35px;width:100%;border-top:1px solid rgba(128,128,128,0.06)} -.ace_editor{color:#4d4d4d} +.ace_editor{color:#474747} .ace-tm{background-color:#fff}.ace-tm .ace_text-input{box-sizing:initial} .ace-tm .ace_marker-layer .ace_active-line{background-color:rgba(128,128,128,0.05)} .ace-tm .ace_cursor{color:#343434} .ace-tm .ace_print-margin{background-color:rgba(128,128,128,0.05)} -.ace-tm .ace_markup.ace_heading{color:#1a1a1a;font-weight:bold} -.ace-tm .ace_markup.ace_list{color:#808080} -.ace-tm .ace_constant.ace_language{color:rgba(128,128,128,0.75);font-weight:normal} -.ace-tm .ace_meta.ace_tag{color:#4d4d4d;font-style:italic;font-weight:bold;background-color:rgba(128,128,128,0.075)} -.ace-tm .ace_keyword.ace_operator{color:#4d4d4d;background-color:transparent} -.ace-tm .ace_keyword{color:#4d4d4d;background-color:rgba(128,128,128,0.075);font-weight:bold} -.ace-tm .ace_string{color:#4d4d4d;font-style:italic;background-color:rgba(128,128,128,0.075)} +.ace-tm .ace_markup.ace_heading{color:#202020;font-weight:bold} +.ace-tm .ace_markup.ace_list{color:#6d6d6d} +.ace-tm .ace_constant.ace_language{color:rgba(109,109,109,0.6);font-weight:normal} +.ace-tm .ace_meta.ace_tag{color:#474747;font-style:italic;font-weight:bold;background-color:rgba(128,128,128,0.075)} +.ace-tm .ace_keyword.ace_operator{color:#474747;background-color:transparent} +.ace-tm .ace_keyword{color:#474747;background-color:rgba(128,128,128,0.075);font-weight:bold} +.ace-tm .ace_string{color:#474747;font-style:italic;background-color:rgba(128,128,128,0.075)} .ace-tm .ace_invalid{color:inherit;background:inherit} -.ace-tm .ace_strong{color:#4d4d4d;font-weight:bold} -.ace-tm .ace_emphasis{color:#1a1a1a;font-style:italic} -.ace-tm .ace_blockquote{color:#808080} -.ace-tm .ace_code{color:#1a1a1a;background-color:rgba(128,128,128,0.075)} -.ace-tm .ace_code_block{color:#1a1a1a} -.ace-tm .ace_link{color:#808080;background-color:rgba(128,128,128,0.075)} -.ace-tm .ace_description{color:#808080} -.ace-tm .ace_constant{color:#4d4d4d} -.ace-tm .ace_comment{color:rgba(128,128,128,0.75);font-style:italic} +.ace-tm .ace_strong{color:#474747;font-weight:bold} +.ace-tm .ace_emphasis{color:#202020;font-style:italic} +.ace-tm .ace_blockquote{color:#6d6d6d} +.ace-tm .ace_code{color:#202020;background-color:rgba(128,128,128,0.075)} +.ace-tm .ace_code_block{color:#202020} +.ace-tm .ace_link{color:rgba(109,109,109,0.6)} +.ace-tm .ace_description{color:#6d6d6d} +.ace-tm .ace_constant{color:#474747} +.ace-tm .ace_comment{color:rgba(109,109,109,0.6);font-style:italic} .ace-tm .ace_marker-layer .misspelled{position:absolute;z-index:-2;border-bottom:1px dotted red;margin-bottom:-1px} .ace_search{background-color:#f8f8f8;border:1px solid #f0f0f0;border-top:0;padding:10px 15px 5px;font-family:'Open Sans',"Trebuchet MS",Helvetica,sans-serif;min-width:318px}.ace_search .ace_search_form,.ace_search .ace_replace_form{border-color:#e6e6e6;margin-bottom:10px} .ace_search .ace_search_field{width:185px} @@ -1524,7 +1524,7 @@ a.list-group-item:hover,a.list-group-item:focus{color:#343434;border-top-color:r .ace_search .ace_replacebtn{padding:0 4px} .ace_search .ace_searchbtn_close{background:transparent;margin:0;font-size:21px;font-weight:bold;text-shadow:0 1px 0 #fff;opacity:.3;filter:alpha(opacity=30)}.ace_search .ace_searchbtn_close:before{content:'\d7'} .ace_search .ace_searchbtn_close:hover,.ace_search .ace_searchbtn_close:focus{color:#202020;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50);background:transparent} -#wmd-input{border-radius:0;color:#4d4d4d;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none;padding:0 12px}div#wmd-input{padding:0} +#wmd-input{border-radius:0;color:#474747;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none;padding:0 12px}div#wmd-input{padding:0} .textarea-helper{top:-100px;height:1px;padding:0 12px;font-size:14px;line-height:1.428571429;position:absolute;overflow:auto;white-space:pre-wrap;word-wrap:break-word} .preview-container{overflow:auto;background-color:#f8f8f8} .wmd-prompt-background{display:none} diff --git a/public/res-min/themes/night.css b/public/res-min/themes/night.css index e3d097d5..2c7c9fca 100644 --- a/public/res-min/themes/night.css +++ b/public/res-min/themes/night.css @@ -1500,7 +1500,7 @@ a.list-group-item:hover,a.list-group-item:focus{color:#b3b3b3;border-top-color:r .ace-tm .ace_print-margin{background-color:rgba(255,255,255,0.05)} .ace-tm .ace_markup.ace_heading{color:#fff;font-weight:bold} .ace-tm .ace_markup.ace_list{color:#9f9f9f} -.ace-tm .ace_constant.ace_language{color:rgba(159,159,159,0.75);font-weight:normal} +.ace-tm .ace_constant.ace_language{color:rgba(159,159,159,0.6);font-weight:normal} .ace-tm .ace_meta.ace_tag{color:#dfdfdf;font-style:italic;font-weight:bold;background-color:rgba(255,255,255,0.1)} .ace-tm .ace_keyword.ace_operator{color:#dfdfdf;background-color:transparent} .ace-tm .ace_keyword{color:#dfdfdf;background-color:rgba(255,255,255,0.1);font-weight:bold} @@ -1511,10 +1511,10 @@ a.list-group-item:hover,a.list-group-item:focus{color:#b3b3b3;border-top-color:r .ace-tm .ace_blockquote{color:#9f9f9f} .ace-tm .ace_code{color:#fff;background-color:rgba(255,255,255,0.1)} .ace-tm .ace_code_block{color:#fff} -.ace-tm .ace_link{color:#9f9f9f;background-color:rgba(255,255,255,0.1)} +.ace-tm .ace_link{color:rgba(159,159,159,0.6)} .ace-tm .ace_description{color:#9f9f9f} .ace-tm .ace_constant{color:#dfdfdf} -.ace-tm .ace_comment{color:rgba(159,159,159,0.75);font-style:italic} +.ace-tm .ace_comment{color:rgba(159,159,159,0.6);font-style:italic} .ace-tm .ace_marker-layer .misspelled{position:absolute;z-index:-2;border-bottom:1px dotted red;margin-bottom:-1px} .ace_search{background-color:#232323;border:1px solid #404040;border-top:0;padding:10px 15px 5px;font-family:'Open Sans',"Trebuchet MS",Helvetica,sans-serif;min-width:318px}.ace_search .ace_search_form,.ace_search .ace_replace_form{border-color:#444;margin-bottom:10px} .ace_search .ace_search_field{width:185px} diff --git a/public/res-min/themes/school.css b/public/res-min/themes/school.css index 61ae94fa..9cd38a11 100644 --- a/public/res-min/themes/school.css +++ b/public/res-min/themes/school.css @@ -38,7 +38,7 @@ textarea{overflow:auto;vertical-align:top} table{border-collapse:collapse;border-spacing:0} @media print{*{text-shadow:none !important;color:#000 !important;background:transparent !important;box-shadow:none !important} a,a:visited{text-decoration:underline} a[href]:after{content:" (" attr(href) ")"} abbr[title]:after{content:" (" attr(title) ")"} .ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""} pre,blockquote{border:1px solid #999;page-break-inside:avoid} thead{display:table-header-group} tr,img{page-break-inside:avoid} img{max-width:100% !important} @page {margin:2cm .5cm}p,h2,h3{orphans:3;widows:3} h2,h3{page-break-after:avoid} .navbar{display:none} .table td,.table th{background-color:#fff !important} .btn>.caret,.dropup>.btn>.caret{border-top-color:#000 !important} .label{border:1px solid #000} .table{border-collapse:collapse !important} .table-bordered th,.table-bordered td{border:1px solid #ddd !important}}*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box} html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)} -body{font-family:'Open Sans',"Trebuchet MS",Helvetica,sans-serif;font-size:14px;line-height:1.428571429;color:#112130;background-color:#f5f3f2} +body{font-family:'Open Sans',"Trebuchet MS",Helvetica,sans-serif;font-size:14px;line-height:1.428571429;color:#112130;background-color:#f5f4f2} input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit} button,input,select[multiple],textarea{background-image:none} a{color:#2080df;text-decoration:none}a:hover,a:focus{color:#165a9c;text-decoration:underline} @@ -46,9 +46,9 @@ a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outli img{vertical-align:middle} .img-responsive{display:block;max-width:100%;height:auto} .img-rounded{border-radius:6px} -.img-thumbnail{padding:4px;line-height:1.428571429;background-color:#f5f3f2;border:1px solid #ddd;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-thumbnail{padding:4px;line-height:1.428571429;background-color:#f5f4f2;border:1px solid #ddd;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 rgba(143,121,104,0.1)} +hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid rgba(143,134,104,0.1)} .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}@media (min-width:768px){.lead{font-size:21px}} @@ -75,7 +75,7 @@ h6,.h6{font-size:12px} h1 small,.h1 small{font-size:24px} h2 small,.h2 small{font-size:18px} h3 small,.h3 small,h4 small,.h4 small{font-size:14px} -.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #f5f3f2} +.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #f5f4f2} ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0} .list-unstyled{padding-left:0;list-style:none} .list-inline{padding-left:0;list-style:none}.list-inline>li{display:inline-block;padding-left:5px;padding-right:5px} @@ -85,17 +85,17 @@ dt{font-weight:bold} dd{margin-left:0} @media (min-width:768px){.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} .dl-horizontal dd{margin-left:180px}.dl-horizontal dd:before,.dl-horizontal dd:after{content:" ";display:table;} .dl-horizontal dd:after{clear:both} .dl-horizontal dd:before,.dl-horizontal dd:after{content:" ";display:table;} .dl-horizontal dd:after{clear:both}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999} abbr.initialism{font-size:90%;text-transform:uppercase} -blockquote{padding:10px 20px;margin:0 0 20px;border-left:5px solid rgba(143,121,104,0.075)}blockquote p{font-size:17.5px;font-weight:300;line-height:1.25} +blockquote{padding:10px 20px;margin:0 0 20px;border-left:5px solid rgba(143,134,104,0.075)}blockquote p{font-size:17.5px;font-weight:300;line-height:1.25} blockquote p:last-child{margin-bottom:0} blockquote small{display:block;line-height:1.428571429;color:#999}blockquote small:before{content:'\2014 \00A0'} -blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid rgba(143,121,104,0.075);border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right} +blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid rgba(143,134,104,0.075);border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right} blockquote.pull-right small:before{content:''} 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:#112130;background-color:rgba(143,121,104,0.075);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:#333;background-color:rgba(143,121,104,0.075);border:1px solid #dfdfdf;border-radius:4px}pre.prettyprint{margin-bottom:20px} +code{padding:2px 4px;font-size:90%;color:#112130;background-color:rgba(143,134,104,0.075);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:#333;background-color:rgba(143,134,104,0.075);border:1px solid #dfdfdf;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} .pre-scrollable{max-height:340px;overflow-y:scroll} .container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}.container:before,.container:after{content:" ";display:table;} @@ -126,7 +126,7 @@ th{text-align:left} .table thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd} .table caption+thead tr:first-child th,.table colgroup+thead tr:first-child th,.table thead:first-child tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child td{border-top:0} .table tbody+tbody{border-top:2px solid #ddd} -.table .table{background-color:#f5f3f2} +.table .table{background-color:#f5f4f2} .table-condensed thead>tr>th,.table-condensed tbody>tr>th,.table-condensed tfoot>tr>th,.table-condensed thead>tr>td,.table-condensed tbody>tr>td,.table-condensed tfoot>tr>td{padding:5px} .table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd} .table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px} @@ -156,8 +156,8 @@ input[type="number"]::-webkit-outer-spin-button,input[type="number"]::-webkit-in .form-control:-ms-input-placeholder{color:#c1d6e9} .form-control::-webkit-input-placeholder{color:#c1d6e9} .form-control{display:block;width:100%;height:38px;padding:6px 12px;font-size:14px;line-height:1.428571429;color:#32638e;vertical-align:middle;background-color:#fff;border:1px solid #dfdfdf;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6)} -.form-control:focus{border-color:#dfdfdf;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 12px rgba(143, 121, 104, 0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 12px rgba(143, 121, 104, 0.6)} -.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#f5f3f2} +.form-control:focus{border-color:#dfdfdf;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 12px rgba(143, 134, 104, 0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 12px rgba(143, 134, 104, 0.6)} +.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#f5f4f2} textarea.form-control{height:auto} .form-group{margin-bottom:15px} .radio,.checkbox{display:block;min-height:20px;margin-top:10px;margin-bottom:10px;padding-left:20px;vertical-align:middle}.radio label,.checkbox label{display:inline;margin-bottom:0;font-weight:normal;cursor:pointer} @@ -207,7 +207,7 @@ textarea.input-lg{height:auto} .btn-success{color:#eee;background-color:rgba(0,0,0,0);border-color:rgba(0,0,0,0)}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#eee;background-color:rgba(0,0,0,0);border-color:rgba(0,0,0,0)} .btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none} .btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:rgba(0,0,0,0);border-color:rgba(0,0,0,0)} -.btn-info{color:rgba(143,121,104,0.35);background-color:rgba(0,0,0,0);border-color:rgba(0,0,0,0)}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:rgba(143,121,104,0.35);background-color:rgba(0,0,0,0);border-color:rgba(0,0,0,0)} +.btn-info{color:rgba(143,134,104,0.35);background-color:rgba(0,0,0,0);border-color:rgba(0,0,0,0)}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:rgba(143,134,104,0.35);background-color:rgba(0,0,0,0);border-color:rgba(0,0,0,0)} .btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none} .btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:rgba(0,0,0,0);border-color:rgba(0,0,0,0)} .btn-link{color:#2080df;font-weight:normal;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none} @@ -430,7 +430,7 @@ input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button" .dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:14px;background-color:#fff;border:1px solid #ccc;border:1px solid #dfdfdf;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto} .dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#dfdfdf} .dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.428571429;color:#112130;white-space:nowrap} -.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{text-decoration:none;color:#393939;background-color:rgba(143,121,104,0.04)} +.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{text-decoration:none;color:#393939;background-color:rgba(143,134,104,0.04)} .dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;outline:0;background-color:#428bca} .dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#c1d6e9} .dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);cursor:not-allowed} @@ -494,7 +494,7 @@ textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto} .input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0} .input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle} -.input-group-addon{padding:6px 12px;font-size:14px;font-weight:normal;line-height:1;text-align:center;background-color:#f5f3f2;border:1px solid #dfdfdf;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px} +.input-group-addon{padding:6px 12px;font-size:14px;font-weight:normal;line-height:1;text-align:center;background-color:#f5f4f2;border:1px solid #dfdfdf;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px} .input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px} .input-group-addon input[type="radio"],.input-group-addon input[type="checkbox"]{margin-top:0} .input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-top-right-radius:0} @@ -508,16 +508,16 @@ textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon .nav:after{clear:both} .nav:before,.nav:after{content:" ";display:table;} .nav:after{clear:both} -.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:rgba(143,121,104,0.04)} +.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:rgba(143,134,104,0.04)} .nav>li.disabled>a{color:#c1d6e9}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#c1d6e9;text-decoration:none;background-color:transparent;cursor:not-allowed} -.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:rgba(143,121,104,0.04);border-color:#2080df} +.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:rgba(143,134,104,0.04);border-color:#2080df} .nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5} .nav>li>a>img{max-width:none} .nav-tabs{border-bottom:1px solid rgba(0,0,0,0)}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.428571429;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:rgba(0,0,0,0) rgba(0,0,0,0) rgba(0,0,0,0)} -.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;background-color:#f5f3f2;border:1px solid #ddd;border-bottom-color:transparent;cursor:default} +.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;background-color:#f5f4f2;border:1px solid #ddd;border-bottom-color:transparent;cursor:default} .nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{text-align:center} @media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}}.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;margin-right:0} -.nav-tabs.nav-justified>.active>a{border-bottom-color:#f5f3f2} +.nav-tabs.nav-justified>.active>a{border-bottom-color:#f5f4f2} .nav-pills>li{float:left}.nav-pills>li>a{border-radius:5px} .nav-pills>li+li{margin-left:2px} .nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca} @@ -525,7 +525,7 @@ textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon .nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{text-align:center} @media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}} .nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;margin-right:0} -.nav-tabs-justified>.active>a{border-bottom-color:#f5f3f2} +.nav-tabs-justified>.active>a{border-bottom-color:#f5f4f2} .tabbable:before,.tabbable:after{content:" ";display:table;} .tabbable:after{clear:both} .tabbable:before,.tabbable:after{content:" ";display:table;} @@ -616,7 +616,7 @@ textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon .pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;line-height:1.428571429;text-decoration:none;background-color:#fff;border:1px solid #ddd;margin-left:-1px} .pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px} .pagination>li:last-child>a,.pagination>li:last-child>span{border-bottom-right-radius:4px;border-top-right-radius:4px} -.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{background-color:#f5f3f2} +.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{background-color:#f5f4f2} .pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca;cursor:default} .pagination>.disabled>span,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;background-color:#fff;border-color:#ddd;cursor:not-allowed} .pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px} @@ -630,7 +630,7 @@ textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon .pager:before,.pager:after{content:" ";display:table;} .pager:after{clear:both} .pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px} -.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#f5f3f2} +.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#f5f4f2} .pager .next>a,.pager .next>span{float:right} .pager .previous>a,.pager .previous>span{float:left} .pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;background-color:#fff;cursor:not-allowed} @@ -647,11 +647,11 @@ a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer} .btn .badge{position:relative;top:-1px} a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#2080df;background-color:#fff} .nav-pills>li>a>.badge{margin-left:3px} -.jumbotron{padding:30px;margin-bottom:30px;font-size:21px;font-weight:200;line-height:2.1428571435;color:inherit;background-color:#f5f3f2}.jumbotron h1{line-height:1;color:inherit} +.jumbotron{padding:30px;margin-bottom:30px;font-size:21px;font-weight:200;line-height:2.1428571435;color:inherit;background-color:#f5f4f2}.jumbotron h1{line-height:1;color:inherit} .jumbotron p{line-height:1.4} .container .jumbotron{border-radius:6px} @media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron{padding-left:60px;padding-right:60px} .jumbotron h1{font-size:63px}} -.thumbnail{padding:4px;line-height:1.428571429;background-color:#f5f3f2;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto;display:block}.thumbnail>img{height:auto;display:block;max-width:100%;height:auto} +.thumbnail{padding:4px;line-height:1.428571429;background-color:#f5f4f2;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto;display:block}.thumbnail>img{height:auto;display:block;max-width:100%;height:auto} a.thumbnail:hover,a.thumbnail:focus{border-color:#2080df} .thumbnail>img{margin-left:auto;margin-right:auto} .thumbnail .caption{padding:9px;color:#112130} @@ -685,12 +685,12 @@ a.thumbnail:hover,a.thumbnail:focus{border-color:#2080df} .media>.pull-right{margin-left:10px} .media-list{padding-left:0;list-style:none} .list-group{margin-bottom:20px;padding-left:0} -.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#f5f3f2;border:1px solid rgba(0,0,0,0)}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px} +.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#f5f4f2;border:1px solid rgba(0,0,0,0)}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px} .list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px} .list-group-item>.badge{float:right} .list-group-item>.badge+.badge{margin-right:5px} a.list-group-item{color:#112130}a.list-group-item .list-group-item-heading{color:#333} -a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:rgba(143,121,104,0.04)} +a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:rgba(143,134,104,0.04)} .list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{z-index:2;color:#393939;background-color:#e4e4e4;border-color:rgba(121,121,121,0.05)}.list-group-item.active .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading{color:inherit} .list-group-item.active .list-group-item-text,.list-group-item.active:hover .list-group-item-text,.list-group-item.active:focus .list-group-item-text{color:#fff} .list-group-item-heading{margin-top:0;margin-bottom:5px} @@ -761,7 +761,7 @@ button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-ap .tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000} .tooltip.bottom-left .tooltip-arrow{top:0;left:5px;border-width:0 5px 5px;border-bottom-color:#000} .tooltip.bottom-right .tooltip-arrow{top:0;right:5px;border-width:0 5px 5px;border-bottom-color:#000} -.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;background-color:#f1eeec;background-clip:padding-box;border:1px solid #ccc;border:1px solid #dfdfdf;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);white-space:normal}.popover.top{margin-top:-10px} +.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;background-color:#f1f0ec;background-clip:padding-box;border:1px solid #ccc;border:1px solid #dfdfdf;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);white-space:normal}.popover.top{margin-top:-10px} .popover.right{margin-left:10px} .popover.bottom{margin-top:10px} .popover.left{margin-left:-10px} @@ -770,10 +770,10 @@ button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-ap .popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid} .popover .arrow{border-width:11px} .popover .arrow:after{border-width:10px;content:""} -.popover.top .arrow{left:50%;margin-left:-11px;border-bottom-width:0;border-top-color:#999;border-top-color:#dfdfdf;bottom:-11px}.popover.top .arrow:after{content:" ";bottom:1px;margin-left:-10px;border-bottom-width:0;border-top-color:#f1eeec} -.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-left-width:0;border-right-color:#999;border-right-color:#dfdfdf}.popover.right .arrow:after{content:" ";left:1px;bottom:-10px;border-left-width:0;border-right-color:#f1eeec} -.popover.bottom .arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:#dfdfdf;top:-11px}.popover.bottom .arrow:after{content:" ";top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#f1eeec} -.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:#dfdfdf}.popover.left .arrow:after{content:" ";right:1px;border-right-width:0;border-left-color:#f1eeec;bottom:-10px} +.popover.top .arrow{left:50%;margin-left:-11px;border-bottom-width:0;border-top-color:#999;border-top-color:#dfdfdf;bottom:-11px}.popover.top .arrow:after{content:" ";bottom:1px;margin-left:-10px;border-bottom-width:0;border-top-color:#f1f0ec} +.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-left-width:0;border-right-color:#999;border-right-color:#dfdfdf}.popover.right .arrow:after{content:" ";left:1px;bottom:-10px;border-left-width:0;border-right-color:#f1f0ec} +.popover.bottom .arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:#dfdfdf;top:-11px}.popover.bottom .arrow:after{content:" ";top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#f1f0ec} +.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:#dfdfdf}.popover.left .arrow:after{content:" ";right:1px;border-right-width:0;border-left-color:#f1f0ec;bottom:-10px} .carousel{position:relative} .carousel-inner{position:relative;overflow:hidden;width:100%}.carousel-inner>.item{display:none;position:relative;-webkit-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;max-width:100%;height:auto;line-height:1} .carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block} @@ -1207,7 +1207,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;background-color:rgba(143,121,104,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{border-left-width:10px;background-color:rgba(143,134,104,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}ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} kbd{padding:0.1em 0.6em;border:1px solid rgba(17,33,48,0.25);-webkit-box-shadow:0 1px 0 rgba(17,33,48,0.25);box-shadow:0 1px 0 rgba(17,33,48,0.25);font-size:11px;font-family:Arial,Helvetica,sans-serif;background-color:#fff;color:#333;border-radius:3px;display:inline-block;margin:0 0.1em;white-space:nowrap} @@ -1380,7 +1380,7 @@ div.jGrowl div.jGrowl-closer{padding-top:4px;padding-bottom:4px;cursor:pointer;f .dropdown-menu,.modal-content,.panel-content,.search-bar{-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.125);box-shadow:0 6px 12px rgba(0,0,0,0.125)} .dropdown-menu>li>a{padding:5px 20px;border-top:1px solid transparent;border-bottom:1px solid transparent}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{border-color:rgba(121,121,121,0.1)} .dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{border-color:transparent} -.modal-content{background-color:#f5f3f2} +.modal-content{background-color:#f5f4f2} .modal-body{background-color:#fff;padding-bottom:30px} .modal-footer{margin-top:0} a{-webkit-transition:background-color ease-in-out .15s, color ease-in-out .15s, border-color ease-in-out .15s;transition:background-color ease-in-out .15s, color ease-in-out .15s, border-color ease-in-out .15s} @@ -1393,10 +1393,10 @@ a{-webkit-transition:background-color ease-in-out .15s, color ease-in-out .15s, a.list-group-item:hover,a.list-group-item:focus{color:#2d2d2d;border-top-color:rgba(121,121,121,0.1);border-bottom-color:rgba(121,121,121,0.1)} .move-to-front{z-index:1050 !important} .btn{padding:8px 11px;-webkit-transition:background-color ease-in-out .15s, color ease-in-out .15s, border-color ease-in-out .15s;transition:background-color ease-in-out .15s, color ease-in-out .15s, border-color ease-in-out .15s} -.btn-default:hover,.btn-default:focus,.btn-default:active,.open .btn-default.dropdown-toggle{color:#2d2d2d;border-color:rgba(121,121,121,0.1);background-color:rgba(143,121,104,0.04) !important} +.btn-default:hover,.btn-default:focus,.btn-default:active,.open .btn-default.dropdown-toggle{color:#2d2d2d;border-color:rgba(121,121,121,0.1);background-color:rgba(143,134,104,0.04) !important} .btn-primary:hover,.btn-primary:focus,.btn-primary:active,.open .btn-primary.dropdown-toggle{color:#2d2d2d;border-color:rgba(121,121,121,0.1);background-color:#dcdcdc !important} .btn-success:hover,.btn-success:focus,.btn-success:active,.open .btn-success.dropdown-toggle{color:#2d2d2d;border-color:#305145;background-color:#437160 !important} -.btn-info:hover,.btn-info:focus,.btn-info:active,.info-tooltip .btn-info,.open .btn-info.dropdown-toggle{color:#2d2d2d;border-color:rgba(121,121,121,0.1);background-color:#f1eeec !important} +.btn-info:hover,.btn-info:focus,.btn-info:active,.info-tooltip .btn-info,.open .btn-info.dropdown-toggle{color:#2d2d2d;border-color:rgba(121,121,121,0.1);background-color:#f1f0ec !important} .btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:0} .btn-group>.btn+.dropdown-toggle{padding-right:11px;padding-left:11px} .form-inline .form-control{display:inline-block} @@ -1434,22 +1434,22 @@ a.list-group-item:hover,a.list-group-item:focus{color:#2d2d2d;border-top-color:r .menu-panel .collapse-button i,.document-panel .collapse-button i{color:#737373;font-size:14px} .menu-panel .collapse-button:hover,.document-panel .collapse-button:hover,.menu-panel.in .collapse-button,.document-panel.in .collapse-button,.menu-panel.collapsing .collapse-button,.document-panel.collapsing .collapse-button{border-width:1px} .menu-panel .panel-content,.document-panel .panel-content{overflow:auto;padding-bottom:30px;height:100%}.menu-panel .panel-content a>i,.document-panel .panel-content a>i{color:inherit} -.menu-panel{width:280px !important;margin-left:-295px;-webkit-transition:margin-left ease-in-out 0.35s;transition:margin-left ease-in-out 0.35s}.menu-panel .sub-menu{background-color:#f5f3f2} +.menu-panel{width:280px !important;margin-left:-295px;-webkit-transition:margin-left ease-in-out 0.35s;transition:margin-left ease-in-out 0.35s}.menu-panel .sub-menu{background-color:#f5f4f2} .menu-panel.in{margin-left:0} .menu-panel .collapse-button{border-top:4px solid rgba(255,217,0,0.8);border-right:5px solid rgba(83,169,255,0.8);border-bottom:4px solid rgba(255,118,6,0.8);right:-50px;z-index:-1;padding:0 10px 0 50px;-webkit-transition:border-width ease-in-out .15s, right ease-in-out 0.15s;transition:border-width ease-in-out .15s, right ease-in-out 0.15s} .menu-panel .collapse-button:hover,.menu-panel.in .collapse-button,.menu-panel.collapsing .collapse-button{right:-55px} -.menu-panel .panel-content{background-color:#f5f3f2;padding-top:6px;border-right:1px solid #e9e9e9}.menu-panel .panel-content>.nav>li>a:hover,.menu-panel .panel-content>.nav>li>a:active{background-color:inherit} +.menu-panel .panel-content{background-color:#f5f4f2;padding-top:6px;border-right:1px solid #e9e9e9}.menu-panel .panel-content>.nav>li>a:hover,.menu-panel .panel-content>.nav>li>a:active{background-color:inherit} .document-panel{right:0;width:340px !important;margin-right:-355px;-webkit-transition:margin-right ease-in-out 0.35s;transition:margin-right ease-in-out 0.35s}.document-panel.in{margin-right:0} .document-panel .collapse-button{border-top:4px solid rgba(255,217,0,0.8);border-left:5px solid rgba(165,204,10,0.8);border-bottom:4px solid rgba(255,118,6,0.8);left:-50px;padding:0 50px 0 3px;z-index:-1;-webkit-transition:border-width ease-in-out .15s, left ease-in-out 0.15s;transition:border-width ease-in-out .15s, left ease-in-out 0.15s}.document-panel .collapse-button i.icon-folder-open{font-size:19px;padding-bottom:1px} .document-panel .collapse-button:hover,.document-panel.in .collapse-button,.document-panel.collapsing .collapse-button{left:-55px} -.document-panel .panel-content{background-color:#f5f3f2;padding-top:80px;border-left:1px solid #e9e9e9}.document-panel .panel-content .icon-layers{font-size:135%} -.document-panel .search-bar{position:absolute;background-color:#f1eeec;margin:-10px 25px 0;padding:20px 5px 10px 15px;z-index:3;border:1px solid #dfdfdf;border-top:0;border-radius:6px} +.document-panel .panel-content{background-color:#f5f4f2;padding-top:80px;border-left:1px solid #e9e9e9}.document-panel .panel-content .icon-layers{font-size:135%} +.document-panel .search-bar{position:absolute;background-color:#f1f0ec;margin:-10px 25px 0;padding:20px 5px 10px 15px;z-index:3;border:1px solid #dfdfdf;border-top:0;border-radius:6px} .document-panel .list-group-item{margin:0} .document-panel .folder{font-weight:bold;color:#21425f;border-top-color:#eee} .document-panel .list-group{margin:0}.document-panel .list-group .nav{border:0;margin:0}.document-panel .list-group .nav .file{padding-left:30px;padding-right:30px} .dropdown-file-selector{top:6px;right:30px;left:auto;margin:0;min-width:280px;max-width:400px;overflow-x:hidden;max-height:400px;overflow-y:auto} .modal-document-manager .nav-pills{margin-bottom:15px} -.modal-document-manager .list-group{background-color:#f5f3f2}.modal-document-manager .list-group .nav{margin-bottom:30px;border:0;margin:0}.modal-document-manager .list-group .nav .file{padding-left:20px} +.modal-document-manager .list-group{background-color:#f5f4f2}.modal-document-manager .list-group .nav{margin-bottom:30px;border:0;margin:0}.modal-document-manager .list-group .nav .file{padding-left:20px} .modal-document-manager .list-group-item{padding:3px;margin:0}.modal-document-manager .list-group-item i{margin-right:3px} .modal-document-manager .list-group-item .btn{float:right}.modal-document-manager .list-group-item .btn i{margin:0;font-size:105%}.modal-document-manager .list-group-item .btn i.icon-pencil{font-size:115%} .modal-document-manager .file-list .list-group-item{padding:0 3px} @@ -1476,7 +1476,7 @@ a.list-group-item:hover,a.list-group-item:focus{color:#2d2d2d;border-top-color:r .modal-settings .accordion-inner{border:0;padding:10px 40px 20px}.modal-settings .accordion-inner .form-horizontal .control-label{text-align:left} .modal-settings .accordion-inner .form-horizontal .form-inline .label-text{margin-left:15px} .modal-settings .tab-pane-button-container{width:220px;margin:10px auto 20px}.modal-settings .tab-pane-button-container .btn{text-align:initial;padding-left:15px} -.modal-settings .nav-tabs{margin:15px 0 0}.modal-settings .nav-tabs>li>a:hover,.modal-settings .nav-tabs>li>a:focus{color:#2d2d2d;border-color:rgba(121,121,121,0.1);background-color:rgba(143,121,104,0.04);border-bottom-color:rgba(0,0,0,0)} +.modal-settings .nav-tabs{margin:15px 0 0}.modal-settings .nav-tabs>li>a:hover,.modal-settings .nav-tabs>li>a:focus{color:#2d2d2d;border-color:rgba(121,121,121,0.1);background-color:rgba(143,134,104,0.04);border-bottom-color:rgba(0,0,0,0)} .modal-settings .nav-tabs>li.active>a,.modal-settings .nav-tabs>li.active>a:hover,.modal-settings .nav-tabs>li.active>a:focus{color:#21425f;background-color:#e4e4e4;border-color:rgba(121,121,121,0.05);border-bottom-color:rgba(0,0,0,0)} .modal-manage-sync .sync-list,.modal-manage-publish .publish-list,.modal-manage-sharing .share-list{margin-bottom:20px}.modal-manage-sync .sync-list .input-group,.modal-manage-publish .publish-list .input-group,.modal-manage-sharing .share-list .input-group{margin-bottom:10px} .share-list .form-control{width:280px} @@ -1493,30 +1493,30 @@ a.list-group-item:hover,a.list-group-item:focus{color:#2d2d2d;border-top-color:r .ui-layout-resizer-north{background-color:#305145;border-bottom:1px solid #305145} .resizer-decorator{position:absolute;display:block !important}.ui-layout-resizer-east .resizer-decorator{width:35px;height:100%;border-left:1px solid rgba(121,121,121,0.06)} .ui-layout-resizer-south .resizer-decorator{height:35px;width:100%;border-top:1px solid rgba(121,121,121,0.06)} -.ace_editor{color:#356998} +.ace_editor{color:#415b73} .ace-tm{background-color:#fff}.ace-tm .ace_text-input{box-sizing:initial} .ace-tm .ace_marker-layer .ace_active-line{background-color:rgba(121,121,121,0.05)} .ace-tm .ace_cursor{color:#2d2d2d} .ace-tm .ace_print-margin{background-color:rgba(121,121,121,0.05)} -.ace-tm .ace_markup.ace_heading{color:#1b354c;font-weight:bold} -.ace-tm .ace_markup.ace_list{color:#699cca} -.ace-tm .ace_constant.ace_language{color:rgba(105,156,202,0.75);font-weight:normal} -.ace-tm .ace_meta.ace_tag{color:#356998;font-style:italic;font-weight:bold;background-color:rgba(143,121,104,0.075)} -.ace-tm .ace_keyword.ace_operator{color:#356998;background-color:transparent} -.ace-tm .ace_keyword{color:#356998;background-color:rgba(143,121,104,0.075);font-weight:bold} -.ace-tm .ace_string{color:#356998;font-style:italic;background-color:rgba(143,121,104,0.075)} +.ace-tm .ace_markup.ace_heading{color:#253442;font-weight:bold} +.ace-tm .ace_markup.ace_list{color:#5c82a4} +.ace-tm .ace_constant.ace_language{color:rgba(92,130,164,0.6);font-weight:normal} +.ace-tm .ace_meta.ace_tag{color:#415b73;font-style:italic;font-weight:bold;background-color:rgba(143,134,104,0.075)} +.ace-tm .ace_keyword.ace_operator{color:#415b73;background-color:transparent} +.ace-tm .ace_keyword{color:#415b73;background-color:rgba(143,134,104,0.075);font-weight:bold} +.ace-tm .ace_string{color:#415b73;font-style:italic;background-color:rgba(143,134,104,0.075)} .ace-tm .ace_invalid{color:inherit;background:inherit} -.ace-tm .ace_strong{color:#356998;font-weight:bold} -.ace-tm .ace_emphasis{color:#1b354c;font-style:italic} -.ace-tm .ace_blockquote{color:#699cca} -.ace-tm .ace_code{color:#1b354c;background-color:rgba(143,121,104,0.075)} -.ace-tm .ace_code_block{color:#1b354c} -.ace-tm .ace_link{color:#699cca;background-color:rgba(143,121,104,0.075)} -.ace-tm .ace_description{color:#699cca} -.ace-tm .ace_constant{color:#356998} -.ace-tm .ace_comment{color:rgba(105,156,202,0.75);font-style:italic} +.ace-tm .ace_strong{color:#415b73;font-weight:bold} +.ace-tm .ace_emphasis{color:#253442;font-style:italic} +.ace-tm .ace_blockquote{color:#5c82a4} +.ace-tm .ace_code{color:#253442;background-color:rgba(143,134,104,0.075)} +.ace-tm .ace_code_block{color:#253442} +.ace-tm .ace_link{color:rgba(92,130,164,0.6)} +.ace-tm .ace_description{color:#5c82a4} +.ace-tm .ace_constant{color:#415b73} +.ace-tm .ace_comment{color:rgba(92,130,164,0.6);font-style:italic} .ace-tm .ace_marker-layer .misspelled{position:absolute;z-index:-2;border-bottom:1px dotted red;margin-bottom:-1px} -.ace_search{background-color:#f5f3f2;border:1px solid #e9e9e9;border-top:0;padding:10px 15px 5px;font-family:'Open Sans',"Trebuchet MS",Helvetica,sans-serif;min-width:318px}.ace_search .ace_search_form,.ace_search .ace_replace_form{border-color:#dfdfdf;margin-bottom:10px} +.ace_search{background-color:#f5f4f2;border:1px solid #e9e9e9;border-top:0;padding:10px 15px 5px;font-family:'Open Sans',"Trebuchet MS",Helvetica,sans-serif;min-width:318px}.ace_search .ace_search_form,.ace_search .ace_replace_form{border-color:#dfdfdf;margin-bottom:10px} .ace_search .ace_search_field{width:185px} .ace_search .ace_search_field,.ace_search .ace_searchbtn,.ace_search .ace_replacebtn{height:30px;padding:0 12px;font-size:14px;line-height:1.428571429;color:#32638e;vertical-align:middle;background-color:#fff;border-color:#dfdfdf;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)} .ace_search .ace_searchbtn{background-image:none;font-family:"fontello";width:auto;font-size:16px}.ace_search .ace_searchbtn.next:before{content:'\e880'} @@ -1524,11 +1524,11 @@ a.list-group-item:hover,a.list-group-item:focus{color:#2d2d2d;border-top-color:r .ace_search .ace_replacebtn{padding:0 4px} .ace_search .ace_searchbtn_close{background:transparent;margin:0;font-size:21px;font-weight:bold;text-shadow:0 1px 0 #fff;opacity:.3;filter:alpha(opacity=30)}.ace_search .ace_searchbtn_close:before{content:'\d7'} .ace_search .ace_searchbtn_close:hover,.ace_search .ace_searchbtn_close:focus{color:#112130;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50);background:transparent} -#wmd-input{border-radius:0;color:#356998;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none;padding:0 12px}div#wmd-input{padding:0} +#wmd-input{border-radius:0;color:#415b73;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none;padding:0 12px}div#wmd-input{padding:0} .textarea-helper{top:-100px;height:1px;padding:0 12px;font-size:14px;line-height:1.428571429;position:absolute;overflow:auto;white-space:pre-wrap;word-wrap:break-word} -.preview-container{overflow:auto;background-color:#f5f3f2} +.preview-container{overflow:auto;background-color:#f5f4f2} .wmd-prompt-background{display:none} -div.dropdown-menu{padding:5px 20px;background-color:#f1eeec}div.dropdown-menu p,div.dropdown-menu blockquote{margin:10px 0} +div.dropdown-menu{padding:5px 20px;background-color:#f1f0ec}div.dropdown-menu p,div.dropdown-menu blockquote{margin:10px 0} div.dropdown-menu .stat{margin-bottom:10px} div.dropdown-menu i{margin-right:0} div.dropdown-menu textarea{width:250px;height:150px;resize:none}