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-08-07 23:34:12 +01:00
parent 54870aab39
commit 25ca30ce28
8 changed files with 340 additions and 300 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
# Sun 4 Aug 2013 18:48:25 IST # Wed 7 Aug 2013 23:32:48 IST
CACHE: CACHE:
index.html index.html

10
js/extensions/dialogAbout.js
View File

@ -1,9 +1,10 @@
define([ define([
"jquery",
"underscore", "underscore",
"utils",
"classes/Extension", "classes/Extension",
"text!../../version",
"text!html/dialogAbout.html", "text!html/dialogAbout.html",
], function($, _, Extension, dialogAboutHTML) { ], function(_, utils, Extension, version, dialogAboutHTML) {
var dialogAbout = new Extension("dialogAbout", 'Dialog "About"'); var dialogAbout = new Extension("dialogAbout", 'Dialog "About"');
@ -42,9 +43,10 @@ define([
}; };
dialogAbout.onReady = function() { dialogAbout.onReady = function() {
$("#modal-about .modal-body").html(_.template(dialogAboutHTML, { utils.addModal('modal-about', _.template(dialogAboutHTML, {
libraries: libraries, libraries: libraries,
projects: projects projects: projects,
version: version
})); }));
}; };

42
js/html/bodyIndex.html
View File

@ -21,7 +21,7 @@
<li class="stick"> <li class="stick">
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"><i class="icon-search"></i></span><input <span class="input-group-addon"><i class="icon-search"></i></span><input
type="text" id="file-search" class="col-lg-3 form-control"> type="text" id="file-search" class="form-control">
</div> </div>
</li> </li>
</ul> </ul>
@ -43,16 +43,6 @@
<div class="ui-layout-south preview-container"></div> <div class="ui-layout-south preview-container"></div>
<div class="document-panel collapse width">
<button class="btn btn-success collapse-button" data-toggle="collapse"
data-target=".document-panel" title="Menu">
<i class="icon-folder-open"></i> <i class="icon-right-dir"></i>
</button>
<div class="panel-content">
<div class="list-group">
</div>
</div>
</div>
<div class="menu-panel collapse width"> <div class="menu-panel collapse width">
<button class="btn btn-success collapse-button" data-toggle="collapse" <button class="btn btn-success collapse-button" data-toggle="collapse"
data-target=".menu-panel" title="Menu"> data-target=".menu-panel" title="Menu">
@ -131,6 +121,18 @@
</div> </div>
<div class="document-panel collapse width">
<button class="btn btn-success collapse-button" data-toggle="collapse"
data-target=".document-panel" title="Menu">
<i class="icon-folder-open"></i> <i class="icon-right-dir"></i>
</button>
<div class="panel-content">
<div class="list-group">
</div>
</div>
</div>
<div id="modal-insert-link" class="modal"> <div id="modal-insert-link" class="modal">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
@ -879,24 +881,6 @@
</div> </div>
<div id="modal-about" class="modal">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"
aria-hidden="true">&times;</button>
<img src="img/stackedit-promo.png" />
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<a href="#" class="btn btn-primary" data-dismiss="modal">Close</a>
</div>
</div>
</div>
</div>
<div id="modal-non-unique" class="modal"> <div id="modal-non-unique" class="modal">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">

101
js/html/dialogAbout.html
View File

@ -1,41 +1,60 @@
<dl>
<dt>About:</dt> <div class="modal-dialog">
<dd> <div class="modal-content">
<a target="_blank" href="https://github.com/benweet/stackedit/">GitHub
project</a> / <a target="_blank" <div class="modal-header">
href="https://github.com/benweet/stackedit/issues">issue tracker</a><br /> <button type="button" class="close" data-dismiss="modal"
<a target="_blank" aria-hidden="true">&times;</button>
href="https://chrome.google.com/webstore/detail/stackedit/iiooodelglhkcpgbajoejffhijaclcdg">Chrome <img src="img/stackedit-promo.png" />
app</a> (thanks for your review!)<br /> <a target="_blank" </div>
href="https://twitter.com/stackedit/">Follow on Twitter</a><br /> <a <div class="modal-body">
target="_blank" href="https://www.facebook.com/stackedit/">Follow <dl>
on Facebook</a><br /> <a target="_blank" <dt>About:</dt>
href="https://plus.google.com/110816046787593496375" rel="publisher">Follow <dd>
on Google+</a><br /> <a target="_blank" href="https://github.com/benweet/stackedit/">GitHub
</dd> project</a> / <a target="_blank"
</dl> href="https://github.com/benweet/stackedit/issues">issue
<dl> tracker</a><br /> <a target="_blank"
<dt>Developers:</dt> href="https://chrome.google.com/webstore/detail/stackedit/iiooodelglhkcpgbajoejffhijaclcdg">Chrome
<dd> app</a> (thanks for your review!)<br /> <a target="_blank"
<a target="_blank" href="http://www.benoitschweblin.com">Benoit href="https://twitter.com/stackedit/">Follow on Twitter</a><br />
Schweblin</a><br /> Pete Eigel (contributor) <a target="_blank" href="https://www.facebook.com/stackedit/">Follow
</dd> on Facebook</a><br /> <a target="_blank"
</dl> href="https://plus.google.com/110816046787593496375"
<dl> rel="publisher">Follow on Google+</a><br />
<dt>Credit:</dt> </dd>
<dd> </dl>
<% _.each(libraries, function(url, name) { %> <a target="_blank" <dl>
href="<%= url %>"><%= name %></a><br /> <% }); %> <dt>Developers:</dt>
</dd> <dd>
</dl> <a target="_blank" href="http://www.benoitschweblin.com">Benoit
<dl> Schweblin</a><br /> Pete Eigel (contributor)
<dt>Related projects:</dt> </dd>
<dd> </dl>
<% _.each(projects, function(url, name) { %> <a target="_blank" <dl>
href="<%= url %>"><%= name %></a><br /> <% }); %> <dt>Credit:</dt>
</dd> <dd>
</dl> <% _.each(libraries, function(url, name) { %> <a target="_blank"
<p>Copyright 2013 <a target="_blank" href="<%= url %>"><%= name %></a><br /> <% }); %>
href="http://www.benoitschweblin.com">Benoit Schweblin</a><br /> </dd>
Licensed under an <a target="_blank" </dl>
href="http://www.apache.org/licenses/LICENSE-2.0">Apache License</a></p> <dl>
<dt>Related projects:</dt>
<dd>
<% _.each(projects, function(url, name) { %> <a target="_blank"
href="<%= url %>"><%= name %></a><br /> <% }); %>
</dd>
</dl>
<p>
StackEdit <%= version %><br /> Copyright 2013 <a
target="_blank" href="http://www.benoitschweblin.com">Benoit
Schweblin</a><br /> Licensed under an <a target="_blank"
href="http://www.apache.org/licenses/LICENSE-2.0">Apache
License</a>
</p>
</div>
<div class="modal-footer">
<a href="#" class="btn btn-primary" data-dismiss="modal">Close</a>
</div>
</div>
</div>

479
js/main-min.js vendored
View File

File diff suppressed because one or more lines are too long

2
js/utils.js
View File

@ -175,7 +175,7 @@ define([
class: 'modal' class: 'modal'
}); });
modal.innerHTML = content; modal.innerHTML = content;
document.getElementsByTagName('body')[0].appendChild(modal); document.body.appendChild(modal);
}; };
// Create an centered popup window // Create an centered popup window

2
run_deploy
View File

@ -2,8 +2,6 @@
set -e set -e
echo '### Optimizing resources ###' echo '### Optimizing resources ###'
tools/run_optimize tools/run_optimize
echo '### Modifying cache.manifest ###'
sed -i '' "s/^#.*/# `date`/" cache.manifest
echo '### Commit and push ###' echo '### Commit and push ###'
git commit -a -m "Prepare deployment" git commit -a -m "Prepare deployment"
git branch -f gh-pages master git branch -f gh-pages master

2
tools/run_optimize
View File

@ -2,3 +2,5 @@
npm install requirejs npm install requirejs
export PATH=${PATH}:node_modules/requirejs/bin/ export PATH=${PATH}:node_modules/requirejs/bin/
r.js -o tools/optimize-js.json r.js -o tools/optimize-js.json
sed -i '' "s/^#.*/# `date`/" cache.manifest