From 33958a02d851291a6609e502582a0e80a03cbb77 Mon Sep 17 00:00:00 2001 From: benweet Date: Sun, 18 May 2014 20:27:59 +0100 Subject: [PATCH] Fixed teamserver helper --- public/cache.manifest | 2 +- public/res-min/main.js | 297 ++++++++++++++++++++++--- public/res-min/themes/base.css | 2 +- public/res-min/themes/default.css | 80 +++---- public/res-min/themes/gray.css | 80 +++---- public/res-min/themes/night.css | 80 +++---- public/res-min/themes/original.css | 80 +++---- public/res-min/themes/school.css | 80 +++---- public/res/helpers/googleHelper.js | 14 +- public/res/helpers/teamserverHelper.js | 2 +- 10 files changed, 485 insertions(+), 232 deletions(-) diff --git a/public/cache.manifest b/public/cache.manifest index b7eee2f7..f2912146 100644 --- a/public/cache.manifest +++ b/public/cache.manifest @@ -1,5 +1,5 @@ CACHE MANIFEST -#Date Sun May 04 2014 19:13:31 +#Date Sun May 18 2014 20:27:16 CACHE: libs/MathJax/MathJax.js?config=TeX-AMS_HTML diff --git a/public/res-min/main.js b/public/res-min/main.js index 78f48e2f..591916de 100644 --- a/public/res-min/main.js +++ b/public/res-min/main.js @@ -7849,6 +7849,26 @@ var saveAs = saveAs || "undefined" != typeof navigator && navigator.msSaveOrOpen o = screen.height / 2 - i / 2; return window.open(e, t, ["toolbar=no, ", "location=no, ", "directories=no, ", "status=no, ", "menubar=no, ", "scrollbars=no, ", "resizable=no, ", "copyhistory=no, ", "width=" + n + ", ", "height=" + i + ", ", "top=" + o + ", ", "left=" + r].join("")) }; + var $windowElt = $(window); + utils.iframe = function(e, t, n) { + function i() { + var e = window.innerWidth - 20; + e > t && (e = t); + var i = window.innerHeight - 50; + i > n && (i = n), a.setAttribute("width", e), a.setAttribute("height", i) + } + + function r() { + o.off("click.backdrop"), o[0].removeBackdrop(), $windowElt.off("resize.iframe"), a.parentNode.removeChild(a) + } + var o = $(utils.createBackdrop()), + a = crel("iframe", { + src: e, + frameborder: 0, + "class": "modal-content modal-iframe" + }); + return document.body.appendChild(a), i(), $windowElt.on("resize.iframe", i), a.removeIframe = r, o.on("click.backdrop", r), a + }; var redirectCallbackConfirm, redirectCallbackCancel; utils.redirectConfirm = function(e, t, n) { redirectCallbackConfirm = t, redirectCallbackCancel = n, $(".modal-redirect-confirm .redirect-msg").html(e), $(".modal-redirect-confirm").modal("show") @@ -7958,7 +7978,7 @@ var saveAs = saveAs || "undefined" != typeof navigator && navigator.msSaveOrOpen }, utils }), define("constants", [], function() { var e = {}; - return e.VERSION = "3.99.5", e.MAIN_URL = "https://stackedit.io/", e.GOOGLE_ANALYTICS_ACCOUNT_ID = "UA-39556145-1", e.GOOGLE_API_KEY = "AIzaSyAeCU8CGcSkn0z9js6iocHuPBX4f_mMWkw", e.GOOGLE_DRIVE_APP_ID = "241271498917", e.DROPBOX_APP_KEY = "lq6mwopab8wskas", e.DROPBOX_APP_SECRET = "851fgnucpezy84t", e.DROPBOX_RESTRICTED_APP_KEY = "sw0hlixhr8q1xk0", e.DROPBOX_RESTRICTED_APP_SECRET = "1r808p2xygs6lbg", e.BITLY_ACCESS_TOKEN = "317e033bfd48cf31155a68a536b1860013b09c4c", e.DEFAULT_FILE_TITLE = "Title", e.DEFAULT_FOLDER_NAME = "New folder", e.GDRIVE_DEFAULT_FILE_TITLE = "New Markdown document", e.EDITOR_DEFAULT_PADDING = 35, e.CHECK_ONLINE_PERIOD = 12e4, e.AJAX_TIMEOUT = 3e4, e.ASYNC_TASK_DEFAULT_TIMEOUT = 6e4, e.ASYNC_TASK_LONG_TIMEOUT = 18e4, e.USER_IDLE_THRESHOLD = 3e5, e.IMPORT_FILE_MAX_CONTENT_SIZE = 1e5, e.IMPORT_IMG_MAX_CONTENT_SIZE = 1e7, e.TEMPORARY_FILE_INDEX = "file.tempIndex", e.WELCOME_DOCUMENT_TITLE = "Welcome document", e.DOWNLOAD_PROXY_URL = "https://stackedit-download-proxy.herokuapp.com/", e.PICASA_PROXY_URL = "https://stackedit-picasa-proxy.herokuapp.com/", e.SSH_PROXY_URL = "https://stackedit-ssh-proxy.herokuapp.com/", e.HTMLTOPDF_URL = "https://stackedit-htmltopdf.herokuapp.com/", e.BASE_URL = "http://localhost/", e.GOOGLE_CLIENT_ID = "241271498917-lev37kef013q85avc91am1gccg5g8lrb.apps.googleusercontent.com", e.GITHUB_CLIENT_ID = "e47fef6055344579799d", e.GATEKEEPER_URL = "https://stackedit-gatekeeper-localhost.herokuapp.com/", e.TUMBLR_PROXY_URL = "https://stackedit-tumblr-proxy-local.herokuapp.com/", e.WORDPRESS_CLIENT_ID = "23361", e.WORDPRESS_PROXY_URL = "https://stackedit-io-wordpress-proxy.herokuapp.com/", 0 === location.hostname.indexOf("stackedit.io") ? (e.BASE_URL = e.MAIN_URL, e.GOOGLE_CLIENT_ID = "241271498917-t4t7d07qis7oc0ahaskbif3ft6tk63cd.apps.googleusercontent.com", e.GITHUB_CLIENT_ID = "710fc67886ab1ae8fee6", e.GATEKEEPER_URL = "https://stackedit-io-gatekeeper.herokuapp.com/", e.TUMBLR_PROXY_URL = "https://stackedit-io-tumblr-proxy.herokuapp.com/") : 0 === location.hostname.indexOf("benweet.github.io") ? (e.BASE_URL = "http://benweet.github.io/stackedit/", e.GOOGLE_CLIENT_ID = "241271498917-jpto9lls9fqnem1e4h6ppds9uob8rpvu.apps.googleusercontent.com", e.GITHUB_CLIENT_ID = "fa0d09514da8377ee32e", e.GATEKEEPER_URL = "https://stackedit-gatekeeper.herokuapp.com/", e.TUMBLR_PROXY_URL = "https://stackedit-tumblr-proxy.herokuapp.com/", e.WORDPRESS_CLIENT_ID = "3185", e.WORDPRESS_PROXY_URL = "https://stackedit-wordpress-proxy.herokuapp.com/") : 0 === location.hostname.indexOf("stackedit-beta.herokuapp.com") ? (e.BASE_URL = "https://stackedit-beta.herokuapp.com/", e.GOOGLE_CLIENT_ID = "241271498917-9bbplknkt0ljv5gaudhoiogp13hd18be.apps.googleusercontent.com", e.GITHUB_CLIENT_ID = "e9034ae191c3a8a1c5ed", e.GATEKEEPER_URL = "https://stackedit-beta-gatekeeper.herokuapp.com/", e.TUMBLR_PROXY_URL = "https://stackedit-beta-tumblr-proxy.herokuapp.com/", e.WORDPRESS_CLIENT_ID = "34786", e.WORDPRESS_PROXY_URL = "https://stackedit-beta-wordpress-proxy.herokuapp.com/") : 0 === location.hostname.indexOf("benweet.insomnia247.nl") && (e.BASE_URL = "http://benweet.insomnia247.nl/stackedit/", e.GOOGLE_CLIENT_ID = "241271498917-52hae7a08hv7ltenv7km8h7lghno9sk3.apps.googleusercontent.com", e.GITHUB_CLIENT_ID = "d2943d6074b2d9c4a830", e.GATEKEEPER_URL = "https://stackedit-gatekeeper-insomnia.herokuapp.com/", e.TUMBLR_PROXY_URL = "https://stackedit-tumblr-proxy-beta.herokuapp.com/"), e.THEME_LIST = { + return e.VERSION = "3.99.5", e.MAIN_URL = "https://stackedit.io/", e.GOOGLE_ANALYTICS_ACCOUNT_ID = "UA-39556145-1", e.GOOGLE_API_KEY = "AIzaSyAeCU8CGcSkn0z9js6iocHuPBX4f_mMWkw", e.GOOGLE_DRIVE_APP_ID = "241271498917", e.DROPBOX_APP_KEY = "lq6mwopab8wskas", e.DROPBOX_APP_SECRET = "851fgnucpezy84t", e.DROPBOX_RESTRICTED_APP_KEY = "sw0hlixhr8q1xk0", e.DROPBOX_RESTRICTED_APP_SECRET = "1r808p2xygs6lbg", e.BITLY_ACCESS_TOKEN = "317e033bfd48cf31155a68a536b1860013b09c4c", e.DEFAULT_FILE_TITLE = "Title", e.DEFAULT_FOLDER_NAME = "New folder", e.GDRIVE_DEFAULT_FILE_TITLE = "New Markdown document", e.EDITOR_DEFAULT_PADDING = 35, e.CHECK_ONLINE_PERIOD = 12e4, e.AJAX_TIMEOUT = 3e4, e.ASYNC_TASK_DEFAULT_TIMEOUT = 6e4, e.ASYNC_TASK_LONG_TIMEOUT = 18e4, e.USER_IDLE_THRESHOLD = 3e5, e.IMPORT_FILE_MAX_CONTENT_SIZE = 1e5, e.IMPORT_IMG_MAX_CONTENT_SIZE = 1e7, e.TEMPORARY_FILE_INDEX = "file.tempIndex", e.WELCOME_DOCUMENT_TITLE = "Welcome document", e.DOWNLOAD_PROXY_URL = "https://stackedit-download-proxy.herokuapp.com/", e.PICASA_PROXY_URL = "https://stackedit-picasa-proxy.herokuapp.com/", e.SSH_PROXY_URL = "https://stackedit-ssh-proxy.herokuapp.com/", e.HTMLTOPDF_URL = "https://stackedit-htmltopdf.herokuapp.com/", e.TEAM_SERVER_URL = "/", e.BASE_URL = "http://localhost/", e.GOOGLE_CLIENT_ID = "241271498917-lev37kef013q85avc91am1gccg5g8lrb.apps.googleusercontent.com", e.GITHUB_CLIENT_ID = "e47fef6055344579799d", e.GATEKEEPER_URL = "https://stackedit-gatekeeper-localhost.herokuapp.com/", e.TUMBLR_PROXY_URL = "https://stackedit-tumblr-proxy-local.herokuapp.com/", e.WORDPRESS_CLIENT_ID = "23361", e.WORDPRESS_PROXY_URL = "https://stackedit-io-wordpress-proxy.herokuapp.com/", 0 === location.hostname.indexOf("stackedit.io") ? (e.BASE_URL = e.MAIN_URL, e.GOOGLE_CLIENT_ID = "241271498917-t4t7d07qis7oc0ahaskbif3ft6tk63cd.apps.googleusercontent.com", e.GITHUB_CLIENT_ID = "710fc67886ab1ae8fee6", e.GATEKEEPER_URL = "https://stackedit-io-gatekeeper.herokuapp.com/", e.TUMBLR_PROXY_URL = "https://stackedit-io-tumblr-proxy.herokuapp.com/") : 0 === location.hostname.indexOf("benweet.github.io") ? (e.BASE_URL = "http://benweet.github.io/stackedit/", e.GOOGLE_CLIENT_ID = "241271498917-jpto9lls9fqnem1e4h6ppds9uob8rpvu.apps.googleusercontent.com", e.GITHUB_CLIENT_ID = "fa0d09514da8377ee32e", e.GATEKEEPER_URL = "https://stackedit-gatekeeper.herokuapp.com/", e.TUMBLR_PROXY_URL = "https://stackedit-tumblr-proxy.herokuapp.com/", e.WORDPRESS_CLIENT_ID = "3185", e.WORDPRESS_PROXY_URL = "https://stackedit-wordpress-proxy.herokuapp.com/") : 0 === location.hostname.indexOf("stackedit-beta.herokuapp.com") ? (e.BASE_URL = "https://stackedit-beta.herokuapp.com/", e.GOOGLE_CLIENT_ID = "241271498917-9bbplknkt0ljv5gaudhoiogp13hd18be.apps.googleusercontent.com", e.GITHUB_CLIENT_ID = "e9034ae191c3a8a1c5ed", e.GATEKEEPER_URL = "https://stackedit-beta-gatekeeper.herokuapp.com/", e.TUMBLR_PROXY_URL = "https://stackedit-beta-tumblr-proxy.herokuapp.com/", e.WORDPRESS_CLIENT_ID = "34786", e.WORDPRESS_PROXY_URL = "https://stackedit-beta-wordpress-proxy.herokuapp.com/") : 0 === location.hostname.indexOf("benweet.insomnia247.nl") && (e.BASE_URL = "http://benweet.insomnia247.nl/stackedit/", e.GOOGLE_CLIENT_ID = "241271498917-52hae7a08hv7ltenv7km8h7lghno9sk3.apps.googleusercontent.com", e.GITHUB_CLIENT_ID = "d2943d6074b2d9c4a830", e.GATEKEEPER_URL = "https://stackedit-gatekeeper-insomnia.herokuapp.com/", e.TUMBLR_PROXY_URL = "https://stackedit-tumblr-proxy-beta.herokuapp.com/"), e.THEME_LIST = { "default": "Default", gray: "Gray", night: "Night", @@ -14359,7 +14379,7 @@ if(Markdown = "object" == typeof exports && "function" == typeof require ? expor var h = 0; return l.onFileOpen = a, l.onContentChanged = a, l }), define("text!html/buttonMarkdownSyntax.html", [], function() { - return '\n
\n

Markdown syntax

\n
\n
\n

Phrase Emphasis

\n\n
*italic*   **bold**\n_italic_   __bold__\n
\n\n

Links

\n\n

Inline:

