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 12:29:19 +01:00
parent 7528726bab
commit 3716535194
8 changed files with 18 additions and 16 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 11:36:31 #Date Tue Sep 03 2013 12:27:48
CACHE: CACHE:
index.html index.html

10
res-min/main.js
View File

File diff suppressed because one or more lines are too long

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

@ -1351,7 +1351,7 @@ body{tab-size:4}
.navbar{position:static;padding:0;border:0;border-radius:0} .navbar{position:static;padding:0;border:0;border-radius:0}
.navbar .left-space{width:30px;height:38px} .navbar .left-space{width:30px;height:38px}
.navbar .right-space{width:20px;height:38px} .navbar .right-space{width:20px;height:38px}
.navbar .nav{float:left;margin:6px 10px 0} .navbar .nav{float:left;margin:6px 10px;height:38px}
.navbar .nav>li{display:inline-block} .navbar .nav>li{display:inline-block}
.navbar .nav.pull-right{float:right} .navbar .nav.pull-right{float:right}
.navbar .nav.pull-right>li>.dropdown-menu{right:0;left:auto} .navbar .nav.pull-right>li>.dropdown-menu{right:0;left:auto}

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

@ -1351,7 +1351,7 @@ body{tab-size:4}
.navbar{position:static;padding:0;border:0;border-radius:0} .navbar{position:static;padding:0;border:0;border-radius:0}
.navbar .left-space{width:30px;height:38px} .navbar .left-space{width:30px;height:38px}
.navbar .right-space{width:20px;height:38px} .navbar .right-space{width:20px;height:38px}
.navbar .nav{float:left;margin:6px 10px 0} .navbar .nav{float:left;margin:6px 10px;height:38px}
.navbar .nav>li{display:inline-block} .navbar .nav>li{display:inline-block}
.navbar .nav.pull-right{float:right} .navbar .nav.pull-right{float:right}
.navbar .nav.pull-right>li>.dropdown-menu{right:0;left:auto} .navbar .nav.pull-right>li>.dropdown-menu{right:0;left:auto}

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

@ -1351,7 +1351,7 @@ body{tab-size:4}
.navbar{position:static;padding:0;border:0;border-radius:0} .navbar{position:static;padding:0;border:0;border-radius:0}
.navbar .left-space{width:30px;height:38px} .navbar .left-space{width:30px;height:38px}
.navbar .right-space{width:20px;height:38px} .navbar .right-space{width:20px;height:38px}
.navbar .nav{float:left;margin:6px 10px 0} .navbar .nav{float:left;margin:6px 10px;height:38px}
.navbar .nav>li{display:inline-block} .navbar .nav>li{display:inline-block}
.navbar .nav.pull-right{float:right} .navbar .nav.pull-right{float:right}
.navbar .nav.pull-right>li>.dropdown-menu{right:0;left:auto} .navbar .nav.pull-right>li>.dropdown-menu{right:0;left:auto}

2
res/html/bodyIndex.html
View File

@ -299,7 +299,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-lg-4 control-label" <label class="col-lg-4 control-label"
for="input-import-image-size">Size limit (optional)</label> for="input-import-image-size">Size limit (optional)</label>
<div class="col-lg-7"> <div class="col-lg-7 form-inline">
<input type="text" id="input-import-image-size" placeholder="123" <input type="text" id="input-import-image-size" placeholder="123"
class="col-lg-3 form-control"> px class="col-lg-3 form-control"> px
</div> </div>

11
res/main.js
View File

@ -134,27 +134,28 @@ if(baseDir.indexOf('-min') !== -1) {
require([ require([
"jquery", "jquery",
"core", "core",
"eventMgr",
"synchronizer", "synchronizer",
"publisher", "publisher",
"mediaImporter", "mediaImporter",
"css", "css",
themeModule, themeModule,
], function($, core) { ], function($, core, eventMgr) {
$(function() { $(function() {
// Here, all the modules are loaded and the DOM is ready
core.onReady();
// If browser has detected a new application cache. // If browser has detected a new application cache.
if(window.applicationCache) { if(window.applicationCache) {
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();
window.location.reload(); eventMgr.onMessage('New version available! Please refresh the page to upgrade.');
} }
}, false); }, false);
} }
// Here, all the modules are loaded and the DOM is ready
core.onReady();
}); });
}); });

3
res/styles/main.less
View File

@ -276,7 +276,8 @@ body {
} }
.nav { .nav {
float: left; float: left;
margin: 6px 10px 0; margin: 6px 10px;
height: @input-height-base;
& > li { & > li {
display: inline-block; display: inline-block;
} }