Prepare release

This commit is contained in:
benweet 2013-12-27 01:01:17 +01:00
parent 02640f1f89
commit 491da0cc1c
6 changed files with 62 additions and 61 deletions

View File

@ -143,7 +143,7 @@ define([
// Root folder // Root folder
var documentListHtml = [ var documentListHtml = [
'<a href="#" class="list-group-item folder clearfix" data-toggle="collapse" data-target=".modal-document-manager .file-list.root-folder">', '<a href="#" class="list-group-item folder root-folder clearfix" data-toggle="collapse" data-target=".modal-document-manager .file-list.root-folder">',
'<label class="checkbox" title="Select"><input type="checkbox"></label>', '<label class="checkbox" title="Select"><input type="checkbox"></label>',
'<div class="pull-right file-count">', '<div class="pull-right file-count">',
_.size(orphanDocumentList), _.size(orphanDocumentList),
@ -281,6 +281,9 @@ define([
// Set checkbox event listeners // Set checkbox event listeners
$(documentListElt.querySelectorAll('[type=checkbox]')).change(doActiveButtons); $(documentListElt.querySelectorAll('[type=checkbox]')).change(doActiveButtons);
// Open root folder by default
$(documentListElt.querySelectorAll('.root-folder')).click();
}, 50); }, 50);
documentManager.onFileCreated = refreshManager; documentManager.onFileCreated = refreshManager;

View File

@ -171,8 +171,8 @@
class="action-reset-input list-group-item"><i class="icon-share"></i> class="action-reset-input list-group-item"><i class="icon-share"></i>
Manage publication</a> Manage publication</a>
<a href="#" data-toggle="modal" data-target=".modal-manage-sharing" <a href="#" data-toggle="modal" data-target=".modal-manage-sharing"
class="action-reset-input list-group-item"><i class="icon-link"></i> class="action-reset-input list-group-item"><i class="icon-provider-stackedit"></i>
Sharing</a> Sharing...</a>
</div> </div>
<ul class="nav"> <ul class="nav">
<li><a href="#" data-toggle="modal" <li><a href="#" data-toggle="modal"
@ -993,6 +993,44 @@
</div> </div>
<div class="tab-pane" id="tabpane-settings-services"> <div class="tab-pane" id="tabpane-settings-services">
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group">
<label class="col-lg-4 control-label"
for="input-settings-gdrive-multiaccount">Google Drive multi-accounts</a>
</label>
<div class="col-lg-7">
<select id="input-settings-gdrive-multiaccount" class="form-control">
<option value="1">1 account</option>
<option value="2">2 accounts</option>
<option value="3">3 accounts</option>
</select>
<span class="help-block"><b>Please sign in first with Google.</b> Once linked with your Google accounts, changing account is not possible unless you reset the application.</span>
</div>
</div>
<div class="form-group">
<label class="col-lg-4 control-label">Permissions</label>
<div class="col-lg-7">
<div class="checkbox">
<label>
<input type="checkbox" id="input-settings-gdrive-full-access" />
Allow StackEdit to open any document in Google Drive
</label> <span class="help-block">Any existing token has to be revoked in
<a href="https://www.google.com/settings/dashboard" target="_blank">Google Dashboard</a>
for this change to take effect.</span>
</div>
</div>
</div>
<div class="form-group">
<div class="col-lg-4"></div>
<div class="col-lg-7">
<div class="checkbox">
<label>
<input type="checkbox" id="input-settings-dropbox-full-access" />
Allow StackEdit to open any document in Dropbox
</label> <span class="help-block">If unchecked, access will be restricted to folder
<b>/Applications/StackEdit</b> for existing files.</span>
</div>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="col-lg-4 control-label" <label class="col-lg-4 control-label"
for="textarea-settings-publish-template">Default for="textarea-settings-publish-template">Default
@ -1024,44 +1062,6 @@
</select> </select>
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-lg-4 control-label"
for="input-settings-gdrive-multiaccount">Google Drive multi-accounts</a>
</label>
<div class="col-lg-7">
<select id="input-settings-gdrive-multiaccount" class="form-control">
<option value="1">1 account</option>
<option value="2">2 accounts</option>
<option value="3">3 accounts</option>
</select>
<span class="help-block"><b>Please sign in with Google first.</b> Once linked with your Google accounts, changing account is not possible unless you reset the application.</span>
</div>
</div>
<div class="form-group">
<label class="col-lg-4 control-label">Permissions</label>
<div class="col-lg-7">
<div class="checkbox">
<label>
<input type="checkbox" id="input-settings-gdrive-full-access" />
Allow StackEdit to open any document in Google Drive
</label> <span class="help-block">Any existing token has to be revoked in
<a href="https://www.google.com/settings/dashboard" target="_blank">Google Dashboard</a>
for this change to take effect.</span>
</div>
</div>
</div>
<div class="form-group">
<div class="col-lg-4"></div>
<div class="col-lg-7">
<div class="checkbox">
<label>
<input type="checkbox" id="input-settings-dropbox-full-access" />
Allow StackEdit to open any document in Dropbox
</label> <span class="help-block">If unchecked, access will be restricted to folder
<b>/Applications/StackEdit</b> for existing files.</span>
</div>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="col-lg-4 control-label" <label class="col-lg-4 control-label"
for="input-settings-publish-commit-msg">GitHub commit message</label> for="input-settings-publish-commit-msg">GitHub commit message</label>

View File

@ -1,5 +1,5 @@
<div class="input-group"> <div class="input-group">
<a href="<%= link %>" class="input-group-addon" title="Sharing location"><i <a href="<%= link %>" class="input-group-addon" title="Sharing location"><i
class="icon-link"></i></a> <input class="form-control" type="text" class="icon-provider-stackedit"></i></a> <input class="form-control" type="text"
value="<%= link %>" disabled /> value="<%= link %>" disabled />
</div> </div>

View File

@ -56,20 +56,20 @@ var MarkdownHighlightRules = function() {
next : "header" next : "header"
}, },
{ // Github style block { // Github style block
token : "code_block", token : "constant.language.escape",
regex : "^```\\s*[a-zA-Z]*(?:{.*?\\})?\\s*$", regex : "^```\\s*[a-zA-Z]*(?:{.*?\\})?\\s*$",
next : "githubblock" next : "githubblock"
}, { // block quote }, { // block quote
token : "blockquote", token : ["constant.language.escape", "blockquote"],
regex : "^\\s*>\\s*(?:[*+-]|\\d+\\.)?\\s+", regex : "(^\\s*>\\s*(?:[*+-]|\\d+\\.)?)(\\s+)",
next : "blockquote" next : "blockquote"
}, { // HR * - _ }, { // HR * - _
token : "constant", token : "constant",
regex : "^ {0,2}(?:(?: ?\\* ?){3,}|(?: ?\\- ?){3,}|(?: ?\\_ ?){3,})\\s*$", regex : "^ {0,2}(?:(?: ?\\* ?){3,}|(?: ?\\- ?){3,}|(?: ?\\_ ?){3,})\\s*$",
next: "allowBlock" next: "allowBlock"
}, { // list }, { // list
token : "markup.list", token : ["constant.language.escape", "markup.list"],
regex : "^\\s{0,3}(?:[*+-]|\\d+\\.)\\s+", regex : "(^\\s{0,3}(?:[*+-]|\\d+\\.))(\\s+)",
next : "listblock-start" next : "listblock-start"
}, { // Math block }, { // Math block
token : "constant.language.escape", token : "constant.language.escape",
@ -151,8 +151,8 @@ var MarkdownHighlightRules = function() {
regex : "^$", regex : "^$",
next : "start" next : "start"
}, { // list }, { // list
token : "markup.list", token : ["constant.language.escape", "markup.list"],
regex : "^\\s{0,3}(?:[*+-]|\\d+\\.)\\s+", regex : "(^\\s{0,3}(?:[*+-]|\\d+\\.))(\\s+)",
next : "listblock-start" next : "listblock-start"
}, { }, {
include : "basic", noEscape: true include : "basic", noEscape: true
@ -165,8 +165,8 @@ var MarkdownHighlightRules = function() {
regex : "^\\s*$", regex : "^\\s*$",
next : "start" next : "start"
}, { // block quote }, { // block quote
token : "blockquote", token : ["constant.language.escape", "blockquote"],
regex : "^\\s*>\\s*(?:[*+-]|\\d+\\.)?\\s+", regex : "(^\\s*>\\s*(?:[*+-]|\\d+\\.)?)(\\s+)",
next : "blockquote" next : "blockquote"
}, { }, {
include : "basic", noEscape: true include : "basic", noEscape: true
@ -175,7 +175,7 @@ var MarkdownHighlightRules = function() {
} ], } ],
"githubblock" : [ { "githubblock" : [ {
token : "code_block", token : "constant.language.escape",
regex : "^```", regex : "^```",
next : "start" next : "start"
}, { }, {

View File

@ -35,10 +35,10 @@
// Editor // Editor
@tertiary-bg: #fff; @tertiary-bg: #fff;
@tertiary-color-light: fade(@tertiary-color, 75%); @tertiary-color-light: fade(@tertiary-color, 60%);
@tertiary-color: desaturate(@tertiary, 85%); @tertiary-color: darken(@secondary-desaturated, 7.5%);
@tertiary-color-dark: darken(@tertiary-color, 20%); @tertiary-color-dark: darken(@tertiary-color, 15%);
@tertiary-color-darker: darken(@tertiary-color, 40%); @tertiary-color-darker: darken(@tertiary-color, 30%);
// Panel buttons // Panel buttons
@panel-button-bg-color: #FFF; @panel-button-bg-color: #FFF;
@ -1074,8 +1074,7 @@ a {
} }
.ace_link { .ace_link {
color: @tertiary-color; color: @tertiary-color-light;
background-color: @code-bg;
} }
.ace_description { .ace_description {

View File

@ -1,7 +1,7 @@
@import "../styles/main.less"; @import "../styles/main.less";
@board-color: #385E50; @board-color: #385E50;
@board-border-color: #B9AA9F; @board-border-color: #B9B39F;
@blue-ink: #284F72; @blue-ink: #284F72;
@black-ink: #444; @black-ink: #444;
@red-ink: #B56E85; @red-ink: #B56E85;
@ -10,12 +10,11 @@
@primary: desaturate(darken(@board-border-color, 20%), 20%); @primary: desaturate(darken(@board-border-color, 20%), 20%);
@primary-color: lighten(@blue-ink, 30%); @primary-color: lighten(@blue-ink, 30%);
@secondary-color: lighten(@blue-ink, 20%); @secondary-color: lighten(@blue-ink, 20%);
@tertiary-color: lighten(@blue-ink, 30%); @tertiary-color: desaturate(lighten(@blue-ink, 20%), 20%);
@secondary: @primary; @secondary: @primary;
@tertiary: @primary; @tertiary: @primary;
@primary-desaturated: @primary; @primary-desaturated: @primary;
@secondary-desaturated: darken(@board-border-color, 19%); @secondary-desaturated: darken(@board-border-color, 19%);
@tertiary-desaturated: @tertiary;
@primary-border-color: @navbar-default-bg; @primary-border-color: @navbar-default-bg;
@modal-backdrop-bg: @primary; @modal-backdrop-bg: @primary;
@btn-success-color: #eee; @btn-success-color: #eee;