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

Merge branch 'gh-pages' of https://github.com/benweet/stackedit.git into

Browse Source 
gh-pages

Conflicts:
	css/main.css
	index.html
	js/file-manager.js
This commit is contained in:
benweet 2013-04-04 20:21:28 +01:00
commit b63722279c
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
css/main.css
View File

@ -42,10 +42,13 @@ div, span, a, ul, li, textarea, input, button {
.input-prepend .add-on .input-prepend .add-on
{ {
border: 1px solid #ebebeb !important; border: 1px solid #ebebeb !important;
<<<<<<< HEAD
} }
input.error { input.error {
border-color: #ee5f5b !important; border-color: #ee5f5b !important;
=======
>>>>>>> branch 'gh-pages' of https://github.com/benweet/stackedit.git
} }
.navbar-inner .btn { .navbar-inner .btn {

30
index.html
View File

@ -47,7 +47,11 @@
<li class="dropdown-submenu"><a href="#"><i <li class="dropdown-submenu"><a href="#"><i
class="icon-gdrive"></i> Google Drive</a> class="icon-gdrive"></i> Google Drive</a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<<<<<<< HEAD
<li><a href="#" class="action-upload-gdrive">Export to <li><a href="#" class="action-upload-gdrive">Export to
=======
<li><a class="action-upload-gdrive" href="#">Export to
>>>>>>> branch 'gh-pages' of https://github.com/benweet/stackedit.git
Google Drive</a></li> Google Drive</a></li>
<li><a href="#" data-toggle="modal" <li><a href="#" data-toggle="modal"
data-target="#modal-download-gdrive">Import from Google data-target="#modal-download-gdrive">Import from Google
@ -149,7 +153,11 @@
<a class="btn action-manual-gdrive" data-dismiss="modal"><i class="icon-ok"></i></a> <a class="btn action-manual-gdrive" data-dismiss="modal"><i class="icon-ok"></i></a>
</div> </div>
<p class="muted"><b>NOTE:</b> Adding a synchronized location will <p class="muted"><b>NOTE:</b> Adding a synchronized location will
<<<<<<< HEAD
first upload the local document and overwrite the existing file on the first upload the local document and overwrite the existing file on the
=======
first upload the local document and overwrite the file on the
>>>>>>> branch 'gh-pages' of https://github.com/benweet/stackedit.git
server.</p> server.</p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
@ -222,6 +230,7 @@
<dd> <dd>
</dl> </dl>
<dl> <dl>
<<<<<<< HEAD
<dt>Credit:</dt> <dt>Credit:</dt>
<dd> <dd>
<a target="_blank" href="http://twitter.github.com/bootstrap/">Bootstrap</a> <a target="_blank" href="http://twitter.github.com/bootstrap/">Bootstrap</a>
@ -244,6 +253,27 @@
</dd> </dd>
<dd> <dd>
<a target="_blank" href="http://requirejs.org/">RequireJS</a> <a target="_blank" href="http://requirejs.org/">RequireJS</a>
=======
<dt>Credits:</dt>
<dd>
<a target="_blank" href="http://jquery.com/">jQuery</a>
</dd>
<dd>
<a target="_blank" href="http://twitter.github.com/bootstrap/">Bootstrap</a>
</dd>
<dd>
<a target="_blank" href="http://requirejs.org/">RequireJS</a>
</dd>
<dd>
<a target="_blank" href="https://code.google.com/p/pagedown/">PageDown</a>
</dd>
<dd>
<a target="_blank" href="http://layout.jquery-dev.net/">UI
Layout</a>
</dd>
<dd>
<a target="_blank" href="https://github.com/stanlemon/jGrowl/">jGrowl</a>
>>>>>>> branch 'gh-pages' of https://github.com/benweet/stackedit.git
</dd> </dd>
</dl> </dl>
<p>Copyright 2013 <a target="_blank" <p>Copyright 2013 <a target="_blank"