diff --git a/public/cache.manifest b/public/cache.manifest index 51a767d1..ade6218c 100644 --- a/public/cache.manifest +++ b/public/cache.manifest @@ -1,5 +1,5 @@ CACHE MANIFEST -#Date Thu Oct 10 2013 00:09:54 +#Date Fri Oct 11 2013 22:46:08 CACHE: index.html diff --git a/public/res-min/main.js b/public/res-min/main.js index 12d67c4e..a10b77e2 100644 --- a/public/res-min/main.js +++ b/public/res-min/main.js @@ -14646,7 +14646,7 @@ define("config", function() {}), define("storage", [ "underscore", "utils" ], fu if (a === !1 && l === !1) { var t = "/ga.js"; location.search.match(/(\?|&)console/) && (t = "/u/ga_debug.js"), e.ajax({ - url: "http://www.google-analytics.com" + t, + url: "https://ssl.google-analytics.com" + t, dataType: "script" }).done(function() { a = !0; @@ -15502,8 +15502,6 @@ define("config", function() {}), define("storage", [ "underscore", "utils" ], fu var t = e(d.querySelector(".search-bar .form-control")); t.bind("propertychange keyup input paste", function() { s(t.val()); - }), e(d.querySelector(".search-bar .close")).click(function() { - t.val(""), s(""), t.focus(); }); }, a; }), define("extensions/documentManager", [ "jquery", "underscore", "utils", "classes/Extension", "classes/FolderDescriptor", "folderList", "fileSystem", "config" ], function(e, t, n, i, o, r, s) { @@ -21749,7 +21747,7 @@ if (hljs.LANGUAGES.glsl = function(e) { }, { element: ".menu-panel .collapse-button", title: "Menu", - content: [ "

Use the menu to synchronize your document on Google Drive or Dropbox.

", "Use also this menu to publish your document on GitHub, Blogger, WordPress..." ].join(""), + content: [ "

Use the menu to synchronize your document on Google Drive or Dropbox.