\n\n
An [example](http://url.com/ "Title")\n
\n\n

Reference-style labels (titles are optional):

\n\n
An [example][id]. Then, anywhere\nelse in the doc, define the link:\n\n  [id]: http://example.com/  "Title"\n
\n\n

Images

\n\n

Inline (titles are optional):

\n\n
![alt text](/path/img.jpg "Title")\n
\n\n

Reference-style:

\n\n
![alt text][id]\n\n[id]: /url/to/img.jpg "Title"\n
\n\n

Headers

\n\n

Setext-style:

\n\n
Header 1\n========\n\nHeader 2\n--------\n
\n\n

atx-style (closing #\'s are optional):

\n\n
# Header 1 #\n\n## Header 2 ##\n\n###### Header 6\n
\n\n

Lists

\n\n

Ordered, without paragraphs:

\n\n
1.  Foo\n2.  Bar\n
\n\n

Unordered, with paragraphs:

\n\n
*   A list item.\n\n    With multiple paragraphs.\n\n*   Bar\n
\n\n

You can nest them:

\n\n
*   Abacus\n    * answer\n*   Bubbles\n    1.  bunk\n    2.  bupkis\n        * BELITTLER\n    3. burper\n*   Cunning\n
\n\n

Blockquotes

\n\n
> Email-style angle brackets\n> are used for blockquotes.\n\n> > And, they can be nested.\n\n> #### Headers in blockquotes\n>\n> * You can quote a list.\n> * Etc.\n
\n\n

Code Spans

\n\n
`<code>` spans are delimited\nby backticks.\n\nYou can include literal backticks\nlike `` `this` ``.\n
\n\n

Preformatted Code Blocks

\n\n

Indent every line of a code block by at least 4 spaces or 1 tab.

\n\n
This is a normal paragraph.\n\n    This is a preformatted\n    code block.\n
\n\n

Horizontal Rules

\n\n

Three or more dashes or asterisks:

\n\n
---\n\n* * *\n\n- - - -\n
\n\n

Manual Line Breaks

\n\n

End a line with two or more spaces:

\n\n
Roses are red,\nViolets are blue.\n
\n\n
Based on the Markdown syntax guide, by Fletcher T. Penney.
\n
\n
\n
\n' + return '\n
\n

Markdown syntax

\n
\n
\n

Phrase Emphasis

\n\n
*italic*   **bold**\n_italic_   __bold__\n
\n\n

Links

\n\n

Inline:

\n\n
An [example](http://url.com/ "Title")\n
\n\n

Reference-style labels (titles are optional):

\n\n
An [example][id]. Then, anywhere\nelse in the doc, define the link:\n\n  [id]: http://example.com/  "Title"\n
\n\n

Images

\n\n

Inline (titles are optional):

\n\n
![alt text](/path/img.jpg "Title")\n
\n\n

Reference-style:

\n\n
![alt text][id]\n\n[id]: /url/to/img.jpg "Title"\n
\n\n

Headers

\n\n

Setext-style:

\n\n
Header 1\n========\n\nHeader 2\n--------\n
\n\n

atx-style (closing #\'s are optional):

\n\n
# Header 1 #\n\n## Header 2 ##\n\n###### Header 6\n
\n\n

Lists

\n\n

Ordered, without paragraphs:

\n\n
1.  Foo\n2.  Bar\n
\n\n

Unordered, with paragraphs:

\n\n
*   A list item.\n\n    With multiple paragraphs.\n\n*   Bar\n
\n\n

You can nest them:

\n\n
*   Abacus\n    * answer\n*   Bubbles\n    1.  bunk\n    2.  bupkis\n        * BELITTLER\n    3. burper\n*   Cunning\n
\n\n

Blockquotes

\n\n
> Email-style angle brackets\n> are used for blockquotes.\n\n> > And, they can be nested.\n\n> #### Headers in blockquotes\n>\n> * You can quote a list.\n> * Etc.\n
\n\n

Code Spans

\n\n
`<code>` spans are delimited\nby backticks.\n\nYou can include literal backticks\nlike `` `this` ``.\n
\n\n

Preformatted Code Blocks

\n\n

Indent every line of a code block by at least 4 spaces or 1 tab.

\n\n
This is a normal paragraph.\n\n    This is a preformatted\n    code block.\n
\n\n

Horizontal Rules

\n\n

Three or more dashes or asterisks:

\n\n
---\n\n* * *\n\n- - - -\n
\n\n

Manual Line Breaks

\n\n

End a line with two or more spaces:

\n\n
Roses are red,\nViolets are blue.\n
\n\n
Based on the Markdown syntax guide, by Fletcher T. Penney.
\n
\n
\n
\n' }), define("extensions/buttonMarkdownSyntax", ["jquery", "classes/Extension", "text!html/buttonMarkdownSyntax.html"], function(e, t, n) { var i = new t("buttonMarkdownSyntax", 'Button "Markdown syntax', !0, !0); return i.settingsBlock = '

Adds a "Markdown syntax" button over the preview.

', i.onCreatePreviewButton = function() { @@ -19632,7 +19652,7 @@ if(Markdown = "object" == typeof exports && "function" == typeof require ? expor } }, c }), define("text!html/buttonToc.html", [], function() { - return '\n
\n

Table of contents

\n
\n
\n
\n
\n
\n' + return '\n
\n

Table of contents

\n
\n
\n
\n
\n
\n' }), define("text!html/tocSettingsBlock.html", [], function() { return '

Generates a table of contents when a [TOC] marker is found.

\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("extensions/toc", ["jquery", "underscore", "utils", "classes/Extension", "text!html/buttonToc.html", "text!html/tocSettingsBlock.html"], function(e, t, n, i, r, o) { @@ -19937,7 +19957,7 @@ if(Markdown = "object" == typeof exports && "function" == typeof require ? expor e(".action-update-publication").click(s.publish) }, l.onPublishRemoved = p, l.onNewPublishSuccess = p, l }), define("text!html/buttonStat.html", [], function() { - return '\n
\n

Statistics

\n
\n
\n
\n <%= name1 %>: \n
\n
\n <%= name2 %>: \n
\n
\n <%= name3 %>: \n
\n
\n
\n' + return '\n
\n

Statistics

\n
\n
\n
\n <%= name1 %>: \n
\n
\n <%= name2 %>: \n
\n
\n <%= name3 %>: \n
\n
\n
\n' }), define("text!html/buttonStatSettingsBlock.html", [], function() { return '

Adds a "Document statistics" button over the preview.

\n
\n
\n RegExp \n
\n
\n RegExp \n
\n
\n RegExp \n
\n
\n' }), define("extensions/buttonStat", ["jquery", "underscore", "utils", "classes/Extension", "text!html/buttonStat.html", "text!html/buttonStatSettingsBlock.html"], function(e, t, n, i, r, o) { @@ -19976,7 +19996,7 @@ if(Markdown = "object" == typeof exports && "function" == typeof require ? expor l.textContent = c.textContent = (r.match(p) || []).length, u.textContent = (r.match(h) || []).length, d.textContent = (r.match(f) || []).length }, a }), define("text!html/buttonHtmlCode.html", [], function() { - return '\n
\n

HTML code

\n \n
\n' + return '\n
\n

HTML code

\n \n
\n' }), define("text!html/buttonHtmlCodeSettingsBlock.html", [], function() { return '

Adds a "HTML code" button over the preview.

\n
\n
\n \n
\n \n
\n
\n
' }), define("extensions/buttonHtmlCode", ["jquery", "underscore", "utils", "classes/Extension", "text!html/buttonHtmlCode.html", "text!html/buttonHtmlCodeSettingsBlock.html"], function(e, t, n, i, r, o) { @@ -24333,11 +24353,11 @@ function(e, t) { }, d.prototype.createToggler = function(i) { var r, o = 0; this.toggle = function(a) { - a !== this.isOpen && (this.isOpen = t.isBoolean(a) ? a : !this.isOpen, this.isOpen ? (this.$elt.addClass("panel-open").trigger("show.layout.toggle"), i && (e(r = n.createBackdrop(v.elt)).click(t.bind(function() { + a !== this.isOpen && (this.isOpen = t.isBoolean(a) ? a : !this.isOpen, this.isOpen ? (this.$elt.addClass("panel-open").trigger("show.layout.toggle"), i && (r = e(n.createBackdrop(v.elt)).on("click.backdrop", t.bind(function() { this.toggle(!1) }, this)), this.$elt.addClass("bring-to-front")), H.push(t.bind(function() { 0 === --o && this.isOpen && this.$elt.trigger("shown.layout.toggle") - }, this))) : (this.$elt.trigger("hide.layout.toggle"), r && r.removeBackdrop(), r = void 0, H.push(t.bind(function() { + }, this))) : (this.$elt.trigger("hide.layout.toggle"), r && (r.off("click.backdrop"), r[0].removeBackdrop(), r = void 0), H.push(t.bind(function() { 0 === --o && !this.isOpen && this.$elt.removeClass("panel-open bring-to-front").trigger("hidden.layout.toggle") }, this))), o++, c(), m()) } @@ -24478,7 +24498,7 @@ function(e, t) { }) }), o.onLayoutCreated(L), L }), 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 offline\n
    \n
    • \n
  • \n
\n
    \n
    • \n
    • \n
    • \n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n \n
\n
\n
\n
\n\n
\n \n
\n
\n\n \n StackEdit Viewer\n \n\n
\n
\n\n \n
Synchronize
\n Backup, collaborate in the cloud\n \n
\n \n \n
\n \n
Publish
\n Export to the web\n \n
\n \n
    \n
\n
\n \n
Sharing
\n Share document links\n \n
\n
\n\n Import from disk\n Export to disk\n
\n \n
\n\n Import from URL\n Convert HTML to Markdown\n
\n \n\n
\n
\n\n\n
\n \n
\n \n
\n \n
\n
\n
\n
\n
\n
\n
\n
\n\n
\n
\n
\n\n
\n \n

Manage documents

\n
\n
\n
\n \n
\n

The following documents will be\n deleted locally:

\n

Please choose a destination\n folder:

\n
\n
\n
\n
\n Cancel\n OK\n Close\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Hyperlink

\n
\n
\n

Please provide the link URL and an optional title:

\n
\n \n
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Image

\n
\n
\n

Please provide the image URL and an optional title:

\n
\n \n
\n
\n
\n Import\n from Google+ Cancel OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Google+ image import

\n
\n
\n
\n
\n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n px\n
\n
\n
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Delete

\n
\n
\n

\n Are you sure you want to delete ""?\n

\n
\n Note: This will not delete the file on synchronized\n locations.\n
\n
\n
\n Cancel\n Delete\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Import from URL

\n
\n
\n

Please provide a link to a Markdown document.

\n
\n
\n \n
\n \n
\n
\n
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Import from disk

\n
\n
\n

Please select your Markdown files here:

\n

\n \n

\n

Or drag and drop your Markdown files here:

\n

Drop\n files here

\n
\n
\n Close\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Convert HTML to Markdown

\n
\n
\n

Please select your HTML files here:

\n

\n \n

\n

Or drag and drop your HTML files here:

\n

Drop\n files here

\n

Or insert your HTML code here:

\n \n
\n
\n Close OK\n
\n
\n
\n
\n\n\n
\n
\n
\n
\n
\n
\n\n\n
\n
\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Save on Dropbox

\n
\n
\n

\n This will save "" to your \n Dropbox\n account and keep it synchronized.\n

\n
\n
\n \n
\n \n File path is composed of both\n folder and filename. \n
\n
\n
\n
\n Note:\n
    \n
  • Dropbox file path does not depend on document title.
    • \n
  • The title of your document will not be synchronized.
    • \n
  • Destination folder must exist.
    • \n
  • Any existing file at this location will be overwritten.
    • \n
\n
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Synchronization

\n
\n
\n

\n "" is synchronized with the\n following location(s):\n

\n
\n
\n Note: Removing a synchronized location will not delete any\n file.\n
\n
\n
\n Close\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

\n Publish on \n

\n
\n
\n
\n
\n \n
\n Host must be accessible publicly,\n unless you are hosting your own SSH\n proxy.\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n File path is composed of both\n folder and filename. \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n
\n \n
\n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n Jetpack plugin is required for\n self-hosted sites.\n \n
\n
\n \n \n
\n \n
\n
\n \n \n
\n \n
\n
\n
\n \n
\n \n File path is composed of both\n folder and filename. \n
\n
\n
\n \n
\n If no file ID is supplied, a new file\n will be created in your Google Drive root folder. You can move\n the file afterwards within Google Drive.\n
\n
\n
\n \n
\n If no file name is supplied, the\n document title will be used.\n
\n
\n\n
\n \n
\n
\n \n
\n
\n \n
\n
\n \n
\n
\n
\n
\n
\n
\n
\n
\n (?)\n
\n
\n
\n
\n
\n
\n \n
\n
\n
\n
\n
\n

Tip: You can use a\n YAML front matter to specify the title and the tags/labels of your publication.

\n

Interpreted variables: title, tags, published, date.

\n
\n
\n

Tip: You can use a\n YAML front matter to specify the title of your page.

\n

Interpreted variables: title.

\n
\n
\n

About URL: For newly created page , Blogger API will append a generated number to the url like about-me-1234.html, if you deeply care about your URL naming, you should first create the page on Blogger and then update them with StackEdit specifying the pageId when publishing.\n

\n

About page visibility: Blogger API does not respect published status for pages.When publishing the page to Blogger, the page will be live but not added to the page listing. You should arrange the page listing from Blogger dashboard.\n

\n
\n
\n
\n Cancel\n OK\n
\n
\n \n\n\n\n
\n
\n
\n\n
\n \n

Publication

\n
\n
\n

\n "" is published on the following\n location(s):\n

\n
\n
\n Note: Removing a publish location will not delete the actual publication.\n
\n
\n
\n Close\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Sharing

\n
\n
\n

\n "" can be shared using the following link(s):\n

\n \n

No sharing link yet!\n

\n

To collaborate on this document, use Google Drive\n or Dropbox synchronization from the menu.\n

\n

To share a frozen version of this document within StackEdit, just publish it as a Gist in\n Markdown format from the menu.\n

\n
\n Tip: You can open any URL within StackEdit using viewer#!url=.\n
\n
\n
\n Close\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Settings

\n \n
\n
\n\n
\n
\n
\n
\n \n
\n
\n \n
\n
\n \n
\n
\n
\n
\n \n
\n \n
\n
\n
\n
\n
\n
\n \n
\n
\n
\n
\n
\n
\n
\n \n
\n
\n
\n
\n \n
\n \n Please sign in first with Google. Once linked with your Google accounts, changing account is not possible unless you reset the application.\n
\n
\n
\n
\n
\n
\n
\n \n
\n
\n \n
\n
\n \n
\n
\n
\n
\n \n
\n
\n \n
\n
\n \n
\n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n
\n \n
\n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n
\n Existing authorization has to be revoked in\n Google Dashboard\n for this change to take effect.\n
\n
\n
\n
\n
\n
\n
\n If unchecked, access will be restricted to folder\n /Applications/StackEdit for existing files.\n
\n
\n
\n
\n
\n
\n
\n Existing authorization has to be revoked in\n GitHub settings\n for this change to take effect.\n
\n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n
\n \n \n
\n\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n

Ooops...

\n
\n
\n

StackEdit has stopped because another instance was running in\n the same browser.

\n
If you want to reopen StackEdit, click on\n "Reload".
\n
\n
\n Reload\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n

Redirection

\n
\n
\n

\n
Please click OK to proceed.
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n

Reset application

\n
\n
\n

This will delete all your local documents.

\n
Are you sure?
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n

Import documents and settings

\n
\n
\n

This will delete all existing local documents.

\n
Are you sure?
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n

Add Google Drive account

\n
\n
\n

To perform this request, you need to configure another Google Drive account in StackEdit.

\n
Do you want to proceed?
\n
\n
\n No\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 offline\n
    \n
    • \n
  • \n
\n
    \n
    • \n
    • \n
    • \n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n \n
\n
\n
\n
\n\n
\n \n
\n
\n\n \n StackEdit Viewer\n \n\n
\n
\n\n \n
Synchronize
\n Backup, collaborate in the cloud\n \n
\n \n \n
\n \n
Publish
\n Export to the web\n \n
\n \n
    \n
\n
\n \n
Sharing
\n Share document links\n \n
\n
\n\n Import from disk\n Export to disk\n
\n \n
\n\n Import from URL\n Convert HTML to Markdown\n
\n \n\n
\n
\n\n\n
\n \n
\n \n
\n \n
\n
\n
\n
\n
\n
\n
\n
\n\n
\n
\n
\n\n
\n \n

Manage documents

\n
\n
\n
\n \n
\n

The following documents will be\n deleted locally:

\n

Please choose a destination\n folder:

\n
\n
\n
\n
\n Cancel\n OK\n Close\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Hyperlink

\n
\n
\n

Please provide the link URL and an optional title:

\n
\n \n
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Image

\n
\n
\n

Please provide the image URL and an optional title:

\n
\n \n
\n
\n
\n Import\n from Google+ Cancel OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Google+ image import

\n
\n
\n
\n
\n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n px\n
\n
\n
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Delete

\n
\n
\n

\n Are you sure you want to delete ""?\n

\n
\n Note: This will not delete the file on synchronized\n locations.\n
\n
\n
\n Cancel\n Delete\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Import from URL

\n
\n
\n

Please provide a link to a Markdown document.

\n
\n
\n \n
\n \n
\n
\n
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Import from disk

\n
\n
\n

Please select your Markdown files here:

\n

\n \n

\n

Or drag and drop your Markdown files here:

\n

Drop\n files here

\n
\n
\n Close\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Convert HTML to Markdown

\n
\n
\n

Please select your HTML files here:

\n

\n \n

\n

Or drag and drop your HTML files here:

\n

Drop\n files here

\n

Or insert your HTML code here:

\n \n
\n
\n Close OK\n
\n
\n
\n
\n\n\n
\n
\n
\n
\n
\n
\n\n\n
\n
\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Save on Dropbox

\n
\n
\n

\n This will save "" to your \n Dropbox\n account and keep it synchronized.\n

\n
\n
\n \n
\n \n File path is composed of both\n folder and filename. \n
\n
\n
\n
\n Note:\n
    \n
  • Dropbox file path does not depend on document title.
    • \n
  • The title of your document will not be synchronized.
    • \n
  • Destination folder must exist.
    • \n
  • Any existing file at this location will be overwritten.
    • \n
\n
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Synchronization

\n
\n
\n

\n "" is synchronized with the\n following location(s):\n

\n
\n
\n Note: Removing a synchronized location will not delete any\n file.\n
\n
\n
\n Close\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

\n Publish on \n

\n
\n
\n
\n
\n \n
\n Host must be accessible publicly,\n unless you are hosting your own SSH\n proxy.\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n File path is composed of both\n folder and filename. \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n
\n \n
\n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n Jetpack plugin is required for\n self-hosted sites.\n \n
\n
\n \n \n
\n \n
\n
\n \n \n
\n \n
\n
\n
\n \n
\n \n File path is composed of both\n folder and filename. \n
\n
\n
\n \n
\n If no file ID is supplied, a new file\n will be created in your Google Drive root folder. You can move\n the file afterwards within Google Drive.\n
\n
\n
\n \n
\n If no file name is supplied, the\n document title will be used.\n
\n
\n\n
\n \n
\n
\n \n
\n
\n \n
\n
\n \n
\n
\n
\n
\n
\n
\n
\n
\n (?)\n
\n
\n
\n
\n
\n
\n \n
\n
\n
\n
\n
\n

Tip: You can use a\n YAML front matter to specify the title and the tags/labels of your publication.

\n

Interpreted variables: title, tags, published, date.

\n
\n
\n

Tip: You can use a\n YAML front matter to specify the title of your page.

\n

Interpreted variables: title.

\n
\n
\n

About URL: For newly created page , Blogger API will append a generated number to the url like about-me-1234.html, if you deeply care about your URL naming, you should first create the page on Blogger and then update them with StackEdit specifying the pageId when publishing.\n

\n

About page visibility: Blogger API does not respect published status for pages.When publishing the page to Blogger, the page will be live but not added to the page listing. You should arrange the page listing from Blogger dashboard.\n

\n
\n
\n
\n Cancel\n OK\n
\n
\n \n\n\n\n
\n
\n
\n\n
\n \n

Publication

\n
\n
\n

\n "" is published on the following\n location(s):\n

\n
\n
\n Note: Removing a publish location will not delete the actual publication.\n
\n
\n
\n Close\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Sharing

\n
\n
\n

\n "" can be shared using the following link(s):\n

\n \n

No sharing link yet!\n

\n

To collaborate on this document, use Google Drive\n or Dropbox synchronization from the menu.\n

\n

To share a frozen version of this document within StackEdit, just publish it as a Gist in\n Markdown format from the menu.\n

\n
\n Tip: You can open any URL within StackEdit using viewer#!url=.\n
\n
\n
\n Close\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n \n

Settings

\n \n
\n
\n\n
\n
\n
\n
\n \n
\n
\n \n
\n
\n \n
\n
\n
\n
\n \n
\n \n
\n
\n
\n
\n
\n
\n \n
\n
\n
\n
\n
\n
\n
\n \n
\n
\n
\n
\n \n
\n \n Please sign in first with Google. Once linked with your Google accounts, changing account is not possible unless you reset the application.\n
\n
\n
\n
\n
\n
\n
\n \n
\n
\n \n
\n
\n \n
\n
\n
\n
\n \n
\n
\n \n
\n
\n \n
\n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n
\n \n
\n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n
\n Existing authorization has to be revoked in\n Google Dashboard\n for this change to take effect.\n
\n
\n
\n
\n
\n
\n
\n If unchecked, access will be restricted to folder\n /Applications/StackEdit for existing files.\n
\n
\n
\n
\n
\n
\n
\n Existing authorization has to be revoked in\n GitHub settings\n for this change to take effect.\n
\n
\n
\n
\n \n
\n \n
\n
\n
\n \n
\n \n
\n
\n
\n
\n \n \n
\n\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n

Ooops...

\n
\n
\n

StackEdit has stopped because another instance was running in\n the same browser.

\n
If you want to reopen StackEdit, click on\n "Reload".
\n
\n
\n Reload\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n

Redirection

\n
\n
\n

\n
Please click OK to proceed.
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n

Reset application

\n
\n
\n

This will delete all your local documents.

\n
Are you sure?
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n

Import documents and settings

\n
\n
\n

This will delete all existing local documents.

\n
Are you sure?
\n
\n
\n Cancel\n OK\n
\n
\n
\n
\n\n\n
\n
\n
\n\n
\n

Add Google Drive account

\n
\n
\n

To perform this request, you need to configure another Google Drive account in StackEdit.

\n
Do you want to proceed?
\n
\n
\n No\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
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n
\n \n
\n
\n
\n
\n\n
\n \n
\n\n\n
\n \n
\n
\n \n
\n
\n
\n
\n
\n
\n
\n
\n
\n\n
\n
\n
\n\n
\n

Ooops...

\n
\n
\n

StackEdit has stopped because another instance was running in\n the same browser.

\n
If you want to reopen StackEdit, click on\n "Reload".
\n
\n
\n Reload\n
\n
\n
\n
\n' }), define("text!html/tooltipSettingsTemplate.html", [], function() { @@ -25484,6 +25504,229 @@ function() { return i.addListener("onUserActive", function() { p = !0 }), i.addListener("onPeriodicRun", o), r +}), define("helpers/teamserverHelper", ["underscore", "jquery", "constants", "core", "utils", "storage", "logger", "eventMgr", "classes/AsyncTask"], function(e, t, n, i, r, o, a, s, l) { + function c(e) { + e.onRun(function() { + return m === !0 ? (p = !1, e.error(new Error("Operation not available in offline mode.|stopPublish"))) : p === !0 ? e.chain() : void t.ajax({ + url: n.TEAM_SERVER_URL + "ping", + timeout: n.AJAX_TIMEOUT + }).done(function() { + e.chain() + }).fail(function(t) { + var n = { + code: t.status, + message: t.statusText + }; + d(n, e) + }) + }) + } + + function u(e) { + e.onRun(function() { + return h === !0 ? e.chain() : void 0 + }) + } + + function d(e, t) { + var n; + if(e) + if(a.error(e), "string" == typeof e) n = e; + else { + if(n = "Google error (" + e.code + ": " + e.message + ").", e.code >= 500 && e.code < 600) return t.retry(new Error(n)); + if(401 === e.code || 403 === e.code) return h = !1, t.retry(new Error(n), 1); + (0 === e.code || -1 === e.code) && (p = !1, n = "|stopPublish") + } + t.error(new Error(n)) + } + var p = !1, + h = !0, + f = {}, m = !1; + s.addListener("onOfflineChanged", function(e) { + m = e + }), f.upload = function(e, i, r, o, a) { + var s, p = new l; + c(p), u(p), p.onRun(function() { + var a = n.TEAM_SERVER_URL + "repo/" + e + "/document", + l = "POST"; + i && (a += "/" + i, l = "PUT"), t.ajax({ + url: a, + type: l, + data: { + title: r, + content: o + }, + dataType: "json", + timeout: n.AJAX_TIMEOUT + }).done(function(e) { + s = e, p.chain() + }).fail(function(e) { + var t = { + code: e.status, + message: e.statusText + }; + 404 === t.code && (t = 'File ID "' + i + '" not found on the Team Server.'), d(t, p) + }) + }), p.onSuccess(function() { + a(void 0, s) + }), p.onError(function(e) { + a(e) + }), p.enqueue() + }, f.checkChanges = function(e, i, r) { + var o, a = i, + s = new l; + c(s), u(s), s.onRun(function() { + var r = n.TEAM_SERVER_URL + "repo/" + e + "/changes/", + l = "GET"; + i && (r += i), t.ajax({ + url: r, + type: l, + dataType: "json", + timeout: n.AJAX_TIMEOUT + }).done(function(e) { + a = e.newChangeId, o = e.changes, s.chain() + }).fail(function(e) { + var t = { + code: e.status, + message: e.statusText + }; + d(t, s) + }) + }), s.onSuccess(function() { + r(void 0, o, a) + }), s.onError(function(e) { + r(e) + }), s.enqueue() + }, f.download = function(e, i, r) { + var o = [], + a = new l; + c(a), u(a), a.onRun(function() { + function r() { + if(0 === i.length) return a.chain(); + var s = i[0], + l = n.TEAM_SERVER_URL + "repo/" + e + "/document/" + s; + t.ajax({ + url: l, + dataType: "json", + timeout: n.AJAX_TIMEOUT + }).done(function(e) { + o.push(e), i.shift(), a.chain(r) + }).fail(function(e) { + var t = { + code: e.status, + message: e.statusText + }; + 404 === t.code && (t = 'File ID "' + s + '" not found on the Team Server.'), d(t, a) + }) + } + a.chain(r) + }), a.onSuccess(function() { + r(void 0, o) + }), a.onError(function(e) { + r(e) + }), a.enqueue() + }; + var g = t(window), + v = window.location.protocol + "//" + window.location.host; + return f.picker = function(e, t) { + function i() { + void 0 !== o && (o.removeIframe(), g.off("message.teamserver")) + } + var o, a = [], + s = new l; + s.timeout = n.ASYNC_TASK_LONG_TIMEOUT, c(s), s.onRun(function() { + o = r.iframe(n.TEAM_SERVER_URL + "teamserver.html#/documentPicker", 550, 500), g.on("message.teamserver", function(e) { + e = e.originalEvent, e.origin == v && "DocumentPickerFinished" == e.data.status && (a = e.data.documents || [], i(), s.chain()) + }) + }), s.onSuccess(function() { + t(void 0, a) + }), s.onError(function(e) { + i(), t(e) + }), s.enqueue() + }, f +}), define("providers/teamserverProviderBuilder", ["jquery", "underscore", "constants", "utils", "storage", "logger", "classes/Provider", "settings", "eventMgr", "fileMgr", "editor", "helpers/teamserverHelper"], function(e, t, n, i, r, o, a, s, l, c, u, d) { + return function(e, n) { + function o(t) { + return "sync." + e + "." + t + } + + function u(e, t, n, r, a) { + a = a || "{}"; + var s = {}; + return s.provider = f, s.id = e, s.sha = t, s.contentCRC = i.crc32(n), s.titleCRC = i.crc32(r), s.discussionListCRC = i.crc32(a), s.syncIndex = o(e), m === !0 && (s.content = n, s.title = r, s.discussionList = a), s + } + + function p(e) { + d.download(h, e, function(e, n) { + if(!e) { + var i, r = []; + t.each(n, function(e) { + var t, n = f.parseContent(e.content), + o = u(e.id, e.sha, n.content, e.title, n.discussionListJSON); + t = {}, t[o.syncIndex] = o, i = c.createFile(e.title, n.content, n.discussionListJSON, t), r.push(i) + }), void 0 !== i && (l.onSyncImportSuccess(r, f), c.selectFile(i)) + } + }) + } + var h = "test", + f = new a(e, n), + m = "merge" == s.conflictMode; + return f.importFiles = function() { + d.picker(h, function(e, n) { + if(!e && 0 !== n.length) { + var i = []; + t.each(n, function(e) { + var t = o(e.id), + n = c.getFileFromSyncIndex(t); + return void 0 !== n ? void l.onError('"' + n.title + '" was already imported.') : void i.push(e.id) + }), p(i) + } + }) + }, f.exportFile = function(e, t, n, i, r) { + var o = f.serializeContent(n, i); + d.upload(h, void 0, t, o, function(e, o) { + if(e) return r(e); + var a = u(o.id, o.sha, n, t, i); + r(void 0, a) + }) + }, f.syncUp = function(e, t, n, i, r, o, a, s) { + if(a.contentCRC == t && a.titleCRC == i && a.discussionListCRC == o) return s(void 0, !1); + var l = f.serializeContent(e, r); + d.upload(h, a.id, n, l, function(l, c) { + return l ? void s(l, !0) : (a.etag = c.etag, m === !0 && (a.content = e, a.title = n, a.discussionList = r), a.contentCRC = t, a.titleCRC = i, a.discussionListCRC = o, void s(void 0, !0)) + }) + }, f.syncDown = function(e) { + var a = parseInt(r["teamserver.lastChangeId"], 10); + d.checkChanges(h, a, function(a, s, u) { + if(a) return e(a); + var p = []; + t.each(s, function(e, t) { + var n = o(t), + i = c.getFileFromSyncIndex(n), + r = i && i.syncLocations[n]; + return r ? (e.fileDesc = i, e.syncAttributes = r, e.deleted === !0 ? void p.push(e) : void(r.sha != e.sha && p.push(e))) : void 0 + }), d.download(h, p, function(t, o) { + function a() { + if(0 === o.length) return r["teamserver.lastChangeId"] = u, e(); + var t = o.pop(), + s = t.fileDesc, + c = t.syncAttributes; + if(t.deleted === !0) return l.onError('"' + s.title + '" has been removed from ' + n + "."), s.removeSyncLocation(c), l.onSyncRemoved(s, c); + var d = f.parseContent(t.content), + p = d.content, + h = t.title, + g = d.discussionListJSON, + v = d.discussionList, + b = f.syncMerge(s, c, p, h, v, g); + c.sha = t.sha, m === !0 && (c.content = p, c.title = h, c.discussionList = g), c.contentCRC = b.contentCRC, c.titleCRC = b.titleCRC, c.discussionListCRC = b.discussionListCRC, i.storeAttributes(c), setTimeout(a, 5) + } + return t ? e(t) : void setTimeout(a, 5) + }) + }) + }, f + } +}), define("providers/teamserverProvider", ["providers/teamserverProviderBuilder"], function(e) { + return e("teamserver", "Team Server") }), define("helpers/dropboxHelper", ["jquery", "underscore", "constants", "core", "utils", "storage", "logger", "settings", "eventMgr", "classes/AsyncTask"], function(e, t, n, i, r, o, a, s, l, c) { function u(t) { t.onRun(function() { @@ -25789,7 +26032,7 @@ function() { function d(e) { e.onRun(function() { - return y === !0 ? (g = !1, void e.error(new Error("Operation not available in offline mode.|stopPublish"))) : g === !0 ? void e.chain() : (window.delayedFunction = function() { + return y === !0 ? (g = !1, e.error(new Error("Operation not available in offline mode.|stopPublish"))) : g === !0 ? e.chain() : (window.delayedFunction = function() { gapi.load("client", function() { gapi.client.load("drive", "v2", function() { g = !0, e.chain() @@ -25832,7 +26075,7 @@ function() { } function l() { - if(m > 5) return void i.error(new Error("Unable to authenticate user " + s.getUserId() + ", please sign in with Google.")); + if(m > 5) return i.error(new Error("Unable to authenticate user " + s.getUserId() + ", please sign in with Google.")); p === !1 && (i.timeout = n.ASYNC_TASK_LONG_TIMEOUT); var t = e.chain(x).pick(s.getListWithNew(o)).flatten().value(); gapi.auth.authorize({ @@ -25846,7 +26089,7 @@ function() { } function c() { - return p === !0 ? void i.chain(l) : void r.redirectConfirm("You are being redirected to Google authorization page.", function() { + return p === !0 ? i.chain(l) : void r.redirectConfirm("You are being redirected to Google authorization page.", function() { i.chain(l) }, function() { i.error(new Error("Operation canceled.")) @@ -25873,10 +26116,10 @@ function() { if(t) if(a.error(t), "string" == typeof t) r = t; else { - if(r = "Google error (" + t.code + ": " + t.message + ").", t.code >= 500 && t.code < 600) return void n.retry(new Error(r)); + if(r = "Google error (" + t.code + ": " + t.message + ").", t.code >= 500 && t.code < 600) return n.retry(new Error(r)); if(401 === t.code || 403 === t.code || "token_refresh_required" == t.code) return e.each(v, function(e) { e.setRefreshFlag() - }), r = "Access to Google account is not authorized.", void n.retry(new Error(r), 1); + }), r = "Access to Google account is not authorized.", n.retry(new Error(r), 1); (0 === t.code || -1 === t.code) && (g = !1, e.each(v, function(e) { e.setRefreshFlag() }), i.setOffline(), r = "|stopPublish") @@ -25886,7 +26129,7 @@ function() { function m(e) { e.onRun(function() { - return w === !0 ? void e.chain() : void t.ajax({ + return w === !0 ? e.chain() : void t.ajax({ url: "//www.google.com/jsapi", data: { key: n.GOOGLE_API_KEY @@ -25957,7 +26200,7 @@ function() { body: w }); t.execute(function(t) { - if(t && t.id) return g = t, g.content = i, void v.chain(); + if(t && t.id) return g = t, g.content = i, v.chain(); 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 && (o.removeItem(u + ".gdrive.lastChangeId"), n = 'Conflict on file ID "' + e + '". Please restart the synchronization.')), f(n, v) }) @@ -25979,7 +26222,7 @@ function() { resource: i }); t.execute(function(t) { - if(t && t.id) return r = t, void o.chain(); + if(t && t.id) return r = t, o.chain(); 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, o) }) @@ -26002,7 +26245,7 @@ function() { } : { pageToken: n }), t.execute(function(t) { - return t && t.largestChangeId ? (r = t.largestChangeId, n = t.nextPageToken, void 0 !== t.items && (i = i.concat(t.items)), void(void 0 !== n ? o.chain(e) : o.chain())) : void f(t.error, o) + return t && t.largestChangeId ? (r = t.largestChangeId, n = t.nextPageToken, void 0 !== t.items && (i = i.concat(t.items)), void(void 0 !== n ? o.chain(e) : o.chain())) : f(t.error, o) }) }) } @@ -26018,7 +26261,7 @@ function() { s = new c; d(s), o || p(s, "gdrive", i), s.onRun(function() { function r() { - if(0 === e.length) return void s.chain(); + if(0 === e.length) return s.chain(); var o = e[0], l = {}, c = v[i]; c && c.token && (l.Authorization = "Bearer " + c.token.access_token), t.ajax({ @@ -26050,11 +26293,11 @@ function() { s = new c; s.timeout = n.ASYNC_TASK_LONG_TIMEOUT, d(s), o || p(s, "gdrive", i), s.onRun(function() { function r() { - if(0 === e.length) return void s.chain(); + if(0 === e.length) return s.chain(); var o = e[0]; a.push(o); var l; - if("drive#file" == o.kind ? l = o : "drive#change" == o.kind && (l = o.file), !l) return e.shift(), void s.chain(r); + if("drive#file" == o.kind ? l = o : "drive#change" == o.kind && (l = o.file), !l) return e.shift(), s.chain(r); var c = l.downloadUrl; 0 === l.mimeType.indexOf("application/vnd.google-apps.drive-sdk") && (l.isRealtime = !0, c = "https://www.googleapis.com/drive/v2/files/" + l.id + "/realtime"); var u = {}, d = v[i]; @@ -26128,7 +26371,7 @@ function() { 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), e && e.token && c.setOAuthToken(e.token.access_token)), 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), a(), u.chain()) - }), s = c.build(), t(r.createBackdrop()).click(function() { + }), s = c.build(), t(r.createBackdrop()).on("click.backdrop", function() { a(), u.chain() }), s.setVisible(!0) }), u.onSuccess(function() { @@ -26324,7 +26567,7 @@ function() { t.each(n, function(e) { var t = m(e.id), n = c.getFileFromSyncIndex(t); - return void 0 !== n ? void l.onError('"' + n.title + '" was already imported.') : void i.push(e.id) + return void 0 !== n ? l.onError('"' + n.title + '" was already imported.') : void i.push(e.id) }), v(i) } }, "doc", b) @@ -26333,12 +26576,12 @@ function() { if(s) { var u = m(s), p = c.getFileFromSyncIndex(u); - if(void 0 !== p) return l.onError('File ID is already synchronized with "' + p.title + '".'), void a(!0) + if(void 0 !== p) return l.onError('File ID is already synchronized with "' + p.title + '".'), a(!0) } var h = i.getInputTextValue("#input-sync-export-" + o + "-parentid"), f = y.serializeContent(n, r); d.upload(s, h, t, f, void 0, void 0, b, function(e, i) { - if(e) return void a(e); + if(e) return a(e); var o = g(i.id, i.etag, n, t, r); a(void 0, o) }) @@ -26350,12 +26593,12 @@ function() { } var p = y.serializeContent(e, r); d.upload(a.id, void 0, n, p, void 0, a.etag, b, function(l, c) { - return l ? void s(l, !0) : (a.etag = c.etag, delete a.isRealtime, x === !0 && (a.content = e, a.title = n, a.discussionList = r), a.contentCRC = t, a.titleCRC = i, a.discussionListCRC = o, void s(void 0, !0)) + return l ? s(l, !0) : (a.etag = c.etag, delete a.isRealtime, x === !0 && (a.content = e, a.title = n, a.discussionList = r), a.contentCRC = t, a.titleCRC = i, a.discussionListCRC = o, void s(void 0, !0)) }) }, y.syncDown = function(e) { var n = parseInt(r[b + ".gdrive.lastChangeId"], 10); d.checkChanges(n, b, function(n, o, a) { - if(n) return void e(n); + if(n) return e(n); var s = []; t.each(o, function(e) { var t = m(e.fileId), @@ -26455,7 +26698,7 @@ function() { return e("gdrivesec", "Google Drive (2nd account)", 1) }), define("providers/gdriveterProvider", ["providers/gdriveProviderBuilder"], function(e) { return e("gdriveter", "Google Drive (3rd account)", 2) -}), define("synchronizer", ["jquery", "underscore", "utils", "storage", "eventMgr", "fileSystem", "fileMgr", "classes/Provider", "providers/dropboxProvider", "providers/gdriveProvider", "providers/gdrivesecProvider", "providers/gdriveterProvider"], function(e, t, n, i, r, o, a, s) { +}), define("synchronizer", ["jquery", "underscore", "utils", "storage", "eventMgr", "fileSystem", "fileMgr", "classes/Provider", "providers/teamserverProvider", "providers/dropboxProvider", "providers/gdriveProvider", "providers/gdrivesecProvider", "providers/gdriveterProvider"], function(e, t, n, i, r, o, a, s) { function l(e) { function i() { function o() { diff --git a/public/res-min/themes/base.css b/public/res-min/themes/base.css index f9ac75c9..d7506c54 100644 --- a/public/res-min/themes/base.css +++ b/public/res-min/themes/base.css @@ -1221,7 +1221,7 @@ h3{font-size:1.7em} h4{font-size:1.25em} h5{font-size:1em} h6{font-size:.85em} -h1,h2,h3,h4,h5,h6{margin:1.3em 0} +h1,h2,h3,h4,h5,h6{margin:1.3em 0;font-weight:300} pre{word-break:break-word} p,pre,pre.prettyprint,blockquote{margin:0 0 1.1em} hr{margin:2em 0} diff --git a/public/res-min/themes/default.css b/public/res-min/themes/default.css index 3ab9618f..3e22fa2d 100644 --- a/public/res-min/themes/default.css +++ b/public/res-min/themes/default.css @@ -65,8 +65,8 @@ small,.small{font-size:85%} cite{font-style:normal} .text-muted{color:#999} .text-primary{color:#428bca}.text-primary:hover{color:#3071a9} -.text-warning{color:#b88a00}.text-warning:hover{color:#856400} -.text-danger{color:#a94100}.text-danger:hover{color:#762d00} +.text-warning{color:#b87e00}.text-warning:hover{color:#855b00} +.text-danger{color:#a93600}.text-danger:hover{color:#762500} .text-success{color:#3c763d}.text-success:hover{color:#2b542c} .text-info{color:#31708f}.text-info:hover{color:#245269} .text-left{text-align:left} @@ -174,10 +174,10 @@ table td[class*="col-"],table th[class*="col-"]{float:none;display:table-cell} .table-hover>tbody>tr>.active:hover,.table-hover>tbody>.active:hover>td,.table-hover>tbody>.active:hover>th{background-color:#e8e8e8} .table>thead>tr>.success,.table>tbody>tr>.success,.table>tfoot>tr>.success,.table>thead>.success>td,.table>tbody>.success>td,.table>tfoot>.success>td,.table>thead>.success>th,.table>tbody>.success>th,.table>tfoot>.success>th{background-color:#dff0d8} .table-hover>tbody>tr>.success:hover,.table-hover>tbody>.success:hover>td,.table-hover>tbody>.success:hover>th{background-color:#d0e9c6} -.table>thead>tr>.danger,.table>tbody>tr>.danger,.table>tfoot>tr>.danger,.table>thead>.danger>td,.table>tbody>.danger>td,.table>tfoot>.danger>td,.table>thead>.danger>th,.table>tbody>.danger>th,.table>tfoot>.danger>th{background-color:rgba(255,101,6,0.1)} -.table-hover>tbody>tr>.danger:hover,.table-hover>tbody>.danger:hover>td,.table-hover>tbody>.danger:hover>th{background-color:rgba(235,90,0,0.1)} -.table>thead>tr>.warning,.table>tbody>tr>.warning,.table>tfoot>tr>.warning,.table>thead>.warning>td,.table>tbody>.warning>td,.table>tfoot>.warning>td,.table>thead>.warning>th,.table>tbody>.warning>th,.table>tfoot>.warning>th{background-color:rgba(255,192,0,0.12)} -.table-hover>tbody>tr>.warning:hover,.table-hover>tbody>.warning:hover>td,.table-hover>tbody>.warning:hover>th{background-color:rgba(230,172,0,0.12)} +.table>thead>tr>.danger,.table>tbody>tr>.danger,.table>tfoot>tr>.danger,.table>thead>.danger>td,.table>tbody>.danger>td,.table>tfoot>.danger>td,.table>thead>.danger>th,.table>tbody>.danger>th,.table>tfoot>.danger>th{background-color:rgba(255,85,6,0.1)} +.table-hover>tbody>tr>.danger:hover,.table-hover>tbody>.danger:hover>td,.table-hover>tbody>.danger:hover>th{background-color:rgba(235,75,0,0.1)} +.table>thead>tr>.warning,.table>tbody>tr>.warning,.table>tfoot>tr>.warning,.table>thead>.warning>td,.table>tbody>.warning>td,.table>tfoot>.warning>td,.table>thead>.warning>th,.table>tbody>.warning>th,.table>tfoot>.warning>th{background-color:rgba(255,174,0,0.12)} +.table-hover>tbody>tr>.warning:hover,.table-hover>tbody>.warning:hover>td,.table-hover>tbody>.warning:hover>th{background-color:rgba(230,157,0,0.12)} @media (max-width:767px){.table-responsive{width:100%;margin-bottom:15.75px;overflow-y:hidden;overflow-x:scroll;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd;-webkit-overflow-scrolling:touch}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap} .table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0} .table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0} .table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0} legend{display:block;width:100%;padding:0;margin-bottom:21px;font-size:22.5px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5} label{display:inline-block;margin-bottom:5px;font-weight:bold} @@ -208,12 +208,12 @@ input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled], textarea.input-sm{height:auto} .input-lg{height:48px;padding:10px 16px;font-size:19px;line-height:1.33;border-radius:6px}select.input-lg{height:48px;line-height:48px} textarea.input-lg{height:auto} -.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#b88a00} -.has-warning .form-control{border-color:#b88a00;-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)}.has-warning .form-control:focus{border-color:#856400;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ffc71f;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ffc71f} -.has-warning .input-group-addon{color:#b88a00;border-color:#b88a00;background-color:rgba(255,192,0,0.12)} -.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a94100} -.has-error .form-control{border-color:#a94100;-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)}.has-error .form-control:focus{border-color:#762d00;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ff6c10;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ff6c10} -.has-error .input-group-addon{color:#a94100;border-color:#a94100;background-color:rgba(255,101,6,0.1)} +.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#b87e00} +.has-warning .form-control{border-color:#b87e00;-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)}.has-warning .form-control:focus{border-color:#855b00;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ffb81f;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ffb81f} +.has-warning .input-group-addon{color:#b87e00;border-color:#b87e00;background-color:rgba(255,174,0,0.12)} +.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a93600} +.has-error .form-control{border-color:#a93600;-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)}.has-error .form-control:focus{border-color:#762500;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ff5c10;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ff5c10} +.has-error .input-group-addon{color:#a93600;border-color:#a93600;background-color:rgba(255,85,6,0.1)} .has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline{color:#3c763d} .has-success .form-control{border-color:#3c763d;-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)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168} .has-success .input-group-addon{color:#3c763d;border-color:#3c763d;background-color:#dff0d8} @@ -679,8 +679,8 @@ textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon .label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9} .label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44} .label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5} -.label-warning{background-color:#ebb000}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#b88a00} -.label-danger{background-color:#f15c00}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#be4900} +.label-warning{background-color:#eba100}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#b87e00} +.label-danger{background-color:#f14c00}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#be3c00} .badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:13px;font-weight:bold;color:#fff;line-height:1;vertical-align:baseline;white-space:nowrap;text-align:center;background-color:#999;border-radius:10px}.badge:empty{display:none} .btn .badge{position:relative;top:-1px} a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer} @@ -703,10 +703,10 @@ a.thumbnail:hover,a.thumbnail:focus,a.thumbnail.active{border-color:#1980e6} .alert-success .alert-link{color:#2b542c} .alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#31708f}.alert-info hr{border-top-color:#a6e1ec} .alert-info .alert-link{color:#245269} -.alert-warning{background-color:rgba(255,192,0,0.12);border-color:rgba(255,192,0,0.24);color:#b88a00}.alert-warning hr{border-top-color:rgba(230,172,0,0.24)} -.alert-warning .alert-link{color:#856400} -.alert-danger{background-color:rgba(255,101,6,0.1);border-color:rgba(255,101,6,0.2);color:#a94100}.alert-danger hr{border-top-color:rgba(235,90,0,0.2)} -.alert-danger .alert-link{color:#762d00} +.alert-warning{background-color:rgba(255,174,0,0.12);border-color:rgba(255,174,0,0.24);color:#b87e00}.alert-warning hr{border-top-color:rgba(230,157,0,0.24)} +.alert-warning .alert-link{color:#855b00} +.alert-danger{background-color:rgba(255,85,6,0.1);border-color:rgba(255,85,6,0.2);color:#a93600}.alert-danger hr{border-top-color:rgba(235,75,0,0.2)} +.alert-danger .alert-link{color:#762500} @-webkit-keyframes progress-bar-stripes{from{background-position:40px 0} to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0} to{background-position:0 0}}.progress{overflow:hidden;height:21px;margin-bottom:21px;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)} .progress-bar{float:left;width:0%;height:100%;font-size:13px;line-height:21px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-transition:width .6s ease;transition:width .6s ease} .progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-size:40px 40px} @@ -761,10 +761,10 @@ a.list-group-item.active .list-group-item-text,a.list-group-item.active:hover .l .panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#428bca} .panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#d6e9c6} .panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#d6e9c6} -.panel-warning{border-color:rgba(255,192,0,0.24)}.panel-warning>.panel-heading{color:#b88a00;background-color:rgba(255,192,0,0.12);border-color:rgba(255,192,0,0.24)}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:rgba(255,192,0,0.24)} -.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:rgba(255,192,0,0.24)} -.panel-danger{border-color:rgba(255,101,6,0.2)}.panel-danger>.panel-heading{color:#a94100;background-color:rgba(255,101,6,0.1);border-color:rgba(255,101,6,0.2)}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:rgba(255,101,6,0.2)} -.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:rgba(255,101,6,0.2)} +.panel-warning{border-color:rgba(255,174,0,0.24)}.panel-warning>.panel-heading{color:#b87e00;background-color:rgba(255,174,0,0.12);border-color:rgba(255,174,0,0.24)}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:rgba(255,174,0,0.24)} +.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:rgba(255,174,0,0.24)} +.panel-danger{border-color:rgba(255,85,6,0.2)}.panel-danger>.panel-heading{color:#a93600;background-color:rgba(255,85,6,0.1);border-color:rgba(255,85,6,0.2)}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:rgba(255,85,6,0.2)} +.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:rgba(255,85,6,0.2)} .panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse .panel-body{border-top-color:#bce8f1} .panel-info>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#bce8f1} .well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)} @@ -1236,7 +1236,7 @@ h3{font-size:1.7em} h4{font-size:1.25em} h5{font-size:1em} h6{font-size:.85em} -h1,h2,h3,h4,h5,h6{margin:1.3em 0} +h1,h2,h3,h4,h5,h6{margin:1.3em 0;font-weight:300} pre{word-break:break-word} p,pre,pre.prettyprint,blockquote{margin:0 0 1.1em} hr{margin:2em 0} @@ -1311,17 +1311,20 @@ div.jGrowl div.jGrowl-closer{padding-top:4px;padding-bottom:4px;cursor:pointer;f .dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{border-color:transparent} .collapsed>.icon-up-dir:before{content:'\e94d'} .modal.fade .modal-dialog{-webkit-transform:translate(0, 0);-ms-transform:translate(0, 0);transform:translate(0, 0)} -.modal .modal-content{background-color:#f6f7f9} -.modal .modal-body{background-color:#fff;padding-bottom:30px} -.modal .modal-footer{margin-top:0} +.modal-content{background-color:#f6f7f9} +.modal-body{background-color:#fff;padding-bottom:30px} +.modal-footer{background-color:#f6f7f9;margin-top:0} +.modal-iframe{display:block;margin:30px auto 0;z-index:1040;border-radius: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} .nav-pills>li>a{border:1px solid rgba(0,0,0,0)}.nav-pills>li>a:hover,.nav-pills>li>a:focus{color:#036;border-color:rgba(0,128,255,0.1)} .nav-pills>li.open>a .caret,.nav-pills>li>a:hover .caret,.nav-pills>li>a:focus .caret{border-top-color:#036;border-bottom-color:#036} .nav-pills>li.disabled>a:hover,.nav-pills>li.disabled>a:focus{border-color:rgba(0,0,0,0)} .nav-pills>li.open>a,.nav-pills>li.open>a:hover,.nav-pills>li.open>a:focus{color:#036;border-color:rgba(0,128,255,0.1)} -.list-group-item{padding:10px 15px;margin-bottom:0}.list-group .list-group-item{border-radius:0} -a.list-group-item:hover,a.list-group-item:focus{color:#036;border-top-color:rgba(0,128,255,0.1);border-bottom-color:rgba(0,128,255,0.1)} -.text-danger:hover{color:#a94100} +.list-group-item{padding:10px 15px;border-left-width:0;border-right-width:0;margin-bottom:0}.list-group .list-group-item{border-radius:0} +a.list-group-item:hover,a.list-group-item:focus{color:#036;border-color:rgba(0,128,255,0.1)} +.list-group-item .checkbox{float:right;margin:0;padding:0;cursor:pointer}.list-group-item .checkbox input{cursor:pointer;margin:0 16px;height:38px} +.form-group{margin-bottom:1px;padding:5px} +.text-danger:hover{color:#a93600} .bring-to-front{z-index:1050 !important} .dialog-header-message{position:absolute;top:12px;right:55px;font-weight:bold} .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} @@ -1357,8 +1360,8 @@ a.list-group-item:hover,a.list-group-item:focus{color:#036;border-top-color:rgba .navbar .nav.pull-right{float:right}.navbar .nav.pull-right>li>.dropdown-menu{right:0;left:auto}.navbar .nav.pull-right>li>.dropdown-menu .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0} .navbar .btn{height:38px;padding:6px 8px} .navbar .btn-group>.btn.disabled *,.navbar .btn-group>.btn.blocked *,.navbar .btn-group>.btn[disabled] *{color:rgba(45,64,83,0.3)} -.navbar .button-open-discussion.some{color:#e0a900} -.navbar .button-open-discussion.replied{color:#d25000} +.navbar .button-open-discussion.some{color:#e09a00} +.navbar .button-open-discussion.replied{color:#d24200} .navbar .file-title-navbar{display:inline-block;vertical-align:middle;padding:1px 15px;font-size:1.5em;line-height:1.4em;font-weight:200;overflow:hidden;white-space:nowrap} .navbar .input-file-title-container{display:inline-block;vertical-align:middle}.navbar .input-file-title-container .input-file-title{width:400px;font-size:16px;height:38px} .navbar .working-indicator{display:inline-block;vertical-align:middle;overflow:hidden;height:38px;width:60px;padding-top:8px}.navbar .working-indicator .bar{display:inline-block;width:14px;height:6px;border-radius:1px;margin:0 2px;opacity:0.25;background-color:#2d4053} @@ -1392,7 +1395,6 @@ a.list-group-item:hover,a.list-group-item:focus{color:#036;border-top-color:rgba .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} .modal-document-manager .folder{font-weight:bold;color:#425e7b;font-size:15px;border-top-color:#f2f5f8} -.modal-document-manager .checkbox{float:right;margin:0;padding:0;cursor:pointer}.modal-document-manager .checkbox input{cursor:pointer;margin:0 16px;height:38px} .modal-document-manager .input-rename{width:220px;height:38px} .modal-document-manager .name,.modal-document-manager .file-count{padding:9px 20px 9px 15px} .extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn,.extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn{border-radius:0} @@ -1432,13 +1434,13 @@ a.list-group-item:hover,a.list-group-item:focus{color:#036;border-top-color:rgba .layout-toggler.layout-toggler-navbar{line-height:0}.layout-toggler.layout-toggler-navbar i{font-size:16px;height:12px;overflow:hidden} @font-face{font-family:'PT Sans';font-style:normal;font-weight:400;src:local('PT Sans'),local('PTSans'),url("../font/PTSans-Regular-webfont.woff") format('woff')}@font-face{font-family:'PT Sans';font-style:normal;font-weight:700;src:local('PT Sans Bold'),local('PTSans-Bold'),url("../font/PTSans-Bold-webfont.woff") format('woff')}@font-face{font-family:'PT Sans';font-style:italic;font-weight:400;src:local('PT Sans Italic'),local('PTSans-Italic'),url("../font/PTSans-Italic-webfont.woff") format('woff')}@font-face{font-family:'PT Sans';font-style:italic;font-weight:700;src:local('PT Sans Bold Italic'),local('PTSans-BoldItalic'),url("../font/PTSans-BoldItalic-webfont.woff") format('woff')}#wmd-input{position:absolute;top:0;left:0;font-family:"PT Sans",sans-serif;line-height:1.65;letter-spacing:normal;border-radius:0;color:#47596b;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none;padding:0;background-color:#fff;overflow:auto;white-space:pre-wrap;word-wrap:break-word;word-break:normal}#wmd-input>.editor-content{padding-bottom:230px} #wmd-input>.editor-margin{position:absolute;top:0;left:0}#wmd-input>.editor-margin .discussion{font-size:17px;position:absolute;cursor:pointer}#wmd-input>.editor-margin .discussion.new{display:none}#wmd-input>.editor-margin .discussion.new:hover,#wmd-input>.editor-margin .discussion.new.active,#wmd-input>.editor-margin .discussion.new.active:hover{display:inline-block;color:rgba(102,128,153,0.35) !important} -#wmd-input>.editor-margin .discussion.added{color:rgba(235,176,0,0.5)}#wmd-input>.editor-margin .discussion.added:hover,#wmd-input>.editor-margin .discussion.added.active,#wmd-input>.editor-margin .discussion.added.active:hover{color:rgba(235,176,0,0.8) !important} -#wmd-input>.editor-margin .discussion.replied{color:rgba(241,92,0,0.7)}#wmd-input>.editor-margin .discussion.replied:hover,#wmd-input>.editor-margin .discussion.replied.active,#wmd-input>.editor-margin .discussion.replied.active:hover{color:#f15c00 !important} +#wmd-input>.editor-margin .discussion.added{color:rgba(235,161,0,0.5)}#wmd-input>.editor-margin .discussion.added:hover,#wmd-input>.editor-margin .discussion.added.active,#wmd-input>.editor-margin .discussion.added.active:hover{color:rgba(235,161,0,0.8) !important} +#wmd-input>.editor-margin .discussion.replied{color:rgba(241,76,0,0.7)}#wmd-input>.editor-margin .discussion.replied:hover,#wmd-input>.editor-margin .discussion.replied.active,#wmd-input>.editor-margin .discussion.replied.active:hover{color:#f14c00 !important} #wmd-input>.editor-margin .discussion.icon-split{font-size:22px}#wmd-input>.editor-margin .discussion.icon-split:before{margin-right:0} #wmd-input>.editor-margin .discussion:hover,#wmd-input>.editor-margin .discussion.active{text-decoration:none} #wmd-input.font-monospaced *{font-family:"Source Code Pro",monospace !important;line-height:1.65 !important;font-size:1em !important} -#wmd-input .comment-highlight{background-color:rgba(235,176,0,0.3)} -#wmd-input .conflict{font-weight:bold;color:#f15c00} +#wmd-input .comment-highlight{background-color:rgba(235,161,0,0.3)} +#wmd-input .conflict{font-weight:bold;color:#f14c00} #wmd-input .code,#wmd-input .pre{color:#29333d;font:normal .9em "Source Code Pro",monospace} #wmd-input .tag{color:#29333d;font:bold .9em "Source Code Pro",monospace}#wmd-input .tag .punctuation,#wmd-input .tag .attr-value,#wmd-input .tag .attr-name{font-weight:normal} #wmd-input .latex,#wmd-input .math{color:#668099} @@ -1485,7 +1487,7 @@ div.dropdown-menu .stat{margin:20px 0 10px} div.dropdown-menu i{margin-right:0} div.dropdown-menu textarea{width:250px;height:150px;resize:none} div.dropdown-menu a:hover,div.dropdown-menu a:focus{color:#0f4d8a} -div.dropdown-menu h1,div.dropdown-menu h2,div.dropdown-menu h3,div.dropdown-menu h4,div.dropdown-menu h5,div.dropdown-menu h6{margin:1em 0} +div.dropdown-menu h1,div.dropdown-menu h2,div.dropdown-menu h3,div.dropdown-menu h4,div.dropdown-menu h5,div.dropdown-menu h6{margin:0.8em 0} .btn-gittip{width:52px;height:25px} .title-icon-category{display:inline-block;opacity:.15;filter:alpha(opacity=15);margin-top:-2px;margin-left:-2px;margin-right:3px;font-size:1em;vertical-align:top}.file-title-navbar .title-icon-category{font-size:16px} .picker-dialog{z-index:1050 !important} @@ -1506,8 +1508,8 @@ input[type="file"]{line-height:inherit;height:inherit;border:none !important} .comments-popover .popover .popover-content .comment-block{margin-bottom:5px} .comments-popover .popover .popover-content .form-group,.comments-popover .popover .popover-content blockquote{margin-bottom:10px} .comments-popover .popover .popover-content .comment-author{font-weight:bold;color:#2c3f51} -.comments-popover .popover .popover-content .icon-comment{font-size:15px;color:rgba(235,176,0,0.6)} -.comments-popover .popover .popover-content .reply .icon-comment{color:rgba(241,92,0,0.7)} +.comments-popover .popover .popover-content .icon-comment{font-size:15px;color:rgba(235,161,0,0.6)} +.comments-popover .popover .popover-content .reply .icon-comment{color:rgba(241,76,0,0.7)} .comments-popover .popover .popover-content .new-comment-block .icon-comment{color:rgba(102,128,153,0.35)} .comments-popover .popover .popover-content .input-comment-author{border:none;background:none;-webkit-box-shadow:none;box-shadow:none;font-weight:bold;height:28px;padding:0 0 5px;width:140px;display:inline-block} .comments-popover .popover .popover-content hr{margin:0 0 10px} diff --git a/public/res-min/themes/gray.css b/public/res-min/themes/gray.css index e91fb01b..edb485b9 100644 --- a/public/res-min/themes/gray.css +++ b/public/res-min/themes/gray.css @@ -65,8 +65,8 @@ small,.small{font-size:85%} cite{font-style:normal} .text-muted{color:#999} .text-primary{color:#428bca}.text-primary:hover{color:#3071a9} -.text-warning{color:#b88a00}.text-warning:hover{color:#856400} -.text-danger{color:#a94100}.text-danger:hover{color:#762d00} +.text-warning{color:#b87e00}.text-warning:hover{color:#855b00} +.text-danger{color:#a93600}.text-danger:hover{color:#762500} .text-success{color:#3c763d}.text-success:hover{color:#2b542c} .text-info{color:#31708f}.text-info:hover{color:#245269} .text-left{text-align:left} @@ -174,10 +174,10 @@ table td[class*="col-"],table th[class*="col-"]{float:none;display:table-cell} .table-hover>tbody>tr>.active:hover,.table-hover>tbody>.active:hover>td,.table-hover>tbody>.active:hover>th{background-color:#e8e8e8} .table>thead>tr>.success,.table>tbody>tr>.success,.table>tfoot>tr>.success,.table>thead>.success>td,.table>tbody>.success>td,.table>tfoot>.success>td,.table>thead>.success>th,.table>tbody>.success>th,.table>tfoot>.success>th{background-color:#dff0d8} .table-hover>tbody>tr>.success:hover,.table-hover>tbody>.success:hover>td,.table-hover>tbody>.success:hover>th{background-color:#d0e9c6} -.table>thead>tr>.danger,.table>tbody>tr>.danger,.table>tfoot>tr>.danger,.table>thead>.danger>td,.table>tbody>.danger>td,.table>tfoot>.danger>td,.table>thead>.danger>th,.table>tbody>.danger>th,.table>tfoot>.danger>th{background-color:rgba(255,101,6,0.1)} -.table-hover>tbody>tr>.danger:hover,.table-hover>tbody>.danger:hover>td,.table-hover>tbody>.danger:hover>th{background-color:rgba(235,90,0,0.1)} -.table>thead>tr>.warning,.table>tbody>tr>.warning,.table>tfoot>tr>.warning,.table>thead>.warning>td,.table>tbody>.warning>td,.table>tfoot>.warning>td,.table>thead>.warning>th,.table>tbody>.warning>th,.table>tfoot>.warning>th{background-color:rgba(255,192,0,0.12)} -.table-hover>tbody>tr>.warning:hover,.table-hover>tbody>.warning:hover>td,.table-hover>tbody>.warning:hover>th{background-color:rgba(230,172,0,0.12)} +.table>thead>tr>.danger,.table>tbody>tr>.danger,.table>tfoot>tr>.danger,.table>thead>.danger>td,.table>tbody>.danger>td,.table>tfoot>.danger>td,.table>thead>.danger>th,.table>tbody>.danger>th,.table>tfoot>.danger>th{background-color:rgba(255,85,6,0.1)} +.table-hover>tbody>tr>.danger:hover,.table-hover>tbody>.danger:hover>td,.table-hover>tbody>.danger:hover>th{background-color:rgba(235,75,0,0.1)} +.table>thead>tr>.warning,.table>tbody>tr>.warning,.table>tfoot>tr>.warning,.table>thead>.warning>td,.table>tbody>.warning>td,.table>tfoot>.warning>td,.table>thead>.warning>th,.table>tbody>.warning>th,.table>tfoot>.warning>th{background-color:rgba(255,174,0,0.12)} +.table-hover>tbody>tr>.warning:hover,.table-hover>tbody>.warning:hover>td,.table-hover>tbody>.warning:hover>th{background-color:rgba(230,157,0,0.12)} @media (max-width:767px){.table-responsive{width:100%;margin-bottom:15.75px;overflow-y:hidden;overflow-x:scroll;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd;-webkit-overflow-scrolling:touch}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap} .table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0} .table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0} .table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0} legend{display:block;width:100%;padding:0;margin-bottom:21px;font-size:22.5px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5} label{display:inline-block;margin-bottom:5px;font-weight:bold} @@ -208,12 +208,12 @@ input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled], textarea.input-sm{height:auto} .input-lg{height:48px;padding:10px 16px;font-size:19px;line-height:1.33;border-radius:6px}select.input-lg{height:48px;line-height:48px} textarea.input-lg{height:auto} -.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#b88a00} -.has-warning .form-control{border-color:#b88a00;-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)}.has-warning .form-control:focus{border-color:#856400;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ffc71f;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ffc71f} -.has-warning .input-group-addon{color:#b88a00;border-color:#b88a00;background-color:rgba(255,192,0,0.12)} -.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a94100} -.has-error .form-control{border-color:#a94100;-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)}.has-error .form-control:focus{border-color:#762d00;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ff6c10;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ff6c10} -.has-error .input-group-addon{color:#a94100;border-color:#a94100;background-color:rgba(255,101,6,0.1)} +.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#b87e00} +.has-warning .form-control{border-color:#b87e00;-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)}.has-warning .form-control:focus{border-color:#855b00;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ffb81f;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ffb81f} +.has-warning .input-group-addon{color:#b87e00;border-color:#b87e00;background-color:rgba(255,174,0,0.12)} +.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a93600} +.has-error .form-control{border-color:#a93600;-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)}.has-error .form-control:focus{border-color:#762500;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ff5c10;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ff5c10} +.has-error .input-group-addon{color:#a93600;border-color:#a93600;background-color:rgba(255,85,6,0.1)} .has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline{color:#3c763d} .has-success .form-control{border-color:#3c763d;-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)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168} .has-success .input-group-addon{color:#3c763d;border-color:#3c763d;background-color:#dff0d8} @@ -679,8 +679,8 @@ textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon .label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9} .label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44} .label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5} -.label-warning{background-color:#ebb000}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#b88a00} -.label-danger{background-color:#f15c00}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#be4900} +.label-warning{background-color:#eba100}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#b87e00} +.label-danger{background-color:#f14c00}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#be3c00} .badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:13px;font-weight:bold;color:#fff;line-height:1;vertical-align:baseline;white-space:nowrap;text-align:center;background-color:#999;border-radius:10px}.badge:empty{display:none} .btn .badge{position:relative;top:-1px} a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer} @@ -703,10 +703,10 @@ a.thumbnail:hover,a.thumbnail:focus,a.thumbnail.active{border-color:#1980e6} .alert-success .alert-link{color:#2b542c} .alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#31708f}.alert-info hr{border-top-color:#a6e1ec} .alert-info .alert-link{color:#245269} -.alert-warning{background-color:rgba(255,192,0,0.12);border-color:rgba(255,192,0,0.24);color:#b88a00}.alert-warning hr{border-top-color:rgba(230,172,0,0.24)} -.alert-warning .alert-link{color:#856400} -.alert-danger{background-color:rgba(255,101,6,0.1);border-color:rgba(255,101,6,0.2);color:#a94100}.alert-danger hr{border-top-color:rgba(235,90,0,0.2)} -.alert-danger .alert-link{color:#762d00} +.alert-warning{background-color:rgba(255,174,0,0.12);border-color:rgba(255,174,0,0.24);color:#b87e00}.alert-warning hr{border-top-color:rgba(230,157,0,0.24)} +.alert-warning .alert-link{color:#855b00} +.alert-danger{background-color:rgba(255,85,6,0.1);border-color:rgba(255,85,6,0.2);color:#a93600}.alert-danger hr{border-top-color:rgba(235,75,0,0.2)} +.alert-danger .alert-link{color:#762500} @-webkit-keyframes progress-bar-stripes{from{background-position:40px 0} to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0} to{background-position:0 0}}.progress{overflow:hidden;height:21px;margin-bottom:21px;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)} .progress-bar{float:left;width:0%;height:100%;font-size:13px;line-height:21px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-transition:width .6s ease;transition:width .6s ease} .progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-size:40px 40px} @@ -761,10 +761,10 @@ a.list-group-item.active .list-group-item-text,a.list-group-item.active:hover .l .panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#428bca} .panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#d6e9c6} .panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#d6e9c6} -.panel-warning{border-color:rgba(255,192,0,0.24)}.panel-warning>.panel-heading{color:#b88a00;background-color:rgba(255,192,0,0.12);border-color:rgba(255,192,0,0.24)}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:rgba(255,192,0,0.24)} -.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:rgba(255,192,0,0.24)} -.panel-danger{border-color:rgba(255,101,6,0.2)}.panel-danger>.panel-heading{color:#a94100;background-color:rgba(255,101,6,0.1);border-color:rgba(255,101,6,0.2)}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:rgba(255,101,6,0.2)} -.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:rgba(255,101,6,0.2)} +.panel-warning{border-color:rgba(255,174,0,0.24)}.panel-warning>.panel-heading{color:#b87e00;background-color:rgba(255,174,0,0.12);border-color:rgba(255,174,0,0.24)}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:rgba(255,174,0,0.24)} +.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:rgba(255,174,0,0.24)} +.panel-danger{border-color:rgba(255,85,6,0.2)}.panel-danger>.panel-heading{color:#a93600;background-color:rgba(255,85,6,0.1);border-color:rgba(255,85,6,0.2)}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:rgba(255,85,6,0.2)} +.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:rgba(255,85,6,0.2)} .panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse .panel-body{border-top-color:#bce8f1} .panel-info>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#bce8f1} .well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)} @@ -1236,7 +1236,7 @@ h3{font-size:1.7em} h4{font-size:1.25em} h5{font-size:1em} h6{font-size:.85em} -h1,h2,h3,h4,h5,h6{margin:1.3em 0} +h1,h2,h3,h4,h5,h6{margin:1.3em 0;font-weight:300} pre{word-break:break-word} p,pre,pre.prettyprint,blockquote{margin:0 0 1.1em} hr{margin:2em 0} @@ -1311,17 +1311,20 @@ div.jGrowl div.jGrowl-closer{padding-top:4px;padding-bottom:4px;cursor:pointer;f .dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{border-color:transparent} .collapsed>.icon-up-dir:before{content:'\e94d'} .modal.fade .modal-dialog{-webkit-transform:translate(0, 0);-ms-transform:translate(0, 0);transform:translate(0, 0)} -.modal .modal-content{background-color:#f8f8f8} -.modal .modal-body{background-color:#fff;padding-bottom:30px} -.modal .modal-footer{margin-top:0} +.modal-content{background-color:#f8f8f8} +.modal-body{background-color:#fff;padding-bottom:30px} +.modal-footer{background-color:#f8f8f8;margin-top:0} +.modal-iframe{display:block;margin:30px auto 0;z-index:1040;border-radius: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} .nav-pills>li>a{border:1px solid rgba(0,0,0,0)}.nav-pills>li>a:hover,.nav-pills>li>a:focus{color:#343434;border-color:rgba(128,128,128,0.1)} .nav-pills>li.open>a .caret,.nav-pills>li>a:hover .caret,.nav-pills>li>a:focus .caret{border-top-color:#343434;border-bottom-color:#343434} .nav-pills>li.disabled>a:hover,.nav-pills>li.disabled>a:focus{border-color:rgba(0,0,0,0)} .nav-pills>li.open>a,.nav-pills>li.open>a:hover,.nav-pills>li.open>a:focus{color:#343434;border-color:rgba(128,128,128,0.1)} -.list-group-item{padding:10px 15px;margin-bottom:0}.list-group .list-group-item{border-radius:0} -a.list-group-item:hover,a.list-group-item:focus{color:#343434;border-top-color:rgba(128,128,128,0.1);border-bottom-color:rgba(128,128,128,0.1)} -.text-danger:hover{color:#a94100} +.list-group-item{padding:10px 15px;border-left-width:0;border-right-width:0;margin-bottom:0}.list-group .list-group-item{border-radius:0} +a.list-group-item:hover,a.list-group-item:focus{color:#343434;border-color:rgba(128,128,128,0.1)} +.list-group-item .checkbox{float:right;margin:0;padding:0;cursor:pointer}.list-group-item .checkbox input{cursor:pointer;margin:0 16px;height:38px} +.form-group{margin-bottom:1px;padding:5px} +.text-danger:hover{color:#a93600} .bring-to-front{z-index:1050 !important} .dialog-header-message{position:absolute;top:12px;right:55px;font-weight:bold} .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} @@ -1357,8 +1360,8 @@ a.list-group-item:hover,a.list-group-item:focus{color:#343434;border-top-color:r .navbar .nav.pull-right{float:right}.navbar .nav.pull-right>li>.dropdown-menu{right:0;left:auto}.navbar .nav.pull-right>li>.dropdown-menu .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0} .navbar .btn{height:38px;padding:6px 8px} .navbar .btn-group>.btn.disabled *,.navbar .btn-group>.btn.blocked *,.navbar .btn-group>.btn[disabled] *{color:rgba(64,64,64,0.3)} -.navbar .button-open-discussion.some{color:#e0a900} -.navbar .button-open-discussion.replied{color:#d25000} +.navbar .button-open-discussion.some{color:#e09a00} +.navbar .button-open-discussion.replied{color:#d24200} .navbar .file-title-navbar{display:inline-block;vertical-align:middle;padding:1px 15px;font-size:1.5em;line-height:1.4em;font-weight:200;overflow:hidden;white-space:nowrap} .navbar .input-file-title-container{display:inline-block;vertical-align:middle}.navbar .input-file-title-container .input-file-title{width:400px;font-size:16px;height:38px} .navbar .working-indicator{display:inline-block;vertical-align:middle;overflow:hidden;height:38px;width:60px;padding-top:8px}.navbar .working-indicator .bar{display:inline-block;width:14px;height:6px;border-radius:1px;margin:0 2px;opacity:0.25;background-color:#404040} @@ -1392,7 +1395,6 @@ a.list-group-item:hover,a.list-group-item:focus{color:#343434;border-top-color:r .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} .modal-document-manager .folder{font-weight:bold;color:#5f5f5f;font-size:15px;border-top-color:#f5f5f5} -.modal-document-manager .checkbox{float:right;margin:0;padding:0;cursor:pointer}.modal-document-manager .checkbox input{cursor:pointer;margin:0 16px;height:38px} .modal-document-manager .input-rename{width:220px;height:38px} .modal-document-manager .name,.modal-document-manager .file-count{padding:9px 20px 9px 15px} .extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn,.extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn{border-radius:0} @@ -1432,13 +1434,13 @@ a.list-group-item:hover,a.list-group-item:focus{color:#343434;border-top-color:r .layout-toggler.layout-toggler-navbar{line-height:0}.layout-toggler.layout-toggler-navbar i{font-size:16px;height:12px;overflow:hidden} @font-face{font-family:'PT Sans';font-style:normal;font-weight:400;src:local('PT Sans'),local('PTSans'),url("../font/PTSans-Regular-webfont.woff") format('woff')}@font-face{font-family:'PT Sans';font-style:normal;font-weight:700;src:local('PT Sans Bold'),local('PTSans-Bold'),url("../font/PTSans-Bold-webfont.woff") format('woff')}@font-face{font-family:'PT Sans';font-style:italic;font-weight:400;src:local('PT Sans Italic'),local('PTSans-Italic'),url("../font/PTSans-Italic-webfont.woff") format('woff')}@font-face{font-family:'PT Sans';font-style:italic;font-weight:700;src:local('PT Sans Bold Italic'),local('PTSans-BoldItalic'),url("../font/PTSans-BoldItalic-webfont.woff") format('woff')}#wmd-input{position:absolute;top:0;left:0;font-family:"PT Sans",sans-serif;line-height:1.65;letter-spacing:normal;border-radius:0;color:#5a5a5a;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none;padding:0;background-color:#fff;overflow:auto;white-space:pre-wrap;word-wrap:break-word;word-break:normal}#wmd-input>.editor-content{padding-bottom:230px} #wmd-input>.editor-margin{position:absolute;top:0;left:0}#wmd-input>.editor-margin .discussion{font-size:17px;position:absolute;cursor:pointer}#wmd-input>.editor-margin .discussion.new{display:none}#wmd-input>.editor-margin .discussion.new:hover,#wmd-input>.editor-margin .discussion.new.active,#wmd-input>.editor-margin .discussion.new.active:hover{display:inline-block;color:rgba(128,128,128,0.35) !important} -#wmd-input>.editor-margin .discussion.added{color:rgba(235,176,0,0.5)}#wmd-input>.editor-margin .discussion.added:hover,#wmd-input>.editor-margin .discussion.added.active,#wmd-input>.editor-margin .discussion.added.active:hover{color:rgba(235,176,0,0.8) !important} -#wmd-input>.editor-margin .discussion.replied{color:rgba(241,92,0,0.7)}#wmd-input>.editor-margin .discussion.replied:hover,#wmd-input>.editor-margin .discussion.replied.active,#wmd-input>.editor-margin .discussion.replied.active:hover{color:#f15c00 !important} +#wmd-input>.editor-margin .discussion.added{color:rgba(235,161,0,0.5)}#wmd-input>.editor-margin .discussion.added:hover,#wmd-input>.editor-margin .discussion.added.active,#wmd-input>.editor-margin .discussion.added.active:hover{color:rgba(235,161,0,0.8) !important} +#wmd-input>.editor-margin .discussion.replied{color:rgba(241,76,0,0.7)}#wmd-input>.editor-margin .discussion.replied:hover,#wmd-input>.editor-margin .discussion.replied.active,#wmd-input>.editor-margin .discussion.replied.active:hover{color:#f14c00 !important} #wmd-input>.editor-margin .discussion.icon-split{font-size:22px}#wmd-input>.editor-margin .discussion.icon-split:before{margin-right:0} #wmd-input>.editor-margin .discussion:hover,#wmd-input>.editor-margin .discussion.active{text-decoration:none} #wmd-input.font-monospaced *{font-family:"Source Code Pro",monospace !important;line-height:1.65 !important;font-size:1em !important} -#wmd-input .comment-highlight{background-color:rgba(235,176,0,0.3)} -#wmd-input .conflict{font-weight:bold;color:#f15c00} +#wmd-input .comment-highlight{background-color:rgba(235,161,0,0.3)} +#wmd-input .conflict{font-weight:bold;color:#f14c00} #wmd-input .code,#wmd-input .pre{color:#343434;font:normal .9em "Source Code Pro",monospace} #wmd-input .tag{color:#343434;font:bold .9em "Source Code Pro",monospace}#wmd-input .tag .punctuation,#wmd-input .tag .attr-value,#wmd-input .tag .attr-name{font-weight:normal} #wmd-input .latex,#wmd-input .math{color:#808080} @@ -1485,7 +1487,7 @@ div.dropdown-menu .stat{margin:20px 0 10px} div.dropdown-menu i{margin-right:0} div.dropdown-menu textarea{width:250px;height:150px;resize:none} div.dropdown-menu a:hover,div.dropdown-menu a:focus{color:#0f4d8a} -div.dropdown-menu h1,div.dropdown-menu h2,div.dropdown-menu h3,div.dropdown-menu h4,div.dropdown-menu h5,div.dropdown-menu h6{margin:1em 0} +div.dropdown-menu h1,div.dropdown-menu h2,div.dropdown-menu h3,div.dropdown-menu h4,div.dropdown-menu h5,div.dropdown-menu h6{margin:0.8em 0} .btn-gittip{width:52px;height:25px} .title-icon-category{display:inline-block;opacity:.15;filter:alpha(opacity=15);margin-top:-2px;margin-left:-2px;margin-right:3px;font-size:1em;vertical-align:top}.file-title-navbar .title-icon-category{font-size:16px} .picker-dialog{z-index:1050 !important} @@ -1506,8 +1508,8 @@ input[type="file"]{line-height:inherit;height:inherit;border:none !important} .comments-popover .popover .popover-content .comment-block{margin-bottom:5px} .comments-popover .popover .popover-content .form-group,.comments-popover .popover .popover-content blockquote{margin-bottom:10px} .comments-popover .popover .popover-content .comment-author{font-weight:bold;color:#3f3f3f} -.comments-popover .popover .popover-content .icon-comment{font-size:15px;color:rgba(235,176,0,0.6)} -.comments-popover .popover .popover-content .reply .icon-comment{color:rgba(241,92,0,0.7)} +.comments-popover .popover .popover-content .icon-comment{font-size:15px;color:rgba(235,161,0,0.6)} +.comments-popover .popover .popover-content .reply .icon-comment{color:rgba(241,76,0,0.7)} .comments-popover .popover .popover-content .new-comment-block .icon-comment{color:rgba(128,128,128,0.35)} .comments-popover .popover .popover-content .input-comment-author{border:none;background:none;-webkit-box-shadow:none;box-shadow:none;font-weight:bold;height:28px;padding:0 0 5px;width:140px;display:inline-block} .comments-popover .popover .popover-content hr{margin:0 0 10px} diff --git a/public/res-min/themes/night.css b/public/res-min/themes/night.css index ae3d4064..addf38b6 100644 --- a/public/res-min/themes/night.css +++ b/public/res-min/themes/night.css @@ -65,8 +65,8 @@ small,.small{font-size:85%} cite{font-style:normal} .text-muted{color:#999} .text-primary{color:#428bca}.text-primary:hover{color:#3071a9} -.text-warning{color:#b88a00}.text-warning:hover{color:#856400} -.text-danger{color:#a94100}.text-danger:hover{color:#762d00} +.text-warning{color:#b87e00}.text-warning:hover{color:#855b00} +.text-danger{color:#a93600}.text-danger:hover{color:#762500} .text-success{color:#3c763d}.text-success:hover{color:#2b542c} .text-info{color:#31708f}.text-info:hover{color:#245269} .text-left{text-align:left} @@ -174,10 +174,10 @@ table td[class*="col-"],table th[class*="col-"]{float:none;display:table-cell} .table-hover>tbody>tr>.active:hover,.table-hover>tbody>.active:hover>td,.table-hover>tbody>.active:hover>th{background-color:#e8e8e8} .table>thead>tr>.success,.table>tbody>tr>.success,.table>tfoot>tr>.success,.table>thead>.success>td,.table>tbody>.success>td,.table>tfoot>.success>td,.table>thead>.success>th,.table>tbody>.success>th,.table>tfoot>.success>th{background-color:#dff0d8} .table-hover>tbody>tr>.success:hover,.table-hover>tbody>.success:hover>td,.table-hover>tbody>.success:hover>th{background-color:#d0e9c6} -.table>thead>tr>.danger,.table>tbody>tr>.danger,.table>tfoot>tr>.danger,.table>thead>.danger>td,.table>tbody>.danger>td,.table>tfoot>.danger>td,.table>thead>.danger>th,.table>tbody>.danger>th,.table>tfoot>.danger>th{background-color:rgba(255,101,6,0.1)} -.table-hover>tbody>tr>.danger:hover,.table-hover>tbody>.danger:hover>td,.table-hover>tbody>.danger:hover>th{background-color:rgba(235,90,0,0.1)} -.table>thead>tr>.warning,.table>tbody>tr>.warning,.table>tfoot>tr>.warning,.table>thead>.warning>td,.table>tbody>.warning>td,.table>tfoot>.warning>td,.table>thead>.warning>th,.table>tbody>.warning>th,.table>tfoot>.warning>th{background-color:rgba(255,192,0,0.12)} -.table-hover>tbody>tr>.warning:hover,.table-hover>tbody>.warning:hover>td,.table-hover>tbody>.warning:hover>th{background-color:rgba(230,172,0,0.12)} +.table>thead>tr>.danger,.table>tbody>tr>.danger,.table>tfoot>tr>.danger,.table>thead>.danger>td,.table>tbody>.danger>td,.table>tfoot>.danger>td,.table>thead>.danger>th,.table>tbody>.danger>th,.table>tfoot>.danger>th{background-color:rgba(255,85,6,0.1)} +.table-hover>tbody>tr>.danger:hover,.table-hover>tbody>.danger:hover>td,.table-hover>tbody>.danger:hover>th{background-color:rgba(235,75,0,0.1)} +.table>thead>tr>.warning,.table>tbody>tr>.warning,.table>tfoot>tr>.warning,.table>thead>.warning>td,.table>tbody>.warning>td,.table>tfoot>.warning>td,.table>thead>.warning>th,.table>tbody>.warning>th,.table>tfoot>.warning>th{background-color:rgba(255,174,0,0.12)} +.table-hover>tbody>tr>.warning:hover,.table-hover>tbody>.warning:hover>td,.table-hover>tbody>.warning:hover>th{background-color:rgba(230,157,0,0.12)} @media (max-width:767px){.table-responsive{width:100%;margin-bottom:15.75px;overflow-y:hidden;overflow-x:scroll;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd;-webkit-overflow-scrolling:touch}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap} .table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0} .table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0} .table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0} legend{display:block;width:100%;padding:0;margin-bottom:21px;font-size:22.5px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5} label{display:inline-block;margin-bottom:5px;font-weight:bold} @@ -208,12 +208,12 @@ input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled], textarea.input-sm{height:auto} .input-lg{height:48px;padding:10px 16px;font-size:19px;line-height:1.33;border-radius:6px}select.input-lg{height:48px;line-height:48px} textarea.input-lg{height:auto} -.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#b88a00} -.has-warning .form-control{border-color:#b88a00;-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)}.has-warning .form-control:focus{border-color:#856400;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ffc71f;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ffc71f} -.has-warning .input-group-addon{color:#b88a00;border-color:#b88a00;background-color:rgba(255,192,0,0.12)} -.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a94100} -.has-error .form-control{border-color:#a94100;-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)}.has-error .form-control:focus{border-color:#762d00;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ff6c10;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ff6c10} -.has-error .input-group-addon{color:#a94100;border-color:#a94100;background-color:rgba(255,101,6,0.1)} +.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#b87e00} +.has-warning .form-control{border-color:#b87e00;-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)}.has-warning .form-control:focus{border-color:#855b00;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ffb81f;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ffb81f} +.has-warning .input-group-addon{color:#b87e00;border-color:#b87e00;background-color:rgba(255,174,0,0.12)} +.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a93600} +.has-error .form-control{border-color:#a93600;-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)}.has-error .form-control:focus{border-color:#762500;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ff5c10;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ff5c10} +.has-error .input-group-addon{color:#a93600;border-color:#a93600;background-color:rgba(255,85,6,0.1)} .has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline{color:#3c763d} .has-success .form-control{border-color:#3c763d;-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)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168} .has-success .input-group-addon{color:#3c763d;border-color:#3c763d;background-color:#dff0d8} @@ -679,8 +679,8 @@ textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon .label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9} .label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44} .label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5} -.label-warning{background-color:#ebb000}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#b88a00} -.label-danger{background-color:#f15c00}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#be4900} +.label-warning{background-color:#eba100}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#b87e00} +.label-danger{background-color:#f14c00}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#be3c00} .badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:13px;font-weight:bold;color:#fff;line-height:1;vertical-align:baseline;white-space:nowrap;text-align:center;background-color:#999;border-radius:10px}.badge:empty{display:none} .btn .badge{position:relative;top:-1px} a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer} @@ -703,10 +703,10 @@ a.thumbnail:hover,a.thumbnail:focus,a.thumbnail.active{border-color:#f73} .alert-success .alert-link{color:#2b542c} .alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#31708f}.alert-info hr{border-top-color:#a6e1ec} .alert-info .alert-link{color:#245269} -.alert-warning{background-color:rgba(255,192,0,0.12);border-color:rgba(255,192,0,0.24);color:#b88a00}.alert-warning hr{border-top-color:rgba(230,172,0,0.24)} -.alert-warning .alert-link{color:#856400} -.alert-danger{background-color:rgba(255,101,6,0.1);border-color:rgba(255,101,6,0.2);color:#a94100}.alert-danger hr{border-top-color:rgba(235,90,0,0.2)} -.alert-danger .alert-link{color:#762d00} +.alert-warning{background-color:rgba(255,174,0,0.12);border-color:rgba(255,174,0,0.24);color:#b87e00}.alert-warning hr{border-top-color:rgba(230,157,0,0.24)} +.alert-warning .alert-link{color:#855b00} +.alert-danger{background-color:rgba(255,85,6,0.1);border-color:rgba(255,85,6,0.2);color:#a93600}.alert-danger hr{border-top-color:rgba(235,75,0,0.2)} +.alert-danger .alert-link{color:#762500} @-webkit-keyframes progress-bar-stripes{from{background-position:40px 0} to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0} to{background-position:0 0}}.progress{overflow:hidden;height:21px;margin-bottom:21px;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)} .progress-bar{float:left;width:0%;height:100%;font-size:13px;line-height:21px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-transition:width .6s ease;transition:width .6s ease} .progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-size:40px 40px} @@ -761,10 +761,10 @@ a.list-group-item.active .list-group-item-text,a.list-group-item.active:hover .l .panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#428bca} .panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#d6e9c6} .panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#d6e9c6} -.panel-warning{border-color:rgba(255,192,0,0.24)}.panel-warning>.panel-heading{color:#b88a00;background-color:rgba(255,192,0,0.12);border-color:rgba(255,192,0,0.24)}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:rgba(255,192,0,0.24)} -.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:rgba(255,192,0,0.24)} -.panel-danger{border-color:rgba(255,101,6,0.2)}.panel-danger>.panel-heading{color:#a94100;background-color:rgba(255,101,6,0.1);border-color:rgba(255,101,6,0.2)}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:rgba(255,101,6,0.2)} -.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:rgba(255,101,6,0.2)} +.panel-warning{border-color:rgba(255,174,0,0.24)}.panel-warning>.panel-heading{color:#b87e00;background-color:rgba(255,174,0,0.12);border-color:rgba(255,174,0,0.24)}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:rgba(255,174,0,0.24)} +.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:rgba(255,174,0,0.24)} +.panel-danger{border-color:rgba(255,85,6,0.2)}.panel-danger>.panel-heading{color:#a93600;background-color:rgba(255,85,6,0.1);border-color:rgba(255,85,6,0.2)}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:rgba(255,85,6,0.2)} +.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:rgba(255,85,6,0.2)} .panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse .panel-body{border-top-color:#bce8f1} .panel-info>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#bce8f1} .well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)} @@ -1236,7 +1236,7 @@ h3{font-size:1.7em} h4{font-size:1.25em} h5{font-size:1em} h6{font-size:.85em} -h1,h2,h3,h4,h5,h6{margin:1.3em 0} +h1,h2,h3,h4,h5,h6{margin:1.3em 0;font-weight:300} pre{word-break:break-word} p,pre,pre.prettyprint,blockquote{margin:0 0 1.1em} hr{margin:2em 0} @@ -1311,17 +1311,20 @@ div.jGrowl div.jGrowl-closer{padding-top:4px;padding-bottom:4px;cursor:pointer;f .dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{border-color:transparent} .collapsed>.icon-up-dir:before{content:'\e94d'} .modal.fade .modal-dialog{-webkit-transform:translate(0, 0);-ms-transform:translate(0, 0);transform:translate(0, 0)} -.modal .modal-content{background-color:#232323} -.modal .modal-body{background-color:#1e1e1e;padding-bottom:30px} -.modal .modal-footer{margin-top:0} +.modal-content{background-color:#232323} +.modal-body{background-color:#1e1e1e;padding-bottom:30px} +.modal-footer{background-color:#232323;margin-top:0} +.modal-iframe{display:block;margin:30px auto 0;z-index:1040;border-radius: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} .nav-pills>li>a{border:1px solid rgba(0,0,0,0)}.nav-pills>li>a:hover,.nav-pills>li>a:focus{color:#b3b3b3;border-color:rgba(255,255,255,0.1)} .nav-pills>li.open>a .caret,.nav-pills>li>a:hover .caret,.nav-pills>li>a:focus .caret{border-top-color:#b3b3b3;border-bottom-color:#b3b3b3} .nav-pills>li.disabled>a:hover,.nav-pills>li.disabled>a:focus{border-color:rgba(0,0,0,0)} .nav-pills>li.open>a,.nav-pills>li.open>a:hover,.nav-pills>li.open>a:focus{color:#b3b3b3;border-color:rgba(255,255,255,0.1)} -.list-group-item{padding:10px 15px;margin-bottom:0}.list-group .list-group-item{border-radius:0} -a.list-group-item:hover,a.list-group-item:focus{color:#b3b3b3;border-top-color:rgba(255,255,255,0.1);border-bottom-color:rgba(255,255,255,0.1)} -.text-danger:hover{color:#a94100} +.list-group-item{padding:10px 15px;border-left-width:0;border-right-width:0;margin-bottom:0}.list-group .list-group-item{border-radius:0} +a.list-group-item:hover,a.list-group-item:focus{color:#b3b3b3;border-color:rgba(255,255,255,0.1)} +.list-group-item .checkbox{float:right;margin:0;padding:0;cursor:pointer}.list-group-item .checkbox input{cursor:pointer;margin:0 16px;height:38px} +.form-group{margin-bottom:1px;padding:5px} +.text-danger:hover{color:#a93600} .bring-to-front{z-index:1050 !important} .dialog-header-message{position:absolute;top:12px;right:55px;font-weight:bold} .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} @@ -1357,8 +1360,8 @@ a.list-group-item:hover,a.list-group-item:focus{color:#b3b3b3;border-top-color:r .navbar .nav.pull-right{float:right}.navbar .nav.pull-right>li>.dropdown-menu{right:0;left:auto}.navbar .nav.pull-right>li>.dropdown-menu .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0} .navbar .btn{height:38px;padding:6px 8px} .navbar .btn-group>.btn.disabled *,.navbar .btn-group>.btn.blocked *,.navbar .btn-group>.btn[disabled] *{color:rgba(191,191,191,0.3)} -.navbar .button-open-discussion.some{color:#e0a900} -.navbar .button-open-discussion.replied{color:#d25000} +.navbar .button-open-discussion.some{color:#e09a00} +.navbar .button-open-discussion.replied{color:#d24200} .navbar .file-title-navbar{display:inline-block;vertical-align:middle;padding:1px 15px;font-size:1.5em;line-height:1.4em;font-weight:200;overflow:hidden;white-space:nowrap} .navbar .input-file-title-container{display:inline-block;vertical-align:middle}.navbar .input-file-title-container .input-file-title{width:400px;font-size:16px;height:38px} .navbar .working-indicator{display:inline-block;vertical-align:middle;overflow:hidden;height:38px;width:60px;padding-top:8px}.navbar .working-indicator .bar{display:inline-block;width:14px;height:6px;border-radius:1px;margin:0 2px;opacity:0.25;background-color:#bfbfbf} @@ -1392,7 +1395,6 @@ a.list-group-item:hover,a.list-group-item:focus{color:#b3b3b3;border-top-color:r .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} .modal-document-manager .folder{font-weight:bold;color:#bfbfbf;font-size:15px;border-top-color:#333} -.modal-document-manager .checkbox{float:right;margin:0;padding:0;cursor:pointer}.modal-document-manager .checkbox input{cursor:pointer;margin:0 16px;height:38px} .modal-document-manager .input-rename{width:220px;height:38px} .modal-document-manager .name,.modal-document-manager .file-count{padding:9px 20px 9px 15px} .extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn,.extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn{border-radius:0} @@ -1432,13 +1434,13 @@ a.list-group-item:hover,a.list-group-item:focus{color:#b3b3b3;border-top-color:r .layout-toggler.layout-toggler-navbar{line-height:0}.layout-toggler.layout-toggler-navbar i{font-size:16px;height:12px;overflow:hidden} @font-face{font-family:'PT Sans';font-style:normal;font-weight:400;src:local('PT Sans'),local('PTSans'),url("../font/PTSans-Regular-webfont.woff") format('woff')}@font-face{font-family:'PT Sans';font-style:normal;font-weight:700;src:local('PT Sans Bold'),local('PTSans-Bold'),url("../font/PTSans-Bold-webfont.woff") format('woff')}@font-face{font-family:'PT Sans';font-style:italic;font-weight:400;src:local('PT Sans Italic'),local('PTSans-Italic'),url("../font/PTSans-Italic-webfont.woff") format('woff')}@font-face{font-family:'PT Sans';font-style:italic;font-weight:700;src:local('PT Sans Bold Italic'),local('PTSans-BoldItalic'),url("../font/PTSans-BoldItalic-webfont.woff") format('woff')}#wmd-input{position:absolute;top:0;left:0;font-family:"PT Sans",sans-serif;line-height:1.65;letter-spacing:normal;border-radius:0;color:#dfdfdf;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none;padding:0;background-color:#1e1e1e;overflow:auto;white-space:pre-wrap;word-wrap:break-word;word-break:normal}#wmd-input>.editor-content{padding-bottom:230px} #wmd-input>.editor-margin{position:absolute;top:0;left:0}#wmd-input>.editor-margin .discussion{font-size:17px;position:absolute;cursor:pointer}#wmd-input>.editor-margin .discussion.new{display:none}#wmd-input>.editor-margin .discussion.new:hover,#wmd-input>.editor-margin .discussion.new.active,#wmd-input>.editor-margin .discussion.new.active:hover{display:inline-block;color:rgba(159,159,159,0.35) !important} -#wmd-input>.editor-margin .discussion.added{color:rgba(235,176,0,0.5)}#wmd-input>.editor-margin .discussion.added:hover,#wmd-input>.editor-margin .discussion.added.active,#wmd-input>.editor-margin .discussion.added.active:hover{color:rgba(235,176,0,0.8) !important} -#wmd-input>.editor-margin .discussion.replied{color:rgba(241,92,0,0.7)}#wmd-input>.editor-margin .discussion.replied:hover,#wmd-input>.editor-margin .discussion.replied.active,#wmd-input>.editor-margin .discussion.replied.active:hover{color:#f15c00 !important} +#wmd-input>.editor-margin .discussion.added{color:rgba(235,161,0,0.5)}#wmd-input>.editor-margin .discussion.added:hover,#wmd-input>.editor-margin .discussion.added.active,#wmd-input>.editor-margin .discussion.added.active:hover{color:rgba(235,161,0,0.8) !important} +#wmd-input>.editor-margin .discussion.replied{color:rgba(241,76,0,0.7)}#wmd-input>.editor-margin .discussion.replied:hover,#wmd-input>.editor-margin .discussion.replied.active,#wmd-input>.editor-margin .discussion.replied.active:hover{color:#f14c00 !important} #wmd-input>.editor-margin .discussion.icon-split{font-size:22px}#wmd-input>.editor-margin .discussion.icon-split:before{margin-right:0} #wmd-input>.editor-margin .discussion:hover,#wmd-input>.editor-margin .discussion.active{text-decoration:none} #wmd-input.font-monospaced *{font-family:"Source Code Pro",monospace !important;line-height:1.65 !important;font-size:1em !important} -#wmd-input .comment-highlight{background-color:rgba(235,176,0,0.3)} -#wmd-input .conflict{font-weight:bold;color:#f15c00} +#wmd-input .comment-highlight{background-color:rgba(235,161,0,0.3)} +#wmd-input .conflict{font-weight:bold;color:#f14c00} #wmd-input .code,#wmd-input .pre{color:#fff;font:normal .9em "Source Code Pro",monospace} #wmd-input .tag{color:#fff;font:bold .9em "Source Code Pro",monospace}#wmd-input .tag .punctuation,#wmd-input .tag .attr-value,#wmd-input .tag .attr-name{font-weight:normal} #wmd-input .latex,#wmd-input .math{color:#9f9f9f} @@ -1485,7 +1487,7 @@ div.dropdown-menu .stat{margin:20px 0 10px} div.dropdown-menu i{margin-right:0} div.dropdown-menu textarea{width:250px;height:150px;resize:none} div.dropdown-menu a:hover,div.dropdown-menu a:focus{color:#c40} -div.dropdown-menu h1,div.dropdown-menu h2,div.dropdown-menu h3,div.dropdown-menu h4,div.dropdown-menu h5,div.dropdown-menu h6{margin:1em 0} +div.dropdown-menu h1,div.dropdown-menu h2,div.dropdown-menu h3,div.dropdown-menu h4,div.dropdown-menu h5,div.dropdown-menu h6{margin:0.8em 0} .btn-gittip{width:52px;height:25px} .title-icon-category{display:inline-block;opacity:.15;filter:alpha(opacity=15);margin-top:-2px;margin-left:-2px;margin-right:3px;font-size:1em;vertical-align:top}.file-title-navbar .title-icon-category{font-size:16px} .picker-dialog{z-index:1050 !important} @@ -1506,8 +1508,8 @@ input[type="file"]{line-height:inherit;height:inherit;border:none !important} .comments-popover .popover .popover-content .comment-block{margin-bottom:5px} .comments-popover .popover .popover-content .form-group,.comments-popover .popover .popover-content blockquote{margin-bottom:10px} .comments-popover .popover .popover-content .comment-author{font-weight:bold;color:#9f9f9f} -.comments-popover .popover .popover-content .icon-comment{font-size:15px;color:rgba(235,176,0,0.6)} -.comments-popover .popover .popover-content .reply .icon-comment{color:rgba(241,92,0,0.7)} +.comments-popover .popover .popover-content .icon-comment{font-size:15px;color:rgba(235,161,0,0.6)} +.comments-popover .popover .popover-content .reply .icon-comment{color:rgba(241,76,0,0.7)} .comments-popover .popover .popover-content .new-comment-block .icon-comment{color:rgba(159,159,159,0.35)} .comments-popover .popover .popover-content .input-comment-author{border:none;background:none;-webkit-box-shadow:none;box-shadow:none;font-weight:bold;height:28px;padding:0 0 5px;width:140px;display:inline-block} .comments-popover .popover .popover-content hr{margin:0 0 10px} diff --git a/public/res-min/themes/original.css b/public/res-min/themes/original.css index 010e3c15..b5311e9d 100644 --- a/public/res-min/themes/original.css +++ b/public/res-min/themes/original.css @@ -65,8 +65,8 @@ small,.small{font-size:85%} cite{font-style:normal} .text-muted{color:#999} .text-primary{color:#428bca}.text-primary:hover{color:#3071a9} -.text-warning{color:#b88a00}.text-warning:hover{color:#856400} -.text-danger{color:#a94100}.text-danger:hover{color:#762d00} +.text-warning{color:#b87e00}.text-warning:hover{color:#855b00} +.text-danger{color:#a93600}.text-danger:hover{color:#762500} .text-success{color:#3c763d}.text-success:hover{color:#2b542c} .text-info{color:#31708f}.text-info:hover{color:#245269} .text-left{text-align:left} @@ -174,10 +174,10 @@ table td[class*="col-"],table th[class*="col-"]{float:none;display:table-cell} .table-hover>tbody>tr>.active:hover,.table-hover>tbody>.active:hover>td,.table-hover>tbody>.active:hover>th{background-color:#e8e8e8} .table>thead>tr>.success,.table>tbody>tr>.success,.table>tfoot>tr>.success,.table>thead>.success>td,.table>tbody>.success>td,.table>tfoot>.success>td,.table>thead>.success>th,.table>tbody>.success>th,.table>tfoot>.success>th{background-color:#dff0d8} .table-hover>tbody>tr>.success:hover,.table-hover>tbody>.success:hover>td,.table-hover>tbody>.success:hover>th{background-color:#d0e9c6} -.table>thead>tr>.danger,.table>tbody>tr>.danger,.table>tfoot>tr>.danger,.table>thead>.danger>td,.table>tbody>.danger>td,.table>tfoot>.danger>td,.table>thead>.danger>th,.table>tbody>.danger>th,.table>tfoot>.danger>th{background-color:rgba(255,101,6,0.1)} -.table-hover>tbody>tr>.danger:hover,.table-hover>tbody>.danger:hover>td,.table-hover>tbody>.danger:hover>th{background-color:rgba(235,90,0,0.1)} -.table>thead>tr>.warning,.table>tbody>tr>.warning,.table>tfoot>tr>.warning,.table>thead>.warning>td,.table>tbody>.warning>td,.table>tfoot>.warning>td,.table>thead>.warning>th,.table>tbody>.warning>th,.table>tfoot>.warning>th{background-color:rgba(255,192,0,0.12)} -.table-hover>tbody>tr>.warning:hover,.table-hover>tbody>.warning:hover>td,.table-hover>tbody>.warning:hover>th{background-color:rgba(230,172,0,0.12)} +.table>thead>tr>.danger,.table>tbody>tr>.danger,.table>tfoot>tr>.danger,.table>thead>.danger>td,.table>tbody>.danger>td,.table>tfoot>.danger>td,.table>thead>.danger>th,.table>tbody>.danger>th,.table>tfoot>.danger>th{background-color:rgba(255,85,6,0.1)} +.table-hover>tbody>tr>.danger:hover,.table-hover>tbody>.danger:hover>td,.table-hover>tbody>.danger:hover>th{background-color:rgba(235,75,0,0.1)} +.table>thead>tr>.warning,.table>tbody>tr>.warning,.table>tfoot>tr>.warning,.table>thead>.warning>td,.table>tbody>.warning>td,.table>tfoot>.warning>td,.table>thead>.warning>th,.table>tbody>.warning>th,.table>tfoot>.warning>th{background-color:rgba(255,174,0,0.12)} +.table-hover>tbody>tr>.warning:hover,.table-hover>tbody>.warning:hover>td,.table-hover>tbody>.warning:hover>th{background-color:rgba(230,157,0,0.12)} @media (max-width:767px){.table-responsive{width:100%;margin-bottom:15.75px;overflow-y:hidden;overflow-x:scroll;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd;-webkit-overflow-scrolling:touch}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap} .table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0} .table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0} .table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0} legend{display:block;width:100%;padding:0;margin-bottom:21px;font-size:22.5px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5} label{display:inline-block;margin-bottom:5px;font-weight:bold} @@ -208,12 +208,12 @@ input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled], textarea.input-sm{height:auto} .input-lg{height:48px;padding:10px 16px;font-size:19px;line-height:1.33;border-radius:6px}select.input-lg{height:48px;line-height:48px} textarea.input-lg{height:auto} -.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#b88a00} -.has-warning .form-control{border-color:#b88a00;-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)}.has-warning .form-control:focus{border-color:#856400;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ffc71f;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ffc71f} -.has-warning .input-group-addon{color:#b88a00;border-color:#b88a00;background-color:rgba(255,192,0,0.12)} -.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a94100} -.has-error .form-control{border-color:#a94100;-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)}.has-error .form-control:focus{border-color:#762d00;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ff6c10;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ff6c10} -.has-error .input-group-addon{color:#a94100;border-color:#a94100;background-color:rgba(255,101,6,0.1)} +.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#b87e00} +.has-warning .form-control{border-color:#b87e00;-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)}.has-warning .form-control:focus{border-color:#855b00;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ffb81f;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ffb81f} +.has-warning .input-group-addon{color:#b87e00;border-color:#b87e00;background-color:rgba(255,174,0,0.12)} +.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a93600} +.has-error .form-control{border-color:#a93600;-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)}.has-error .form-control:focus{border-color:#762500;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ff5c10;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ff5c10} +.has-error .input-group-addon{color:#a93600;border-color:#a93600;background-color:rgba(255,85,6,0.1)} .has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline{color:#3c763d} .has-success .form-control{border-color:#3c763d;-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)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168} .has-success .input-group-addon{color:#3c763d;border-color:#3c763d;background-color:#dff0d8} @@ -679,8 +679,8 @@ textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon .label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9} .label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44} .label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5} -.label-warning{background-color:#ebb000}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#b88a00} -.label-danger{background-color:#f15c00}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#be4900} +.label-warning{background-color:#eba100}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#b87e00} +.label-danger{background-color:#f14c00}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#be3c00} .badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:13px;font-weight:bold;color:#fff;line-height:1;vertical-align:baseline;white-space:nowrap;text-align:center;background-color:#999;border-radius:10px}.badge:empty{display:none} .btn .badge{position:relative;top:-1px} a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer} @@ -703,10 +703,10 @@ a.thumbnail:hover,a.thumbnail:focus,a.thumbnail.active{border-color:#1980e6} .alert-success .alert-link{color:#2b542c} .alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#31708f}.alert-info hr{border-top-color:#a6e1ec} .alert-info .alert-link{color:#245269} -.alert-warning{background-color:rgba(255,192,0,0.12);border-color:rgba(255,192,0,0.24);color:#b88a00}.alert-warning hr{border-top-color:rgba(230,172,0,0.24)} -.alert-warning .alert-link{color:#856400} -.alert-danger{background-color:rgba(255,101,6,0.1);border-color:rgba(255,101,6,0.2);color:#a94100}.alert-danger hr{border-top-color:rgba(235,90,0,0.2)} -.alert-danger .alert-link{color:#762d00} +.alert-warning{background-color:rgba(255,174,0,0.12);border-color:rgba(255,174,0,0.24);color:#b87e00}.alert-warning hr{border-top-color:rgba(230,157,0,0.24)} +.alert-warning .alert-link{color:#855b00} +.alert-danger{background-color:rgba(255,85,6,0.1);border-color:rgba(255,85,6,0.2);color:#a93600}.alert-danger hr{border-top-color:rgba(235,75,0,0.2)} +.alert-danger .alert-link{color:#762500} @-webkit-keyframes progress-bar-stripes{from{background-position:40px 0} to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0} to{background-position:0 0}}.progress{overflow:hidden;height:21px;margin-bottom:21px;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)} .progress-bar{float:left;width:0%;height:100%;font-size:13px;line-height:21px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-transition:width .6s ease;transition:width .6s ease} .progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-size:40px 40px} @@ -761,10 +761,10 @@ a.list-group-item.active .list-group-item-text,a.list-group-item.active:hover .l .panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#428bca} .panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#d6e9c6} .panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#d6e9c6} -.panel-warning{border-color:rgba(255,192,0,0.24)}.panel-warning>.panel-heading{color:#b88a00;background-color:rgba(255,192,0,0.12);border-color:rgba(255,192,0,0.24)}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:rgba(255,192,0,0.24)} -.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:rgba(255,192,0,0.24)} -.panel-danger{border-color:rgba(255,101,6,0.2)}.panel-danger>.panel-heading{color:#a94100;background-color:rgba(255,101,6,0.1);border-color:rgba(255,101,6,0.2)}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:rgba(255,101,6,0.2)} -.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:rgba(255,101,6,0.2)} +.panel-warning{border-color:rgba(255,174,0,0.24)}.panel-warning>.panel-heading{color:#b87e00;background-color:rgba(255,174,0,0.12);border-color:rgba(255,174,0,0.24)}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:rgba(255,174,0,0.24)} +.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:rgba(255,174,0,0.24)} +.panel-danger{border-color:rgba(255,85,6,0.2)}.panel-danger>.panel-heading{color:#a93600;background-color:rgba(255,85,6,0.1);border-color:rgba(255,85,6,0.2)}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:rgba(255,85,6,0.2)} +.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:rgba(255,85,6,0.2)} .panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse .panel-body{border-top-color:#bce8f1} .panel-info>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#bce8f1} .well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)} @@ -1236,7 +1236,7 @@ h3{font-size:1.7em} h4{font-size:1.25em} h5{font-size:1em} h6{font-size:.85em} -h1,h2,h3,h4,h5,h6{margin:1.3em 0} +h1,h2,h3,h4,h5,h6{margin:1.3em 0;font-weight:300} pre{word-break:break-word} p,pre,pre.prettyprint,blockquote{margin:0 0 1.1em} hr{margin:2em 0} @@ -1311,17 +1311,20 @@ div.jGrowl div.jGrowl-closer{padding-top:4px;padding-bottom:4px;cursor:pointer;f .dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{border-color:transparent} .collapsed>.icon-up-dir:before{content:'\e94d'} .modal.fade .modal-dialog{-webkit-transform:translate(0, 0);-ms-transform:translate(0, 0);transform:translate(0, 0)} -.modal .modal-content{background-color:#f6f6f6} -.modal .modal-body{background-color:#fcfcfc;padding-bottom:30px} -.modal .modal-footer{margin-top:0} +.modal-content{background-color:#f6f6f6} +.modal-body{background-color:#fcfcfc;padding-bottom:30px} +.modal-footer{background-color:#f6f6f6;margin-top:0} +.modal-iframe{display:block;margin:30px auto 0;z-index:1040;border-radius: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} .nav-pills>li>a{border:1px solid rgba(0,0,0,0)}.nav-pills>li>a:hover,.nav-pills>li>a:focus{color:#4e4e4e;border-color:rgba(154,154,154,0.1)} .nav-pills>li.open>a .caret,.nav-pills>li>a:hover .caret,.nav-pills>li>a:focus .caret{border-top-color:#4e4e4e;border-bottom-color:#4e4e4e} .nav-pills>li.disabled>a:hover,.nav-pills>li.disabled>a:focus{border-color:rgba(0,0,0,0)} .nav-pills>li.open>a,.nav-pills>li.open>a:hover,.nav-pills>li.open>a:focus{color:#4e4e4e;border-color:rgba(154,154,154,0.1)} -.list-group-item{padding:10px 15px;margin-bottom:0}.list-group .list-group-item{border-radius:0} -a.list-group-item:hover,a.list-group-item:focus{color:#4e4e4e;border-top-color:rgba(154,154,154,0.1);border-bottom-color:rgba(154,154,154,0.1)} -.text-danger:hover{color:#a94100} +.list-group-item{padding:10px 15px;border-left-width:0;border-right-width:0;margin-bottom:0}.list-group .list-group-item{border-radius:0} +a.list-group-item:hover,a.list-group-item:focus{color:#4e4e4e;border-color:rgba(154,154,154,0.1)} +.list-group-item .checkbox{float:right;margin:0;padding:0;cursor:pointer}.list-group-item .checkbox input{cursor:pointer;margin:0 16px;height:38px} +.form-group{margin-bottom:1px;padding:5px} +.text-danger:hover{color:#a93600} .bring-to-front{z-index:1050 !important} .dialog-header-message{position:absolute;top:12px;right:55px;font-weight:bold} .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} @@ -1357,8 +1360,8 @@ a.list-group-item:hover,a.list-group-item:focus{color:#4e4e4e;border-top-color:r .navbar .nav.pull-right{float:right}.navbar .nav.pull-right>li>.dropdown-menu{right:0;left:auto}.navbar .nav.pull-right>li>.dropdown-menu .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0} .navbar .btn{height:38px;padding:6px 8px} .navbar .btn-group>.btn.disabled *,.navbar .btn-group>.btn.blocked *,.navbar .btn-group>.btn[disabled] *{color:rgba(160,160,160,0.3)} -.navbar .button-open-discussion.some{color:#e0a900} -.navbar .button-open-discussion.replied{color:#d25000} +.navbar .button-open-discussion.some{color:#e09a00} +.navbar .button-open-discussion.replied{color:#d24200} .navbar .file-title-navbar{display:inline-block;vertical-align:middle;padding:1px 15px;font-size:1.5em;line-height:1.4em;font-weight:200;overflow:hidden;white-space:nowrap} .navbar .input-file-title-container{display:inline-block;vertical-align:middle}.navbar .input-file-title-container .input-file-title{width:400px;font-size:16px;height:38px} .navbar .working-indicator{display:inline-block;vertical-align:middle;overflow:hidden;height:38px;width:60px;padding-top:8px}.navbar .working-indicator .bar{display:inline-block;width:14px;height:6px;border-radius:1px;margin:0 2px;opacity:0.25;background-color:#a0a0a0} @@ -1392,7 +1395,6 @@ a.list-group-item:hover,a.list-group-item:focus{color:#4e4e4e;border-top-color:r .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} .modal-document-manager .folder{font-weight:bold;color:#686868;font-size:15px;border-top-color:#eee} -.modal-document-manager .checkbox{float:right;margin:0;padding:0;cursor:pointer}.modal-document-manager .checkbox input{cursor:pointer;margin:0 16px;height:38px} .modal-document-manager .input-rename{width:220px;height:38px} .modal-document-manager .name,.modal-document-manager .file-count{padding:9px 20px 9px 15px} .extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn,.extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn{border-radius:0} @@ -1432,13 +1434,13 @@ a.list-group-item:hover,a.list-group-item:focus{color:#4e4e4e;border-top-color:r .layout-toggler.layout-toggler-navbar{line-height:0}.layout-toggler.layout-toggler-navbar i{font-size:16px;height:12px;overflow:hidden} @font-face{font-family:'PT Sans';font-style:normal;font-weight:400;src:local('PT Sans'),local('PTSans'),url("../font/PTSans-Regular-webfont.woff") format('woff')}@font-face{font-family:'PT Sans';font-style:normal;font-weight:700;src:local('PT Sans Bold'),local('PTSans-Bold'),url("../font/PTSans-Bold-webfont.woff") format('woff')}@font-face{font-family:'PT Sans';font-style:italic;font-weight:400;src:local('PT Sans Italic'),local('PTSans-Italic'),url("../font/PTSans-Italic-webfont.woff") format('woff')}@font-face{font-family:'PT Sans';font-style:italic;font-weight:700;src:local('PT Sans Bold Italic'),local('PTSans-BoldItalic'),url("../font/PTSans-BoldItalic-webfont.woff") format('woff')}#wmd-input{position:absolute;top:0;left:0;font-family:"PT Sans",sans-serif;line-height:1.65;letter-spacing:normal;border-radius:0;color:#747474;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none;padding:0;background-color:#fcfcfc;overflow:auto;white-space:pre-wrap;word-wrap:break-word;word-break:normal}#wmd-input>.editor-content{padding-bottom:230px} #wmd-input>.editor-margin{position:absolute;top:0;left:0}#wmd-input>.editor-margin .discussion{font-size:17px;position:absolute;cursor:pointer}#wmd-input>.editor-margin .discussion.new{display:none}#wmd-input>.editor-margin .discussion.new:hover,#wmd-input>.editor-margin .discussion.new.active,#wmd-input>.editor-margin .discussion.new.active:hover{display:inline-block;color:rgba(154,154,154,0.35) !important} -#wmd-input>.editor-margin .discussion.added{color:rgba(235,176,0,0.5)}#wmd-input>.editor-margin .discussion.added:hover,#wmd-input>.editor-margin .discussion.added.active,#wmd-input>.editor-margin .discussion.added.active:hover{color:rgba(235,176,0,0.8) !important} -#wmd-input>.editor-margin .discussion.replied{color:rgba(241,92,0,0.7)}#wmd-input>.editor-margin .discussion.replied:hover,#wmd-input>.editor-margin .discussion.replied.active,#wmd-input>.editor-margin .discussion.replied.active:hover{color:#f15c00 !important} +#wmd-input>.editor-margin .discussion.added{color:rgba(235,161,0,0.5)}#wmd-input>.editor-margin .discussion.added:hover,#wmd-input>.editor-margin .discussion.added.active,#wmd-input>.editor-margin .discussion.added.active:hover{color:rgba(235,161,0,0.8) !important} +#wmd-input>.editor-margin .discussion.replied{color:rgba(241,76,0,0.7)}#wmd-input>.editor-margin .discussion.replied:hover,#wmd-input>.editor-margin .discussion.replied.active,#wmd-input>.editor-margin .discussion.replied.active:hover{color:#f14c00 !important} #wmd-input>.editor-margin .discussion.icon-split{font-size:22px}#wmd-input>.editor-margin .discussion.icon-split:before{margin-right:0} #wmd-input>.editor-margin .discussion:hover,#wmd-input>.editor-margin .discussion.active{text-decoration:none} #wmd-input.font-monospaced *{font-family:"Source Code Pro",monospace !important;line-height:1.65 !important;font-size:1em !important} -#wmd-input .comment-highlight{background-color:rgba(235,176,0,0.3)} -#wmd-input .conflict{font-weight:bold;color:#f15c00} +#wmd-input .comment-highlight{background-color:rgba(235,161,0,0.3)} +#wmd-input .conflict{font-weight:bold;color:#f14c00} #wmd-input .code,#wmd-input .pre{color:#4e4e4e;font:normal .9em "Source Code Pro",monospace} #wmd-input .tag{color:#4e4e4e;font:bold .9em "Source Code Pro",monospace}#wmd-input .tag .punctuation,#wmd-input .tag .attr-value,#wmd-input .tag .attr-name{font-weight:normal} #wmd-input .latex,#wmd-input .math{color:#9a9a9a} @@ -1485,7 +1487,7 @@ div.dropdown-menu .stat{margin:20px 0 10px} div.dropdown-menu i{margin-right:0} div.dropdown-menu textarea{width:250px;height:150px;resize:none} div.dropdown-menu a:hover,div.dropdown-menu a:focus{color:#0f4d8a} -div.dropdown-menu h1,div.dropdown-menu h2,div.dropdown-menu h3,div.dropdown-menu h4,div.dropdown-menu h5,div.dropdown-menu h6{margin:1em 0} +div.dropdown-menu h1,div.dropdown-menu h2,div.dropdown-menu h3,div.dropdown-menu h4,div.dropdown-menu h5,div.dropdown-menu h6{margin:0.8em 0} .btn-gittip{width:52px;height:25px} .title-icon-category{display:inline-block;opacity:.15;filter:alpha(opacity=15);margin-top:-2px;margin-left:-2px;margin-right:3px;font-size:1em;vertical-align:top}.file-title-navbar .title-icon-category{font-size:16px} .picker-dialog{z-index:1050 !important} @@ -1506,8 +1508,8 @@ input[type="file"]{line-height:inherit;height:inherit;border:none !important} .comments-popover .popover .popover-content .comment-block{margin-bottom:5px} .comments-popover .popover .popover-content .form-group,.comments-popover .popover .popover-content blockquote{margin-bottom:10px} .comments-popover .popover .popover-content .comment-author{font-weight:bold;color:#484848} -.comments-popover .popover .popover-content .icon-comment{font-size:15px;color:rgba(235,176,0,0.6)} -.comments-popover .popover .popover-content .reply .icon-comment{color:rgba(241,92,0,0.7)} +.comments-popover .popover .popover-content .icon-comment{font-size:15px;color:rgba(235,161,0,0.6)} +.comments-popover .popover .popover-content .reply .icon-comment{color:rgba(241,76,0,0.7)} .comments-popover .popover .popover-content .new-comment-block .icon-comment{color:rgba(154,154,154,0.35)} .comments-popover .popover .popover-content .input-comment-author{border:none;background:none;-webkit-box-shadow:none;box-shadow:none;font-weight:bold;height:28px;padding:0 0 5px;width:140px;display:inline-block} .comments-popover .popover .popover-content hr{margin:0 0 10px} diff --git a/public/res-min/themes/school.css b/public/res-min/themes/school.css index 2e2e6a50..d487c91d 100644 --- a/public/res-min/themes/school.css +++ b/public/res-min/themes/school.css @@ -65,8 +65,8 @@ small,.small{font-size:85%} cite{font-style:normal} .text-muted{color:#999} .text-primary{color:#428bca}.text-primary:hover{color:#3071a9} -.text-warning{color:#b88a00}.text-warning:hover{color:#856400} -.text-danger{color:#a94100}.text-danger:hover{color:#762d00} +.text-warning{color:#b87e00}.text-warning:hover{color:#855b00} +.text-danger{color:#a93600}.text-danger:hover{color:#762500} .text-success{color:#3c763d}.text-success:hover{color:#2b542c} .text-info{color:#31708f}.text-info:hover{color:#245269} .text-left{text-align:left} @@ -174,10 +174,10 @@ table td[class*="col-"],table th[class*="col-"]{float:none;display:table-cell} .table-hover>tbody>tr>.active:hover,.table-hover>tbody>.active:hover>td,.table-hover>tbody>.active:hover>th{background-color:#e8e8e8} .table>thead>tr>.success,.table>tbody>tr>.success,.table>tfoot>tr>.success,.table>thead>.success>td,.table>tbody>.success>td,.table>tfoot>.success>td,.table>thead>.success>th,.table>tbody>.success>th,.table>tfoot>.success>th{background-color:#dff0d8} .table-hover>tbody>tr>.success:hover,.table-hover>tbody>.success:hover>td,.table-hover>tbody>.success:hover>th{background-color:#d0e9c6} -.table>thead>tr>.danger,.table>tbody>tr>.danger,.table>tfoot>tr>.danger,.table>thead>.danger>td,.table>tbody>.danger>td,.table>tfoot>.danger>td,.table>thead>.danger>th,.table>tbody>.danger>th,.table>tfoot>.danger>th{background-color:rgba(255,101,6,0.1)} -.table-hover>tbody>tr>.danger:hover,.table-hover>tbody>.danger:hover>td,.table-hover>tbody>.danger:hover>th{background-color:rgba(235,90,0,0.1)} -.table>thead>tr>.warning,.table>tbody>tr>.warning,.table>tfoot>tr>.warning,.table>thead>.warning>td,.table>tbody>.warning>td,.table>tfoot>.warning>td,.table>thead>.warning>th,.table>tbody>.warning>th,.table>tfoot>.warning>th{background-color:rgba(255,192,0,0.12)} -.table-hover>tbody>tr>.warning:hover,.table-hover>tbody>.warning:hover>td,.table-hover>tbody>.warning:hover>th{background-color:rgba(230,172,0,0.12)} +.table>thead>tr>.danger,.table>tbody>tr>.danger,.table>tfoot>tr>.danger,.table>thead>.danger>td,.table>tbody>.danger>td,.table>tfoot>.danger>td,.table>thead>.danger>th,.table>tbody>.danger>th,.table>tfoot>.danger>th{background-color:rgba(255,85,6,0.1)} +.table-hover>tbody>tr>.danger:hover,.table-hover>tbody>.danger:hover>td,.table-hover>tbody>.danger:hover>th{background-color:rgba(235,75,0,0.1)} +.table>thead>tr>.warning,.table>tbody>tr>.warning,.table>tfoot>tr>.warning,.table>thead>.warning>td,.table>tbody>.warning>td,.table>tfoot>.warning>td,.table>thead>.warning>th,.table>tbody>.warning>th,.table>tfoot>.warning>th{background-color:rgba(255,174,0,0.12)} +.table-hover>tbody>tr>.warning:hover,.table-hover>tbody>.warning:hover>td,.table-hover>tbody>.warning:hover>th{background-color:rgba(230,157,0,0.12)} @media (max-width:767px){.table-responsive{width:100%;margin-bottom:15.75px;overflow-y:hidden;overflow-x:scroll;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd;-webkit-overflow-scrolling:touch}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap} .table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0} .table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0} .table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0} legend{display:block;width:100%;padding:0;margin-bottom:21px;font-size:22.5px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5} label{display:inline-block;margin-bottom:5px;font-weight:bold} @@ -208,12 +208,12 @@ input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled], textarea.input-sm{height:auto} .input-lg{height:48px;padding:10px 16px;font-size:19px;line-height:1.33;border-radius:6px}select.input-lg{height:48px;line-height:48px} textarea.input-lg{height:auto} -.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#b88a00} -.has-warning .form-control{border-color:#b88a00;-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)}.has-warning .form-control:focus{border-color:#856400;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ffc71f;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ffc71f} -.has-warning .input-group-addon{color:#b88a00;border-color:#b88a00;background-color:rgba(255,192,0,0.12)} -.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a94100} -.has-error .form-control{border-color:#a94100;-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)}.has-error .form-control:focus{border-color:#762d00;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ff6c10;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ff6c10} -.has-error .input-group-addon{color:#a94100;border-color:#a94100;background-color:rgba(255,101,6,0.1)} +.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#b87e00} +.has-warning .form-control{border-color:#b87e00;-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)}.has-warning .form-control:focus{border-color:#855b00;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ffb81f;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ffb81f} +.has-warning .input-group-addon{color:#b87e00;border-color:#b87e00;background-color:rgba(255,174,0,0.12)} +.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a93600} +.has-error .form-control{border-color:#a93600;-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)}.has-error .form-control:focus{border-color:#762500;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ff5c10;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ff5c10} +.has-error .input-group-addon{color:#a93600;border-color:#a93600;background-color:rgba(255,85,6,0.1)} .has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline{color:#3c763d} .has-success .form-control{border-color:#3c763d;-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)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168} .has-success .input-group-addon{color:#3c763d;border-color:#3c763d;background-color:#dff0d8} @@ -679,8 +679,8 @@ textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon .label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9} .label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44} .label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5} -.label-warning{background-color:#ebb000}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#b88a00} -.label-danger{background-color:#f15c00}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#be4900} +.label-warning{background-color:#eba100}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#b87e00} +.label-danger{background-color:#f14c00}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#be3c00} .badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:13px;font-weight:bold;color:#fff;line-height:1;vertical-align:baseline;white-space:nowrap;text-align:center;background-color:#999;border-radius:10px}.badge:empty{display:none} .btn .badge{position:relative;top:-1px} a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer} @@ -703,10 +703,10 @@ a.thumbnail:hover,a.thumbnail:focus,a.thumbnail.active{border-color:#1980e6} .alert-success .alert-link{color:#2b542c} .alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#31708f}.alert-info hr{border-top-color:#a6e1ec} .alert-info .alert-link{color:#245269} -.alert-warning{background-color:rgba(255,192,0,0.12);border-color:rgba(255,192,0,0.24);color:#b88a00}.alert-warning hr{border-top-color:rgba(230,172,0,0.24)} -.alert-warning .alert-link{color:#856400} -.alert-danger{background-color:rgba(255,101,6,0.1);border-color:rgba(255,101,6,0.2);color:#a94100}.alert-danger hr{border-top-color:rgba(235,90,0,0.2)} -.alert-danger .alert-link{color:#762d00} +.alert-warning{background-color:rgba(255,174,0,0.12);border-color:rgba(255,174,0,0.24);color:#b87e00}.alert-warning hr{border-top-color:rgba(230,157,0,0.24)} +.alert-warning .alert-link{color:#855b00} +.alert-danger{background-color:rgba(255,85,6,0.1);border-color:rgba(255,85,6,0.2);color:#a93600}.alert-danger hr{border-top-color:rgba(235,75,0,0.2)} +.alert-danger .alert-link{color:#762500} @-webkit-keyframes progress-bar-stripes{from{background-position:40px 0} to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0} to{background-position:0 0}}.progress{overflow:hidden;height:21px;margin-bottom:21px;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)} .progress-bar{float:left;width:0%;height:100%;font-size:13px;line-height:21px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-transition:width .6s ease;transition:width .6s ease} .progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-size:40px 40px} @@ -761,10 +761,10 @@ a.list-group-item.active .list-group-item-text,a.list-group-item.active:hover .l .panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#428bca} .panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#d6e9c6} .panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#d6e9c6} -.panel-warning{border-color:rgba(255,192,0,0.24)}.panel-warning>.panel-heading{color:#b88a00;background-color:rgba(255,192,0,0.12);border-color:rgba(255,192,0,0.24)}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:rgba(255,192,0,0.24)} -.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:rgba(255,192,0,0.24)} -.panel-danger{border-color:rgba(255,101,6,0.2)}.panel-danger>.panel-heading{color:#a94100;background-color:rgba(255,101,6,0.1);border-color:rgba(255,101,6,0.2)}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:rgba(255,101,6,0.2)} -.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:rgba(255,101,6,0.2)} +.panel-warning{border-color:rgba(255,174,0,0.24)}.panel-warning>.panel-heading{color:#b87e00;background-color:rgba(255,174,0,0.12);border-color:rgba(255,174,0,0.24)}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:rgba(255,174,0,0.24)} +.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:rgba(255,174,0,0.24)} +.panel-danger{border-color:rgba(255,85,6,0.2)}.panel-danger>.panel-heading{color:#a93600;background-color:rgba(255,85,6,0.1);border-color:rgba(255,85,6,0.2)}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:rgba(255,85,6,0.2)} +.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:rgba(255,85,6,0.2)} .panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse .panel-body{border-top-color:#bce8f1} .panel-info>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#bce8f1} .well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)} @@ -1236,7 +1236,7 @@ h3{font-size:1.7em} h4{font-size:1.25em} h5{font-size:1em} h6{font-size:.85em} -h1,h2,h3,h4,h5,h6{margin:1.3em 0} +h1,h2,h3,h4,h5,h6{margin:1.3em 0;font-weight:300} pre{word-break:break-word} p,pre,pre.prettyprint,blockquote{margin:0 0 1.1em} hr{margin:2em 0} @@ -1311,17 +1311,20 @@ div.jGrowl div.jGrowl-closer{padding-top:4px;padding-bottom:4px;cursor:pointer;f .dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{border-color:transparent} .collapsed>.icon-up-dir:before{content:'\e94d'} .modal.fade .modal-dialog{-webkit-transform:translate(0, 0);-ms-transform:translate(0, 0);transform:translate(0, 0)} -.modal .modal-content{background-color:#f5f4f2} -.modal .modal-body{background-color:#fff;padding-bottom:30px} -.modal .modal-footer{margin-top:0} +.modal-content{background-color:#f5f4f2} +.modal-body{background-color:#fff;padding-bottom:30px} +.modal-footer{background-color:#f5f4f2;margin-top:0} +.modal-iframe{display:block;margin:30px auto 0;z-index:1040;border-radius: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} .nav-pills>li>a{border:1px solid rgba(0,0,0,0)}.nav-pills>li>a:hover,.nav-pills>li>a:focus{color:#2d2d2d;border-color:rgba(121,121,121,0.1)} .nav-pills>li.open>a .caret,.nav-pills>li>a:hover .caret,.nav-pills>li>a:focus .caret{border-top-color:#2d2d2d;border-bottom-color:#2d2d2d} .nav-pills>li.disabled>a:hover,.nav-pills>li.disabled>a:focus{border-color:rgba(0,0,0,0)} .nav-pills>li.open>a,.nav-pills>li.open>a:hover,.nav-pills>li.open>a:focus{color:#2d2d2d;border-color:rgba(121,121,121,0.1)} -.list-group-item{padding:10px 15px;margin-bottom:0}.list-group .list-group-item{border-radius:0} -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)} -.text-danger:hover{color:#a94100} +.list-group-item{padding:10px 15px;border-left-width:0;border-right-width:0;margin-bottom:0}.list-group .list-group-item{border-radius:0} +a.list-group-item:hover,a.list-group-item:focus{color:#2d2d2d;border-color:rgba(121,121,121,0.1)} +.list-group-item .checkbox{float:right;margin:0;padding:0;cursor:pointer}.list-group-item .checkbox input{cursor:pointer;margin:0 16px;height:38px} +.form-group{margin-bottom:1px;padding:5px} +.text-danger:hover{color:#a93600} .bring-to-front{z-index:1050 !important} .dialog-header-message{position:absolute;top:12px;right:55px;font-weight:bold} .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} @@ -1357,8 +1360,8 @@ a.list-group-item:hover,a.list-group-item:focus{color:#2d2d2d;border-top-color:r .navbar .nav.pull-right{float:right}.navbar .nav.pull-right>li>.dropdown-menu{right:0;left:auto}.navbar .nav.pull-right>li>.dropdown-menu .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0} .navbar .btn{height:38px;padding:6px 8px} .navbar .btn-group>.btn.disabled *,.navbar .btn-group>.btn.blocked *,.navbar .btn-group>.btn[disabled] *{color:rgba(221,221,221,0.3)} -.navbar .button-open-discussion.some{color:#e0a900} -.navbar .button-open-discussion.replied{color:#d25000} +.navbar .button-open-discussion.some{color:#e09a00} +.navbar .button-open-discussion.replied{color:#d24200} .navbar .file-title-navbar{display:inline-block;vertical-align:middle;padding:1px 15px;font-size:1.5em;line-height:1.4em;font-weight:200;overflow:hidden;white-space:nowrap} .navbar .input-file-title-container{display:inline-block;vertical-align:middle}.navbar .input-file-title-container .input-file-title{width:400px;font-size:16px;height:38px} .navbar .working-indicator{display:inline-block;vertical-align:middle;overflow:hidden;height:38px;width:60px;padding-top:8px}.navbar .working-indicator .bar{display:inline-block;width:14px;height:6px;border-radius:1px;margin:0 2px;opacity:0.25;background-color:#ddd} @@ -1392,7 +1395,6 @@ a.list-group-item:hover,a.list-group-item:focus{color:#2d2d2d;border-top-color:r .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} .modal-document-manager .folder{font-weight:bold;color:#21425f;font-size:15px;border-top-color:#eee} -.modal-document-manager .checkbox{float:right;margin:0;padding:0;cursor:pointer}.modal-document-manager .checkbox input{cursor:pointer;margin:0 16px;height:38px} .modal-document-manager .input-rename{width:220px;height:38px} .modal-document-manager .name,.modal-document-manager .file-count{padding:9px 20px 9px 15px} .extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn,.extension-buttons>.btn-group>.btn,.extension-preview-buttons>.btn-group>.btn{border-radius:0} @@ -1432,13 +1434,13 @@ a.list-group-item:hover,a.list-group-item:focus{color:#2d2d2d;border-top-color:r .layout-toggler.layout-toggler-navbar{line-height:0}.layout-toggler.layout-toggler-navbar i{font-size:16px;height:12px;overflow:hidden} @font-face{font-family:'PT Sans';font-style:normal;font-weight:400;src:local('PT Sans'),local('PTSans'),url("../font/PTSans-Regular-webfont.woff") format('woff')}@font-face{font-family:'PT Sans';font-style:normal;font-weight:700;src:local('PT Sans Bold'),local('PTSans-Bold'),url("../font/PTSans-Bold-webfont.woff") format('woff')}@font-face{font-family:'PT Sans';font-style:italic;font-weight:400;src:local('PT Sans Italic'),local('PTSans-Italic'),url("../font/PTSans-Italic-webfont.woff") format('woff')}@font-face{font-family:'PT Sans';font-style:italic;font-weight:700;src:local('PT Sans Bold Italic'),local('PTSans-BoldItalic'),url("../font/PTSans-BoldItalic-webfont.woff") format('woff')}#wmd-input{position:absolute;top:0;left:0;font-family:"PT Sans",sans-serif;line-height:1.65;letter-spacing:normal;border-radius:0;color:#415b73;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none;padding:0;background-color:#fff;overflow:auto;white-space:pre-wrap;word-wrap:break-word;word-break:normal}#wmd-input>.editor-content{padding-bottom:230px} #wmd-input>.editor-margin{position:absolute;top:0;left:0}#wmd-input>.editor-margin .discussion{font-size:17px;position:absolute;cursor:pointer}#wmd-input>.editor-margin .discussion.new{display:none}#wmd-input>.editor-margin .discussion.new:hover,#wmd-input>.editor-margin .discussion.new.active,#wmd-input>.editor-margin .discussion.new.active:hover{display:inline-block;color:rgba(92,130,164,0.35) !important} -#wmd-input>.editor-margin .discussion.added{color:rgba(235,176,0,0.5)}#wmd-input>.editor-margin .discussion.added:hover,#wmd-input>.editor-margin .discussion.added.active,#wmd-input>.editor-margin .discussion.added.active:hover{color:rgba(235,176,0,0.8) !important} -#wmd-input>.editor-margin .discussion.replied{color:rgba(241,92,0,0.7)}#wmd-input>.editor-margin .discussion.replied:hover,#wmd-input>.editor-margin .discussion.replied.active,#wmd-input>.editor-margin .discussion.replied.active:hover{color:#f15c00 !important} +#wmd-input>.editor-margin .discussion.added{color:rgba(235,161,0,0.5)}#wmd-input>.editor-margin .discussion.added:hover,#wmd-input>.editor-margin .discussion.added.active,#wmd-input>.editor-margin .discussion.added.active:hover{color:rgba(235,161,0,0.8) !important} +#wmd-input>.editor-margin .discussion.replied{color:rgba(241,76,0,0.7)}#wmd-input>.editor-margin .discussion.replied:hover,#wmd-input>.editor-margin .discussion.replied.active,#wmd-input>.editor-margin .discussion.replied.active:hover{color:#f14c00 !important} #wmd-input>.editor-margin .discussion.icon-split{font-size:22px}#wmd-input>.editor-margin .discussion.icon-split:before{margin-right:0} #wmd-input>.editor-margin .discussion:hover,#wmd-input>.editor-margin .discussion.active{text-decoration:none} #wmd-input.font-monospaced *{font-family:"Source Code Pro",monospace !important;line-height:1.65 !important;font-size:1em !important} -#wmd-input .comment-highlight{background-color:rgba(235,176,0,0.3)} -#wmd-input .conflict{font-weight:bold;color:#f15c00} +#wmd-input .comment-highlight{background-color:rgba(235,161,0,0.3)} +#wmd-input .conflict{font-weight:bold;color:#f14c00} #wmd-input .code,#wmd-input .pre{color:#253442;font:normal .9em "Source Code Pro",monospace} #wmd-input .tag{color:#253442;font:bold .9em "Source Code Pro",monospace}#wmd-input .tag .punctuation,#wmd-input .tag .attr-value,#wmd-input .tag .attr-name{font-weight:normal} #wmd-input .latex,#wmd-input .math{color:#5c82a4} @@ -1485,7 +1487,7 @@ div.dropdown-menu .stat{margin:20px 0 10px} div.dropdown-menu i{margin-right:0} div.dropdown-menu textarea{width:250px;height:150px;resize:none} div.dropdown-menu a:hover,div.dropdown-menu a:focus{color:#0f4d8a} -div.dropdown-menu h1,div.dropdown-menu h2,div.dropdown-menu h3,div.dropdown-menu h4,div.dropdown-menu h5,div.dropdown-menu h6{margin:1em 0} +div.dropdown-menu h1,div.dropdown-menu h2,div.dropdown-menu h3,div.dropdown-menu h4,div.dropdown-menu h5,div.dropdown-menu h6{margin:0.8em 0} .btn-gittip{width:52px;height:25px} .title-icon-category{display:inline-block;opacity:.15;filter:alpha(opacity=15);margin-top:-2px;margin-left:-2px;margin-right:3px;font-size:1em;vertical-align:top}.file-title-navbar .title-icon-category{font-size:16px} .picker-dialog{z-index:1050 !important} @@ -1506,8 +1508,8 @@ input[type="file"]{line-height:inherit;height:inherit;border:none !important} .comments-popover .popover .popover-content .comment-block{margin-bottom:5px} .comments-popover .popover .popover-content .form-group,.comments-popover .popover .popover-content blockquote{margin-bottom:10px} .comments-popover .popover .popover-content .comment-author{font-weight:bold;color:#112130} -.comments-popover .popover .popover-content .icon-comment{font-size:15px;color:rgba(235,176,0,0.6)} -.comments-popover .popover .popover-content .reply .icon-comment{color:rgba(241,92,0,0.7)} +.comments-popover .popover .popover-content .icon-comment{font-size:15px;color:rgba(235,161,0,0.6)} +.comments-popover .popover .popover-content .reply .icon-comment{color:rgba(241,76,0,0.7)} .comments-popover .popover .popover-content .new-comment-block .icon-comment{color:rgba(92,130,164,0.35)} .comments-popover .popover .popover-content .input-comment-author{border:none;background:none;-webkit-box-shadow:none;box-shadow:none;font-weight:bold;height:28px;padding:0 0 5px;width:140px;display:inline-block} .comments-popover .popover .popover-content hr{margin:0 0 10px} diff --git a/public/res/helpers/googleHelper.js b/public/res/helpers/googleHelper.js index bd1607e1..c2f52df1 100644 --- a/public/res/helpers/googleHelper.js +++ b/public/res/helpers/googleHelper.js @@ -9,7 +9,7 @@ define([ "logger", "settings", "eventMgr", - "classes/AsyncTask", + "classes/AsyncTask" ], function(_, $, constants, core, utils, storage, logger, settings, eventMgr, AsyncTask) { var connected = false; @@ -98,7 +98,7 @@ define([ ], gdrive: [ 'https://www.googleapis.com/auth/drive.install', - settings.gdriveFullAccess === true ? 'https://www.googleapis.com/auth/drive' : 'https://www.googleapis.com/auth/drive.file' + settings.gdriveFullAccess === true ? 'https://www.googleapis.com/auth/drive' : 'https://www.googleapis.com/auth/drive.file' ], blogger: [ 'https://www.googleapis.com/auth/blogger' @@ -260,7 +260,7 @@ define([ method = 'PUT'; } var headers = { - 'Content-Type': 'multipart/mixed; boundary="' + boundary + '"', + 'Content-Type': 'multipart/mixed; boundary="' + boundary + '"' }; var base64Data = utils.encodeBase64(content); @@ -283,10 +283,10 @@ define([ 'path': path, 'method': method, 'params': { - 'uploadType': 'multipart', + 'uploadType': 'multipart' }, 'headers': headers, - 'body': multipartRequestBody, + 'body': multipartRequestBody }); request.execute(function(response) { if(response && response.id) { @@ -696,7 +696,7 @@ define([ "text/x-markdown", "text/plain", "application/octet-stream", - "application/vnd.google-apps.drive-sdk." + constants.GOOGLE_DRIVE_APP_ID + "application/vnd.google-apps.drive-sdk." + constants.GOOGLE_DRIVE_APP_ID ].join(",")); pickerBuilder.enableFeature(google.picker.Feature.NAV_HIDDEN); pickerBuilder.enableFeature(google.picker.Feature.MULTISELECT_ENABLED); @@ -733,7 +733,7 @@ define([ } }); picker = pickerBuilder.build(); - var $backdrop = $(utils.createBackdrop()).on('click.backdrop', function() { + $(utils.createBackdrop()).on('click.backdrop', function() { hidePicker(); task.chain(); }); diff --git a/public/res/helpers/teamserverHelper.js b/public/res/helpers/teamserverHelper.js index cc9160f0..ac6189bd 100644 --- a/public/res/helpers/teamserverHelper.js +++ b/public/res/helpers/teamserverHelper.js @@ -228,7 +228,7 @@ define([ $windowElt.on('message.teamserver', function(evt) { evt = evt.originalEvent; if(evt.origin == origin && evt.data.status == 'DocumentPickerFinished') { - docs = evt.data.documents; + docs = evt.data.documents || []; hidePicker(); task.chain(); }