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

Upgrade to Bootstrap 3

Browse Source
This commit is contained in:
benweet 2013-09-03 13:01:26 +01:00
parent e8e383fcf4
commit b05162ce76
11 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cache.manifest
View File

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
#Date Tue Sep 03 2013 12:27:49 #Date Tue Sep 03 2013 13:01:08
CACHE: CACHE:
index.html index.html

10
res-min/main.js
View File

File diff suppressed because one or more lines are too long

4
res-min/themes/blue-gray.css
View File

@ -341,7 +341,7 @@ div.jGrowl.bottom-left{left:0px;bottom:0px}
div.jGrowl.bottom-right{right:0px;bottom:0px} div.jGrowl.bottom-right{right:0px;bottom:0px}
div.jGrowl.center{top:0px;width:50%;left:25%} div.jGrowl.center{top:0px;width:50%;left:25%}
div.center div.jGrowl-notification,div.center div.jGrowl-closer{margin-left:auto;margin-right:auto} div.center div.jGrowl-notification,div.center div.jGrowl-closer{margin-left:auto;margin-right:auto}
div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{background-color:#000;opacity:.85;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=85)";filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=85);zoom:1;width:235px;padding:10px;margin-top:5px;margin-bottom:5px;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:1em;text-align:left;display:none;-moz-border-radius:5px;-webkit-border-radius:5px} div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{background-color:#000;zoom:1;width:235px;padding:10px;margin-top:5px;margin-bottom:5px;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:1em;text-align:left;display:none;-moz-border-radius:5px;-webkit-border-radius:5px}
div.jGrowl div.jGrowl-notification{min-height:40px} div.jGrowl div.jGrowl-notification{min-height:40px}
div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{margin:10px} div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{margin:10px}
div.jGrowl div.jGrowl-notification div.jGrowl-header{font-weight:bold;font-size:.85em} div.jGrowl div.jGrowl-notification div.jGrowl-header{font-weight:bold;font-size:.85em}
@ -1519,7 +1519,7 @@ input[type="file"]{line-height:inherit;height:inherit;border:none !important}
.drop-zone{border:2px dashed #bbb;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;padding:40px;text-align:center;font-size:24px;color:#bbb} .drop-zone{border:2px dashed #bbb;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;padding:40px;text-align:center;font-size:24px;color:#bbb}
.modal-import-harddrive-html textarea{width:530px;max-width:530px;height:120px} .modal-import-harddrive-html textarea{width:530px;max-width:530px;height:120px}
div.jGrowl{z-index:1040;font-size:inherit} div.jGrowl{z-index:1040;font-size:inherit}
div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{background-color:#767676;width:260px;margin:20px 30px;padding:15px 20px;-ms-filter:none;filter:none;border-radius:5px} div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{background-color:rgba(118,118,118,0.9);width:260px;margin:20px 30px;padding:15px 20px;-ms-filter:none;filter:none;border-radius:5px}
div.jGrowl div.jGrowl-notification{min-height:80px} div.jGrowl div.jGrowl-notification{min-height:80px}
.viewer .file-title-navbar{line-height:38px} .viewer .file-title-navbar{line-height:38px}
.viewer #preview-contents{max-width:1024px;margin:0 auto} .viewer #preview-contents{max-width:1024px;margin:0 auto}

4
res-min/themes/default.css
View File

@ -341,7 +341,7 @@ div.jGrowl.bottom-left{left:0px;bottom:0px}
div.jGrowl.bottom-right{right:0px;bottom:0px} div.jGrowl.bottom-right{right:0px;bottom:0px}
div.jGrowl.center{top:0px;width:50%;left:25%} div.jGrowl.center{top:0px;width:50%;left:25%}
div.center div.jGrowl-notification,div.center div.jGrowl-closer{margin-left:auto;margin-right:auto} div.center div.jGrowl-notification,div.center div.jGrowl-closer{margin-left:auto;margin-right:auto}
div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{background-color:#000;opacity:.85;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=85)";filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=85);zoom:1;width:235px;padding:10px;margin-top:5px;margin-bottom:5px;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:1em;text-align:left;display:none;-moz-border-radius:5px;-webkit-border-radius:5px} div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{background-color:#000;zoom:1;width:235px;padding:10px;margin-top:5px;margin-bottom:5px;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:1em;text-align:left;display:none;-moz-border-radius:5px;-webkit-border-radius:5px}
div.jGrowl div.jGrowl-notification{min-height:40px} div.jGrowl div.jGrowl-notification{min-height:40px}
div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{margin:10px} div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{margin:10px}
div.jGrowl div.jGrowl-notification div.jGrowl-header{font-weight:bold;font-size:.85em} div.jGrowl div.jGrowl-notification div.jGrowl-header{font-weight:bold;font-size:.85em}
@ -1519,7 +1519,7 @@ input[type="file"]{line-height:inherit;height:inherit;border:none !important}
.drop-zone{border:2px dashed #bbb;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;padding:40px;text-align:center;font-size:24px;color:#bbb} .drop-zone{border:2px dashed #bbb;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;padding:40px;text-align:center;font-size:24px;color:#bbb}
.modal-import-harddrive-html textarea{width:530px;max-width:530px;height:120px} .modal-import-harddrive-html textarea{width:530px;max-width:530px;height:120px}
div.jGrowl{z-index:1040;font-size:inherit} div.jGrowl{z-index:1040;font-size:inherit}
div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{background-color:#767676;width:260px;margin:20px 30px;padding:15px 20px;-ms-filter:none;filter:none;border-radius:5px} div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{background-color:rgba(118,118,118,0.9);width:260px;margin:20px 30px;padding:15px 20px;-ms-filter:none;filter:none;border-radius:5px}
div.jGrowl div.jGrowl-notification{min-height:80px} div.jGrowl div.jGrowl-notification{min-height:80px}
.viewer .file-title-navbar{line-height:38px} .viewer .file-title-navbar{line-height:38px}
.viewer #preview-contents{max-width:1024px;margin:0 auto} .viewer #preview-contents{max-width:1024px;margin:0 auto}

4
res-min/themes/night.css
View File

@ -341,7 +341,7 @@ div.jGrowl.bottom-left{left:0px;bottom:0px}
div.jGrowl.bottom-right{right:0px;bottom:0px} div.jGrowl.bottom-right{right:0px;bottom:0px}
div.jGrowl.center{top:0px;width:50%;left:25%} div.jGrowl.center{top:0px;width:50%;left:25%}
div.center div.jGrowl-notification,div.center div.jGrowl-closer{margin-left:auto;margin-right:auto} div.center div.jGrowl-notification,div.center div.jGrowl-closer{margin-left:auto;margin-right:auto}
div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{background-color:#000;opacity:.85;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=85)";filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=85);zoom:1;width:235px;padding:10px;margin-top:5px;margin-bottom:5px;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:1em;text-align:left;display:none;-moz-border-radius:5px;-webkit-border-radius:5px} div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{background-color:#000;zoom:1;width:235px;padding:10px;margin-top:5px;margin-bottom:5px;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:1em;text-align:left;display:none;-moz-border-radius:5px;-webkit-border-radius:5px}
div.jGrowl div.jGrowl-notification{min-height:40px} div.jGrowl div.jGrowl-notification{min-height:40px}
div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{margin:10px} div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{margin:10px}
div.jGrowl div.jGrowl-notification div.jGrowl-header{font-weight:bold;font-size:.85em} div.jGrowl div.jGrowl-notification div.jGrowl-header{font-weight:bold;font-size:.85em}
@ -1519,7 +1519,7 @@ input[type="file"]{line-height:inherit;height:inherit;border:none !important}
.drop-zone{border:2px dashed #bbb;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;padding:40px;text-align:center;font-size:24px;color:#bbb} .drop-zone{border:2px dashed #bbb;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px;padding:40px;text-align:center;font-size:24px;color:#bbb}
.modal-import-harddrive-html textarea{width:530px;max-width:530px;height:120px} .modal-import-harddrive-html textarea{width:530px;max-width:530px;height:120px}
div.jGrowl{z-index:1040;font-size:inherit} div.jGrowl{z-index:1040;font-size:inherit}
div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{background-color:#565656;width:260px;margin:20px 30px;padding:15px 20px;-ms-filter:none;filter:none;border-radius:5px} div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer{background-color:rgba(86,86,86,0.9);width:260px;margin:20px 30px;padding:15px 20px;-ms-filter:none;filter:none;border-radius:5px}
div.jGrowl div.jGrowl-notification{min-height:80px} div.jGrowl div.jGrowl-notification{min-height:80px}
.viewer .file-title-navbar{line-height:38px} .viewer .file-title-navbar{line-height:38px}
.viewer #preview-contents{max-width:1024px;margin:0 auto} .viewer #preview-contents{max-width:1024px;margin:0 auto}

5
res/core.js
View File

@ -561,6 +561,8 @@ define([
// Focus on the editor when modal is gone // Focus on the editor when modal is gone
isModalShown = false; isModalShown = false;
$editorElt.focus(); $editorElt.focus();
// Revert to current theme when settings modal is closed
applyTheme(localStorage.theme);
}).keyup(function(e) { }).keyup(function(e) {
// Handle enter key in modals // Handle enter key in modals
if(e.which == 13 && !$(e.target).is("textarea")) { if(e.which == 13 && !$(e.target).is("textarea")) {
@ -630,9 +632,6 @@ define([
$themeInputElt.on("change", function() { $themeInputElt.on("change", function() {
applyTheme(this.value); applyTheme(this.value);
}); });
$(".action-apply-theme").click("change", function() {
applyTheme(localStorage.theme);
});
// Import settings // Import settings
$(".action-import-settings").click(function(e) { $(".action-import-settings").click(function(e) {

2
res/extensions/notifications.js
View File

@ -48,7 +48,7 @@ define([
} }
options = options || {}; options = options || {};
iconClass = iconClass || "icon-info-circled"; iconClass = iconClass || "icon-info-circled";
jGrowl("<i class='icon-white " + iconClass + "'></i> " + _.escape(message), options); jGrowl("<i class='icon-white " + iconClass + "'></i> " + _.escape(message).replace(/\n/g, '<br/>'), options);
} }
notifications.onMessage = function(message) { notifications.onMessage = function(message) {

2
res/html/bodyIndex.html
View File

@ -1024,7 +1024,7 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a href="#" class="btn btn-default action-apply-theme" <a href="#" class="btn btn-default"
data-dismiss="modal">Cancel</a> <a href="#" data-dismiss="modal">Cancel</a> <a href="#"
class="btn btn-primary action-apply-settings" data-dismiss="modal">OK</a> class="btn btn-primary action-apply-settings" data-dismiss="modal">OK</a>
</div> </div>

2
res/main.js
View File

@ -152,7 +152,7 @@ require([
window.applicationCache.addEventListener('updateready', function(e) { window.applicationCache.addEventListener('updateready', function(e) {
if(window.applicationCache.status === window.applicationCache.UPDATEREADY) { if(window.applicationCache.status === window.applicationCache.UPDATEREADY) {
window.applicationCache.swapCache(); window.applicationCache.swapCache();
eventMgr.onMessage('New version available! Please refresh the page to upgrade.'); eventMgr.onMessage('New version available.\nPlease refresh the page to upgrade.');
} }
}, false); }, false);
} }

3
res/styles/jquery.jgrowl.css
View File

@ -48,9 +48,6 @@ div.center div.jGrowl-notification, div.center div.jGrowl-closer {
div.jGrowl div.jGrowl-notification, div.jGrowl div.jGrowl-closer { div.jGrowl div.jGrowl-notification, div.jGrowl div.jGrowl-closer {
background-color: #000; background-color: #000;
opacity: .85;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=85)";
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=85);
zoom: 1; zoom: 1;
width: 235px; width: 235px;
padding: 10px; padding: 10px;

2
res/styles/main.less
View File

@ -24,7 +24,7 @@
@panel-bg: @primary-bg-lighter; @panel-bg: @primary-bg-lighter;
@panel-border-color: @primary-bg-light; @panel-border-color: @primary-bg-light;
@folder-color: @primary-color-light; @folder-color: @primary-color-light;
@jgrowl-bg-color: @secondary-bg-dark; @jgrowl-bg-color: fade(@secondary-bg-dark, 90%);
/* Sizes */ /* Sizes */
@menu-panel-width: 280px; @menu-panel-width: 280px;