", "Use also this menu to publish your document on GitHub, Blogger..." ].join(""), placement: "right", reflex: !0 }, { @@ -21761,7 +21759,7 @@ if (hljs.LANGUAGES.glsl = function(e) { }, { element: "#extension-buttons .button-publish", title: "Update publications", - content: "Once published, use the Publish button to update your publications.", + content: "Once published, use the Publish button to update your publication.", placement: "bottom", reflex: !0 } ]), _.has(localStorage, "welcomeTour") || t.start(), e(".action-welcome-tour").click(function() { @@ -22313,11 +22311,17 @@ if (hljs.LANGUAGES.glsl = function(e) { e.each(s, function(e) { i.setInputValue("#input-settings-shortcut-" + e.name, e.bindKey.win), i.setInputValue("#input-settings-shortcut-" + e.name + "-mac", e.bindKey.mac); }); + }, r.saveSettings = function(t) { + t.shortcuts = {}, e.each(s, function(e, n) { + var o = {}; + o.win = i.getInputValue("#input-settings-shortcut-" + e.name), o.mac = i.getInputValue("#input-settings-shortcut-" + e.name + "-mac"), + t.shortcuts[n] = o; + }); }, r; }), define("text!html/bodyIndex.html", [], function() { - return '\n
\n
\n
\n
\n\n\n\n\n
\n \n \n
\n
\n
\n
\n
\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
\n
'; + return '\n
\n
\n
\n
\n\n\n\n\n
\n \n \n
\n
\n
\n
\n
\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n
\n
'; }), 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'; + return '\n\n
\n
\n
\n\n\n\n
\n \n \n
\n
\n
\n
\n
\n\n\n'; }), define("text!html/settingsTemplateTooltip.html", [], function() { return 'Available variables:\n
\n\nExamples:\n
<title><%= documentTitle %></title>\n
<div><%- documentHTML %></div>\n
<%\n
if(publishAttributes.provider.providerId == "github") print(documentMarkdown);\n%>\n
\n
\nMore\n info\n
\n
\n\n Careful! Template is subject to malicious code. Don\'t copy/paste untrusted\n content.'; }), define("text!html/settingsUserCustomExtensionTooltip.html", [], function() { @@ -26067,8 +26071,9 @@ if (hljs.LANGUAGES.glsl = function(e) { n.commitMsg = o.getInputTextValue("#input-settings-publish-commit-msg", t), n.gdriveFullAccess = o.getInputChecked("#input-settings-gdrive-full-access"), n.template = o.getInputTextValue("#textarea-settings-publish-template", t), n.pdfTemplate = o.getInputTextValue("#textarea-settings-publish-pdf-template", t), n.sshProxy = o.checkUrl(o.getInputTextValue("#input-settings-ssh-proxy", t), !0), - n.extensionSettings = {}, s.onSaveSettings(n.extensionSettings, t), t.isPropagationStopped() || (e.extend(r, n), - localStorage.settings = JSON.stringify(r), localStorage.theme = i); + a.saveSettings(n), n.extensionSettings = {}, s.onSaveSettings(n.extensionSettings, t), + t.isPropagationStopped() || (e.extend(r, n), localStorage.settings = JSON.stringify(r), + localStorage.theme = i); } function w(e) { e === !0 || I.state.north.isClosed ? (M.hide(), R.hide()) : (M.show(), R.show()); @@ -26125,6 +26130,10 @@ if (hljs.LANGUAGES.glsl = function(e) { stateManagement__enabled: !1, center__minWidth: 200, center__minHeight: 200, + fxSettings: { + easing: "easeInOutQuad", + duration: 350 + }, onopen: function() { w(), C(); }, @@ -26364,13 +26373,13 @@ if (hljs.LANGUAGES.glsl = function(e) { }), e(".action-reset-input").click(function() { o.resetModalInputs(); }), e(".tooltip-lazy-rendering").tooltip({ - container: ".modal-settings", + container: ".modal-settings .modal-dialog", placement: "right", trigger: "hover", title: "Disable preview rendering while typing in order to offload CPU. Refresh preview after 500 ms of inactivity." }), e(".tooltip-default-content").tooltip({ html: !0, - container: ".modal-settings", + container: ".modal-settings .modal-dialog", placement: "right", trigger: "hover", title: "Thanks for supporting StackEdit by adding a backlink in your documents!" @@ -26378,7 +26387,7 @@ if (hljs.LANGUAGES.glsl = function(e) { var c = !1; if (e(".tooltip-usercustom-extension").tooltip({ html: !0, - container: ".modal-settings", + container: ".modal-settings .modal-dialog", placement: "right", trigger: "manual", title: h @@ -26390,7 +26399,7 @@ if (hljs.LANGUAGES.glsl = function(e) { var n = e(t); n.tooltip({ html: !0, - container: n.parents(".modal"), + container: n.parents(".modal-dialog"), placement: "right", trigger: "manual", title: d diff --git a/public/res-min/themes/blue-gray.css b/public/res-min/themes/blue-gray.css index 68577c58..11a1912c 100644 --- a/public/res-min/themes/blue-gray.css +++ b/public/res-min/themes/blue-gray.css @@ -1432,12 +1432,14 @@ body{tab-size:4} .ui-layout-east #preview-contents{padding-left:5px} .working{cursor:progress} .btn,.dropdown-menu{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none} +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} +.close{-webkit-transition:opacity ease-in-out .15s;transition:opacity ease-in-out .15s} .list-group .nav{border-left:10px solid rgba(0,0,0,0.05);margin-left:10px} .list-group-item{padding:10px 15px} .list-group .list-group-item{border-radius:0} .list-group-item.active:hover{background-color:#888888} .move-to-front{z-index:1050 !important} -.btn{padding:8px 11px} +.btn{padding:8px 11px;-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s;transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s} .btn-default:hover{background-color:rgba(0,0,0,0.05)} .btn-primary:hover{color:#ffffff;background-color:#747474} .btn-success:hover,.open .dropdown-toggle.btn-success{color:#545454;background-color:#f0f3f4 !important} @@ -1483,25 +1485,23 @@ body{tab-size:4} .menu-panel.in .collapse-button,.document-panel.in .collapse-button{background-color:#f0f3f4} .menu-panel .panel-content,.document-panel .panel-content{-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);overflow:auto;padding-bottom:30px;height:100%} .menu-panel .panel-content a>i,.document-panel .panel-content a>i{margin-right:3px;color:inherit} -.menu-panel{width:280px !important;margin-left:-305px;-webkit-transition:margin-left .35s ease;-moz-transition:margin-left .35s ease;-o-transition:margin-left .35s ease;transition:margin-left .35s ease} +.menu-panel{width:280px !important;margin-left:-305px;-webkit-transition:margin-left ease-in-out .35s;transition:margin-left ease-in-out .35s} .menu-panel .sub-menu{background-color:#ffffff} .menu-panel.in{margin-left:0} .menu-panel.in .collapse-button,.menu-panel.collapsing .collapse-button{padding-right:17px} -.menu-panel .collapse-button{right:-80px;position:absolute;margin-top:6px;z-index:-1;padding:2px 27px 2px 50px;-webkit-transition:padding-right .35s ease;-moz-transition:padding-right .35s ease;-o-transition:padding-right .35s ease;transition:padding-right .35s ease} +.menu-panel .collapse-button{right:-80px;position:absolute;margin-top:6px;z-index:-1;padding:2px 27px 2px 50px;-webkit-transition:background-color ease-in-out .15s,z-index ease-in-out .15s,padding-right ease-in-out .35s;transition:background-color ease-in-out .15s,z-index ease-in-out .15s,padding-right ease-in-out .35s} .menu-panel .collapse-button:hover{padding-right:17px} .menu-panel .panel-content{background-color:#f0f3f4;padding-top:6px;border-right:5px solid #e5e9ec} -.menu-panel .panel-content>.nav>li>a:hover,.menu-panel .panel-content>.nav>li>a:active{background-color:#f0f3f4} -.document-panel{right:0;width:350px !important;margin-right:-380px;-webkit-transition:margin-right .35s ease;-moz-transition:margin-right .35s ease;-o-transition:margin-right .35s ease;transition:margin-right .35s ease} +.menu-panel .panel-content>.nav>li>a:hover,.menu-panel .panel-content>.nav>li>a:active{background-color:inherit} +.document-panel{right:0;width:350px !important;margin-right:-380px;-webkit-transition:margin-right ease-in-out .35s;transition:margin-right ease-in-out .35s} .document-panel.in{margin-right:0} .document-panel.in .collapse-button,.document-panel.collapsing .collapse-button{padding-left:10px} -.document-panel .collapse-button{left:-80px;position:absolute;margin-top:6px;padding:7px 50px 7px 20px;z-index:-1;-webkit-transition:padding-left .35s ease;-moz-transition:padding-left .35s ease;-o-transition:padding-left .35s ease;transition:padding-left .35s ease} +.document-panel .collapse-button{left:-80px;position:absolute;margin-top:6px;padding:7px 50px 7px 20px;z-index:-1;-webkit-transition:background-color ease-in-out .15s,z-index ease-in-out .15s,padding-left ease-in-out .35s;transition:background-color ease-in-out .15s,z-index ease-in-out .15s,padding-left ease-in-out .35s} .document-panel .collapse-button:hover{padding-left:10px} .document-panel .collapse-button i.icon-folder-open{font-size:22px} .document-panel .panel-content{background-color:#ffffff;padding-top:80px;border-left:5px solid #e5e9ec} .document-panel .panel-content .icon-layers{font-size:135%} .document-panel .search-bar{position:absolute;background-color:#f0f3f4;margin:-10px 25px 0;padding:20px 5px 10px 15px;z-index:3;border:1px solid #e5e9ec;border-top:0;border-radius:6px} -.document-panel .search-bar .form-control{padding:8px 30px 8px 12px} -.document-panel .search-bar .close{position:absolute;float:none;line-height:34px;margin:2px 0 2px -30px;padding:0 8px;font-weight:normal;height:34px} .document-panel .list-group-item{margin:0} .document-panel .folder{font-weight:bold;color:#545454;font-size:15px;border-bottom-color:#f0f3f4} .document-panel .list-group{margin:0} @@ -1565,10 +1565,8 @@ body{tab-size:4} .publish-custom-template-collapse{margin-bottom:0} .publish-custom-template-collapse textarea{max-width:100%;min-height:100px} .ui-layout-resizer{overflow:visible !important;font-size:14px !important} -.ui-layout-resizer .btn{float:none} -.ui-layout-resizer .btn i{color:rgba(84,84,84,0.3)} -.ui-layout-resizer .btn:hover,.ui-layout-resizer .btn:focus,.ui-layout-resizer .btn:active,.ui-layout-resizer .btn.active{background-color:#e5e9ec} -.ui-layout-resizer .btn:hover i,.ui-layout-resizer .btn:focus i,.ui-layout-resizer .btn:active i,.ui-layout-resizer .btn.active i{color:#545454} +.ui-layout-resizer .btn{float:none;color:rgba(84,84,84,0.3)} +.ui-layout-resizer .btn:hover,.ui-layout-resizer .btn:focus,.ui-layout-resizer .btn:active,.ui-layout-resizer .btn.active{background-color:#e5e9ec;color:#545454} .ui-layout-resizer .ui-layout-toggler{font-size:22px !important} .ui-layout-resizer .ui-layout-toggler.ui-layout-toggler-east{line-height:55px} .ui-layout-resizer .ui-layout-toggler.ui-layout-toggler-east.ui-layout-toggler-east-open i:before{content:'\e87e'} @@ -1626,10 +1624,15 @@ ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} .ace-tm .ace_description{color:#666666} .ace-tm .ace_constant{color:#545454} .ace-tm .ace_marker-layer .misspelled{position:absolute;z-index:-2;border-bottom:1px dotted red;margin-bottom:-1px} -.ace_search{background-color:#d9dfe3;border:6px solid #f0f3f4;border-top:0;padding:10px 15px 5px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;min-width:318px} -.ace_search .ace_search_field{width:200px} +.ace_search{background-color:#e5e9ec;border:6px solid #f0f3f4;border-top:0;padding:10px 15px 5px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;min-width:318px} +.ace_search .ace_search_form,.ace_search .ace_replace_form{margin-bottom:10px} +.ace_search .ace_search_field{width:185px} +.ace_search .ace_search_field,.ace_search .ace_searchbtn,.ace_search .ace_replacebtn{height:30px;padding:0 12px;font-size:14px;line-height:1.428571429;color:#555555;vertical-align:middle;background-color:#ffffff;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)} +.ace_search .ace_searchbtn{background-image:none;font-family:"fontello";width:auto;font-size:16px} +.ace_search .ace_searchbtn.next:before{content:'\e880'} +.ace_search .ace_searchbtn.prev:before{content:'\e87f'} .ace_search .ace_replacebtn{padding:0 4px} -.ace_search .ace_searchbtn_close{background:transparent;margin:0;font-size:21px;font-weight:bold;text-shadow:0 1px 0 #ffffff;opacity:0.3;filter:alpha(opacity=30)} +.ace_search .ace_searchbtn_close{background:transparent;margin:0;font-size:21px;font-weight:bold;text-shadow:0 1px 0 #ffffff;opacity:0.3;filter:alpha(opacity=30);-webkit-transition:opacity ease-in-out .15s;transition:opacity ease-in-out .15s} .ace_search .ace_searchbtn_close:before{content:'\d7'} .ace_search .ace_searchbtn_close:hover,.ace_search .ace_searchbtn_close:focus{color:#333333;text-decoration:none;cursor:pointer;opacity:0.5;filter:alpha(opacity=50);background:transparent} #wmd-input{border-radius:4px;color:#545454;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none !important} diff --git a/public/res-min/themes/default.css b/public/res-min/themes/default.css index 699556f1..48b70f18 100644 --- a/public/res-min/themes/default.css +++ b/public/res-min/themes/default.css @@ -1432,12 +1432,14 @@ body{tab-size:4} .ui-layout-east #preview-contents{padding-left:5px} .working{cursor:progress} .btn,.dropdown-menu{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none} +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} +.close{-webkit-transition:opacity ease-in-out .15s;transition:opacity ease-in-out .15s} .list-group .nav{border-left:10px solid rgba(0,0,0,0.05);margin-left:10px} .list-group-item{padding:10px 15px} .list-group .list-group-item{border-radius:0} .list-group-item.active:hover{background-color:#888888} .move-to-front{z-index:1050 !important} -.btn{padding:8px 11px} +.btn{padding:8px 11px;-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s;transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s} .btn-default:hover{background-color:rgba(0,0,0,0.05)} .btn-primary:hover{color:#ffffff;background-color:#747474} .btn-success:hover,.open .dropdown-toggle.btn-success{color:#545454;background-color:#f1f1f1 !important} @@ -1483,25 +1485,23 @@ body{tab-size:4} .menu-panel.in .collapse-button,.document-panel.in .collapse-button{background-color:#f1f1f1} .menu-panel .panel-content,.document-panel .panel-content{-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);overflow:auto;padding-bottom:30px;height:100%} .menu-panel .panel-content a>i,.document-panel .panel-content a>i{margin-right:3px;color:inherit} -.menu-panel{width:280px !important;margin-left:-305px;-webkit-transition:margin-left .35s ease;-moz-transition:margin-left .35s ease;-o-transition:margin-left .35s ease;transition:margin-left .35s ease} +.menu-panel{width:280px !important;margin-left:-305px;-webkit-transition:margin-left ease-in-out .35s;transition:margin-left ease-in-out .35s} .menu-panel .sub-menu{background-color:#ffffff} .menu-panel.in{margin-left:0} .menu-panel.in .collapse-button,.menu-panel.collapsing .collapse-button{padding-right:17px} -.menu-panel .collapse-button{right:-80px;position:absolute;margin-top:6px;z-index:-1;padding:2px 27px 2px 50px;-webkit-transition:padding-right .35s ease;-moz-transition:padding-right .35s ease;-o-transition:padding-right .35s ease;transition:padding-right .35s ease} +.menu-panel .collapse-button{right:-80px;position:absolute;margin-top:6px;z-index:-1;padding:2px 27px 2px 50px;-webkit-transition:background-color ease-in-out .15s,z-index ease-in-out .15s,padding-right ease-in-out .35s;transition:background-color ease-in-out .15s,z-index ease-in-out .15s,padding-right ease-in-out .35s} .menu-panel .collapse-button:hover{padding-right:17px} .menu-panel .panel-content{background-color:#f1f1f1;padding-top:6px;border-right:5px solid #e7e7e7} -.menu-panel .panel-content>.nav>li>a:hover,.menu-panel .panel-content>.nav>li>a:active{background-color:#f1f1f1} -.document-panel{right:0;width:350px !important;margin-right:-380px;-webkit-transition:margin-right .35s ease;-moz-transition:margin-right .35s ease;-o-transition:margin-right .35s ease;transition:margin-right .35s ease} +.menu-panel .panel-content>.nav>li>a:hover,.menu-panel .panel-content>.nav>li>a:active{background-color:inherit} +.document-panel{right:0;width:350px !important;margin-right:-380px;-webkit-transition:margin-right ease-in-out .35s;transition:margin-right ease-in-out .35s} .document-panel.in{margin-right:0} .document-panel.in .collapse-button,.document-panel.collapsing .collapse-button{padding-left:10px} -.document-panel .collapse-button{left:-80px;position:absolute;margin-top:6px;padding:7px 50px 7px 20px;z-index:-1;-webkit-transition:padding-left .35s ease;-moz-transition:padding-left .35s ease;-o-transition:padding-left .35s ease;transition:padding-left .35s ease} +.document-panel .collapse-button{left:-80px;position:absolute;margin-top:6px;padding:7px 50px 7px 20px;z-index:-1;-webkit-transition:background-color ease-in-out .15s,z-index ease-in-out .15s,padding-left ease-in-out .35s;transition:background-color ease-in-out .15s,z-index ease-in-out .15s,padding-left ease-in-out .35s} .document-panel .collapse-button:hover{padding-left:10px} .document-panel .collapse-button i.icon-folder-open{font-size:22px} .document-panel .panel-content{background-color:#ffffff;padding-top:80px;border-left:5px solid #e7e7e7} .document-panel .panel-content .icon-layers{font-size:135%} .document-panel .search-bar{position:absolute;background-color:#f1f1f1;margin:-10px 25px 0;padding:20px 5px 10px 15px;z-index:3;border:1px solid #e7e7e7;border-top:0;border-radius:6px} -.document-panel .search-bar .form-control{padding:8px 30px 8px 12px} -.document-panel .search-bar .close{position:absolute;float:none;line-height:34px;margin:2px 0 2px -30px;padding:0 8px;font-weight:normal;height:34px} .document-panel .list-group-item{margin:0} .document-panel .folder{font-weight:bold;color:#545454;font-size:15px;border-bottom-color:#f1f1f1} .document-panel .list-group{margin:0} @@ -1565,10 +1565,8 @@ body{tab-size:4} .publish-custom-template-collapse{margin-bottom:0} .publish-custom-template-collapse textarea{max-width:100%;min-height:100px} .ui-layout-resizer{overflow:visible !important;font-size:14px !important} -.ui-layout-resizer .btn{float:none} -.ui-layout-resizer .btn i{color:rgba(84,84,84,0.3)} -.ui-layout-resizer .btn:hover,.ui-layout-resizer .btn:focus,.ui-layout-resizer .btn:active,.ui-layout-resizer .btn.active{background-color:#e7e7e7} -.ui-layout-resizer .btn:hover i,.ui-layout-resizer .btn:focus i,.ui-layout-resizer .btn:active i,.ui-layout-resizer .btn.active i{color:#545454} +.ui-layout-resizer .btn{float:none;color:rgba(84,84,84,0.3)} +.ui-layout-resizer .btn:hover,.ui-layout-resizer .btn:focus,.ui-layout-resizer .btn:active,.ui-layout-resizer .btn.active{background-color:#e7e7e7;color:#545454} .ui-layout-resizer .ui-layout-toggler{font-size:22px !important} .ui-layout-resizer .ui-layout-toggler.ui-layout-toggler-east{line-height:55px} .ui-layout-resizer .ui-layout-toggler.ui-layout-toggler-east.ui-layout-toggler-east-open i:before{content:'\e87e'} @@ -1626,10 +1624,15 @@ ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} .ace-tm .ace_description{color:#666666} .ace-tm .ace_constant{color:#545454} .ace-tm .ace_marker-layer .misspelled{position:absolute;z-index:-2;border-bottom:1px dotted red;margin-bottom:-1px} -.ace_search{background-color:#dddddd;border:6px solid #f1f1f1;border-top:0;padding:10px 15px 5px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;min-width:318px} -.ace_search .ace_search_field{width:200px} +.ace_search{background-color:#e7e7e7;border:6px solid #f1f1f1;border-top:0;padding:10px 15px 5px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;min-width:318px} +.ace_search .ace_search_form,.ace_search .ace_replace_form{margin-bottom:10px} +.ace_search .ace_search_field{width:185px} +.ace_search .ace_search_field,.ace_search .ace_searchbtn,.ace_search .ace_replacebtn{height:30px;padding:0 12px;font-size:14px;line-height:1.428571429;color:#555555;vertical-align:middle;background-color:#ffffff;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)} +.ace_search .ace_searchbtn{background-image:none;font-family:"fontello";width:auto;font-size:16px} +.ace_search .ace_searchbtn.next:before{content:'\e880'} +.ace_search .ace_searchbtn.prev:before{content:'\e87f'} .ace_search .ace_replacebtn{padding:0 4px} -.ace_search .ace_searchbtn_close{background:transparent;margin:0;font-size:21px;font-weight:bold;text-shadow:0 1px 0 #ffffff;opacity:0.3;filter:alpha(opacity=30)} +.ace_search .ace_searchbtn_close{background:transparent;margin:0;font-size:21px;font-weight:bold;text-shadow:0 1px 0 #ffffff;opacity:0.3;filter:alpha(opacity=30);-webkit-transition:opacity ease-in-out .15s;transition:opacity ease-in-out .15s} .ace_search .ace_searchbtn_close:before{content:'\d7'} .ace_search .ace_searchbtn_close:hover,.ace_search .ace_searchbtn_close:focus{color:#333333;text-decoration:none;cursor:pointer;opacity:0.5;filter:alpha(opacity=50);background:transparent} #wmd-input{border-radius:4px;color:#545454;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none !important} diff --git a/public/res-min/themes/night.css b/public/res-min/themes/night.css index b00f0957..9a4d1d74 100644 --- a/public/res-min/themes/night.css +++ b/public/res-min/themes/night.css @@ -1432,12 +1432,14 @@ body{tab-size:4} .ui-layout-east #preview-contents{padding-left:5px} .working{cursor:progress} .btn,.dropdown-menu{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none} +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} +.close{-webkit-transition:opacity ease-in-out .15s;transition:opacity ease-in-out .15s} .list-group .nav{border-left:10px solid rgba(255,255,255,0.08);margin-left:10px} .list-group-item{padding:10px 15px} .list-group .list-group-item{border-radius:0} .list-group-item.active:hover{background-color:#444444} .move-to-front{z-index:1050 !important} -.btn{padding:8px 11px} +.btn{padding:8px 11px;-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s;transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s} .btn-default:hover{background-color:rgba(255,255,255,0.08)} .btn-primary:hover{color:#ffffff;background-color:#585858} .btn-success:hover,.open .dropdown-toggle.btn-success{color:#dedede;background-color:#565656 !important} @@ -1483,25 +1485,23 @@ body{tab-size:4} .menu-panel.in .collapse-button,.document-panel.in .collapse-button{background-color:#565656} .menu-panel .panel-content,.document-panel .panel-content{-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);overflow:auto;padding-bottom:30px;height:100%} .menu-panel .panel-content a>i,.document-panel .panel-content a>i{margin-right:3px;color:inherit} -.menu-panel{width:280px !important;margin-left:-305px;-webkit-transition:margin-left .35s ease;-moz-transition:margin-left .35s ease;-o-transition:margin-left .35s ease;transition:margin-left .35s ease} +.menu-panel{width:280px !important;margin-left:-305px;-webkit-transition:margin-left ease-in-out .35s;transition:margin-left ease-in-out .35s} .menu-panel .sub-menu{background-color:#323232} .menu-panel.in{margin-left:0} .menu-panel.in .collapse-button,.menu-panel.collapsing .collapse-button{padding-right:17px} -.menu-panel .collapse-button{right:-80px;position:absolute;margin-top:6px;z-index:-1;padding:2px 27px 2px 50px;-webkit-transition:padding-right .35s ease;-moz-transition:padding-right .35s ease;-o-transition:padding-right .35s ease;transition:padding-right .35s ease} +.menu-panel .collapse-button{right:-80px;position:absolute;margin-top:6px;z-index:-1;padding:2px 27px 2px 50px;-webkit-transition:background-color ease-in-out .15s,z-index ease-in-out .15s,padding-right ease-in-out .35s;transition:background-color ease-in-out .15s,z-index ease-in-out .15s,padding-right ease-in-out .35s} .menu-panel .collapse-button:hover{padding-right:17px} .menu-panel .panel-content{background-color:#232323;padding-top:6px;border-right:5px solid #444444} -.menu-panel .panel-content>.nav>li>a:hover,.menu-panel .panel-content>.nav>li>a:active{background-color:#232323} -.document-panel{right:0;width:350px !important;margin-right:-380px;-webkit-transition:margin-right .35s ease;-moz-transition:margin-right .35s ease;-o-transition:margin-right .35s ease;transition:margin-right .35s ease} +.menu-panel .panel-content>.nav>li>a:hover,.menu-panel .panel-content>.nav>li>a:active{background-color:inherit} +.document-panel{right:0;width:350px !important;margin-right:-380px;-webkit-transition:margin-right ease-in-out .35s;transition:margin-right ease-in-out .35s} .document-panel.in{margin-right:0} .document-panel.in .collapse-button,.document-panel.collapsing .collapse-button{padding-left:10px} -.document-panel .collapse-button{left:-80px;position:absolute;margin-top:6px;padding:7px 50px 7px 20px;z-index:-1;-webkit-transition:padding-left .35s ease;-moz-transition:padding-left .35s ease;-o-transition:padding-left .35s ease;transition:padding-left .35s ease} +.document-panel .collapse-button{left:-80px;position:absolute;margin-top:6px;padding:7px 50px 7px 20px;z-index:-1;-webkit-transition:background-color ease-in-out .15s,z-index ease-in-out .15s,padding-left ease-in-out .35s;transition:background-color ease-in-out .15s,z-index ease-in-out .15s,padding-left ease-in-out .35s} .document-panel .collapse-button:hover{padding-left:10px} .document-panel .collapse-button i.icon-folder-open{font-size:22px} .document-panel .panel-content{background-color:#323232;padding-top:80px;border-left:5px solid #444444} .document-panel .panel-content .icon-layers{font-size:135%} .document-panel .search-bar{position:absolute;background-color:#232323;margin:-10px 25px 0;padding:20px 5px 10px 15px;z-index:3;border:1px solid #323232;border-top:0;border-radius:6px} -.document-panel .search-bar .form-control{padding:8px 30px 8px 12px} -.document-panel .search-bar .close{position:absolute;float:none;line-height:34px;margin:2px 0 2px -30px;padding:0 8px;font-weight:normal;height:34px} .document-panel .list-group-item{margin:0} .document-panel .folder{font-weight:bold;color:#dedede;font-size:15px;border-bottom-color:#444444} .document-panel .list-group{margin:0} @@ -1565,10 +1565,8 @@ body{tab-size:4} .publish-custom-template-collapse{margin-bottom:0} .publish-custom-template-collapse textarea{max-width:100%;min-height:100px} .ui-layout-resizer{overflow:visible !important;font-size:14px !important} -.ui-layout-resizer .btn{float:none} -.ui-layout-resizer .btn i{color:rgba(222,222,222,0.3)} -.ui-layout-resizer .btn:hover,.ui-layout-resizer .btn:focus,.ui-layout-resizer .btn:active,.ui-layout-resizer .btn.active{background-color:#333333} -.ui-layout-resizer .btn:hover i,.ui-layout-resizer .btn:focus i,.ui-layout-resizer .btn:active i,.ui-layout-resizer .btn.active i{color:#dedede} +.ui-layout-resizer .btn{float:none;color:rgba(222,222,222,0.3)} +.ui-layout-resizer .btn:hover,.ui-layout-resizer .btn:focus,.ui-layout-resizer .btn:active,.ui-layout-resizer .btn.active{background-color:#333333;color:#dedede} .ui-layout-resizer .ui-layout-toggler{font-size:22px !important} .ui-layout-resizer .ui-layout-toggler.ui-layout-toggler-east{line-height:55px} .ui-layout-resizer .ui-layout-toggler.ui-layout-toggler-east.ui-layout-toggler-east-open i:before{content:'\e87e'} @@ -1626,10 +1624,15 @@ ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} .ace-tm .ace_description{color:#cccccc} .ace-tm .ace_constant{color:#dedede} .ace-tm .ace_marker-layer .misspelled{position:absolute;z-index:-2;border-bottom:1px dotted red;margin-bottom:-1px} -.ace_search{background-color:#444444;border:6px solid #232323;border-top:0;padding:10px 15px 5px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;min-width:318px} -.ace_search .ace_search_field{width:200px} +.ace_search{background-color:#323232;border:6px solid #232323;border-top:0;padding:10px 15px 5px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;min-width:318px} +.ace_search .ace_search_form,.ace_search .ace_replace_form{margin-bottom:10px} +.ace_search .ace_search_field{width:185px} +.ace_search .ace_search_field,.ace_search .ace_searchbtn,.ace_search .ace_replacebtn{height:30px;padding:0 12px;font-size:14px;line-height:1.428571429;color:#ffffff;vertical-align:middle;background-color:#111111;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)} +.ace_search .ace_searchbtn{background-image:none;font-family:"fontello";width:auto;font-size:16px} +.ace_search .ace_searchbtn.next:before{content:'\e880'} +.ace_search .ace_searchbtn.prev:before{content:'\e87f'} .ace_search .ace_replacebtn{padding:0 4px} -.ace_search .ace_searchbtn_close{background:transparent;margin:0;font-size:21px;font-weight:bold;text-shadow:0 1px 0 #ffffff;opacity:0.3;filter:alpha(opacity=30)} +.ace_search .ace_searchbtn_close{background:transparent;margin:0;font-size:21px;font-weight:bold;text-shadow:0 1px 0 #ffffff;opacity:0.3;filter:alpha(opacity=30);-webkit-transition:opacity ease-in-out .15s;transition:opacity ease-in-out .15s} .ace_search .ace_searchbtn_close:before{content:'\d7'} .ace_search .ace_searchbtn_close:hover,.ace_search .ace_searchbtn_close:focus{color:#ffffff;text-decoration:none;cursor:pointer;opacity:0.5;filter:alpha(opacity=50);background:transparent} #wmd-input{border-radius:4px;color:#dedede;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none !important} diff --git a/public/res-min/themes/school.css b/public/res-min/themes/school.css index 1b6bf643..c216d751 100644 --- a/public/res-min/themes/school.css +++ b/public/res-min/themes/school.css @@ -1432,12 +1432,14 @@ body{tab-size:4} .ui-layout-east #preview-contents{padding-left:5px} .working{cursor:progress} .btn,.dropdown-menu{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none} +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} +.close{-webkit-transition:opacity ease-in-out .15s;transition:opacity ease-in-out .15s} .list-group .nav{border-left:10px solid rgba(0,0,0,0.05);margin-left:10px} .list-group-item{padding:10px 15px} .list-group .list-group-item{border-radius:0} .list-group-item.active:hover{background-color:#888888} .move-to-front{z-index:1050 !important} -.btn{padding:8px 11px} +.btn{padding:8px 11px;-webkit-transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s;transition:background-color ease-in-out .15s,color ease-in-out .15s,z-index ease-in-out .15s} .btn-default:hover{background-color:rgba(0,0,0,0.05)} .btn-primary:hover{color:#ffffff;background-color:#747474} .btn-success:hover,.open .dropdown-toggle.btn-success{color:#eeeeee;background-color:#406b5b !important} @@ -1483,25 +1485,23 @@ body{tab-size:4} .menu-panel.in .collapse-button,.document-panel.in .collapse-button{background-color:#406b5b} .menu-panel .panel-content,.document-panel .panel-content{-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);overflow:auto;padding-bottom:30px;height:100%} .menu-panel .panel-content a>i,.document-panel .panel-content a>i{margin-right:3px;color:inherit} -.menu-panel{width:280px !important;margin-left:-305px;-webkit-transition:margin-left .35s ease;-moz-transition:margin-left .35s ease;-o-transition:margin-left .35s ease;transition:margin-left .35s ease} +.menu-panel{width:280px !important;margin-left:-305px;-webkit-transition:margin-left ease-in-out .35s;transition:margin-left ease-in-out .35s} .menu-panel .sub-menu{background-color:#ffffff} .menu-panel.in{margin-left:0} .menu-panel.in .collapse-button,.menu-panel.collapsing .collapse-button{padding-right:17px} -.menu-panel .collapse-button{right:-80px;position:absolute;margin-top:6px;z-index:-1;padding:2px 27px 2px 50px;-webkit-transition:padding-right .35s ease;-moz-transition:padding-right .35s ease;-o-transition:padding-right .35s ease;transition:padding-right .35s ease} +.menu-panel .collapse-button{right:-80px;position:absolute;margin-top:6px;z-index:-1;padding:2px 27px 2px 50px;-webkit-transition:background-color ease-in-out .15s,z-index ease-in-out .15s,padding-right ease-in-out .35s;transition:background-color ease-in-out .15s,z-index ease-in-out .15s,padding-right ease-in-out .35s} .menu-panel .collapse-button:hover{padding-right:17px} .menu-panel .panel-content{background-color:#ede9e6;padding-top:6px;border-right:5px solid #e4deda} -.menu-panel .panel-content>.nav>li>a:hover,.menu-panel .panel-content>.nav>li>a:active{background-color:#ede9e6} -.document-panel{right:0;width:350px !important;margin-right:-380px;-webkit-transition:margin-right .35s ease;-moz-transition:margin-right .35s ease;-o-transition:margin-right .35s ease;transition:margin-right .35s ease} +.menu-panel .panel-content>.nav>li>a:hover,.menu-panel .panel-content>.nav>li>a:active{background-color:inherit} +.document-panel{right:0;width:350px !important;margin-right:-380px;-webkit-transition:margin-right ease-in-out .35s;transition:margin-right ease-in-out .35s} .document-panel.in{margin-right:0} .document-panel.in .collapse-button,.document-panel.collapsing .collapse-button{padding-left:10px} -.document-panel .collapse-button{left:-80px;position:absolute;margin-top:6px;padding:7px 50px 7px 20px;z-index:-1;-webkit-transition:padding-left .35s ease;-moz-transition:padding-left .35s ease;-o-transition:padding-left .35s ease;transition:padding-left .35s ease} +.document-panel .collapse-button{left:-80px;position:absolute;margin-top:6px;padding:7px 50px 7px 20px;z-index:-1;-webkit-transition:background-color ease-in-out .15s,z-index ease-in-out .15s,padding-left ease-in-out .35s;transition:background-color ease-in-out .15s,z-index ease-in-out .15s,padding-left ease-in-out .35s} .document-panel .collapse-button:hover{padding-left:10px} .document-panel .collapse-button i.icon-folder-open{font-size:22px} .document-panel .panel-content{background-color:#ffffff;padding-top:80px;border-left:5px solid #e4deda} .document-panel .panel-content .icon-layers{font-size:135%} .document-panel .search-bar{position:absolute;background-color:#ede9e6;margin:-10px 25px 0;padding:20px 5px 10px 15px;z-index:3;border:1px solid #e4deda;border-top:0;border-radius:6px} -.document-panel .search-bar .form-control{padding:8px 30px 8px 12px} -.document-panel .search-bar .close{position:absolute;float:none;line-height:34px;margin:2px 0 2px -30px;padding:0 8px;font-weight:normal;height:34px} .document-panel .list-group-item{margin:0} .document-panel .folder{font-weight:bold;color:#3971a3;font-size:15px;border-bottom-color:#ede9e6} .document-panel .list-group{margin:0} @@ -1565,10 +1565,8 @@ body{tab-size:4} .publish-custom-template-collapse{margin-bottom:0} .publish-custom-template-collapse textarea{max-width:100%;min-height:100px} .ui-layout-resizer{overflow:visible !important;font-size:14px !important} -.ui-layout-resizer .btn{float:none} -.ui-layout-resizer .btn i{color:rgba(57,113,163,0.3)} -.ui-layout-resizer .btn:hover,.ui-layout-resizer .btn:focus,.ui-layout-resizer .btn:active,.ui-layout-resizer .btn.active{background-color:#e4deda} -.ui-layout-resizer .btn:hover i,.ui-layout-resizer .btn:focus i,.ui-layout-resizer .btn:active i,.ui-layout-resizer .btn.active i{color:#3971a3} +.ui-layout-resizer .btn{float:none;color:rgba(57,113,163,0.3)} +.ui-layout-resizer .btn:hover,.ui-layout-resizer .btn:focus,.ui-layout-resizer .btn:active,.ui-layout-resizer .btn.active{background-color:#e4deda;color:#3971a3} .ui-layout-resizer .ui-layout-toggler{font-size:22px !important} .ui-layout-resizer .ui-layout-toggler.ui-layout-toggler-east{line-height:55px} .ui-layout-resizer .ui-layout-toggler.ui-layout-toggler-east.ui-layout-toggler-east-open i:before{content:'\e87e'} @@ -1626,10 +1624,15 @@ ul ul,ol ul,ul ol,ol ol{margin-bottom:15px} .ace-tm .ace_description{color:#4383bd} .ace-tm .ace_constant{color:#3971a3} .ace-tm .ace_marker-layer .misspelled{position:absolute;z-index:-2;border-bottom:1px dotted red;margin-bottom:-1px} -.ace_search{background-color:#dbd4ce;border:6px solid #ede9e6;border-top:0;padding:10px 15px 5px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;min-width:318px} -.ace_search .ace_search_field{width:200px} +.ace_search{background-color:#e4deda;border:6px solid #ede9e6;border-top:0;padding:10px 15px 5px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;min-width:318px} +.ace_search .ace_search_form,.ace_search .ace_replace_form{margin-bottom:10px} +.ace_search .ace_search_field{width:185px} +.ace_search .ace_search_field,.ace_search .ace_searchbtn,.ace_search .ace_replacebtn{height:30px;padding:0 12px;font-size:14px;line-height:1.428571429;color:#555555;vertical-align:middle;background-color:#ffffff;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)} +.ace_search .ace_searchbtn{background-image:none;font-family:"fontello";width:auto;font-size:16px} +.ace_search .ace_searchbtn.next:before{content:'\e880'} +.ace_search .ace_searchbtn.prev:before{content:'\e87f'} .ace_search .ace_replacebtn{padding:0 4px} -.ace_search .ace_searchbtn_close{background:transparent;margin:0;font-size:21px;font-weight:bold;text-shadow:0 1px 0 #ffffff;opacity:0.3;filter:alpha(opacity=30)} +.ace_search .ace_searchbtn_close{background:transparent;margin:0;font-size:21px;font-weight:bold;text-shadow:0 1px 0 #ffffff;opacity:0.3;filter:alpha(opacity=30);-webkit-transition:opacity ease-in-out .15s;transition:opacity ease-in-out .15s} .ace_search .ace_searchbtn_close:before{content:'\d7'} .ace_search .ace_searchbtn_close:hover,.ace_search .ace_searchbtn_close:focus{color:#284f72;text-decoration:none;cursor:pointer;opacity:0.5;filter:alpha(opacity=50);background:transparent} #wmd-input{border-radius:4px;color:#3971a3;-webkit-box-shadow:none;box-shadow:none;resize:none;border:none !important} diff --git a/public/res/core.js b/public/res/core.js index b2b031e7..1ae4bcee 100644 --- a/public/res/core.js +++ b/public/res/core.js @@ -169,6 +169,9 @@ define([ // SSH proxy newSettings.sshProxy = utils.checkUrl(utils.getInputTextValue("#input-settings-ssh-proxy", event), true); + // Save shortcuts settings + shortcutMgr.saveSettings(newSettings); + // Save extension settings newSettings.extensionSettings = {}; eventMgr.onSaveSettings(newSettings.extensionSettings, event); @@ -311,6 +314,10 @@ define([ stateManagement__enabled: false, center__minWidth: 200, center__minHeight: 200, + fxSettings: { + easing: "easeInOutQuad", + duration: 350 + }, onopen: function() { setPanelVisibility(); setPreviewButtonsVisibility(); @@ -855,14 +862,14 @@ define([ // Tooltips $(".tooltip-lazy-rendering").tooltip({ - container: '.modal-settings', + container: '.modal-settings .modal-dialog', placement: 'right', trigger: 'hover', title: 'Disable preview rendering while typing in order to offload CPU. Refresh preview after 500 ms of inactivity.' }); $(".tooltip-default-content").tooltip({ html: true, - container: '.modal-settings', + container: '.modal-settings .modal-dialog', placement: 'right', trigger: 'hover', title: 'Thanks for supporting StackEdit by adding a backlink in your documents!' @@ -870,7 +877,7 @@ define([ var tooltipOpen = false; $(".tooltip-usercustom-extension").tooltip({ html: true, - container: '.modal-settings', + container: '.modal-settings .modal-dialog', placement: 'right', trigger: 'manual', title: settingsUserCustomExtensionTooltipHTML @@ -888,7 +895,7 @@ define([ var $tooltipElt = $(tooltipElt); $tooltipElt.tooltip({ html: true, - container: $tooltipElt.parents('.modal'), + container: $tooltipElt.parents('.modal-dialog'), placement: 'right', trigger: 'manual', title: settingsTemplateTooltipHTML diff --git a/public/res/extensions/documentPanel.js b/public/res/extensions/documentPanel.js index 8100da4a..adac4c27 100644 --- a/public/res/extensions/documentPanel.js +++ b/public/res/extensions/documentPanel.js @@ -186,13 +186,6 @@ define([ $filterInputElt.bind("propertychange keyup input paste", function() { filterFiles($filterInputElt.val()); }); - - // Clear button - $(panelElt.querySelector('.search-bar .close')).click(function() { - $filterInputElt.val(''); - filterFiles(''); - $filterInputElt.focus(); - }); }; return documentPanel; diff --git a/public/res/html/bodyIndex.html b/public/res/html/bodyIndex.html index 978640c6..6d56a43c 100644 --- a/public/res/html/bodyIndex.html +++ b/public/res/html/bodyIndex.html @@ -146,7 +146,6 @@
-