Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-02 20:15:26 +02:00
Code Releases Activity

removed named sql statements

Browse source
This commit is contained in:
Harvey Kandola 2017-09-25 14:37:11 +01:00
parent 9ccd0fd19c
commit 8f80673cde
32 changed files with 218 additions and 937 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gui/app/components/folder/folder-toolbar.js
View file

@ -37,6 +37,8 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, AuthMixin, {
deleteSpaceName: '',
didReceiveAttrs() {
this._super(...arguments);
let targets = _.reject(this.get('folders'), {
id: this.get('folder').get('id')
});
@ -50,6 +52,7 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, AuthMixin, {
},
didRender() {
this._super(...arguments);
this.renderTooltips();
},
@ -82,6 +85,8 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, AuthMixin, {
},
willDestroyElement() {
this._super(...arguments);
if (this.get('isDestroyed') || this.get('isDestroying')) {
return;
}

2
gui/app/pods/folder/settings/template.hbs
View file

@ -18,7 +18,7 @@
{{#layout/zone-content}}
<div class="back-to-space">
{{#link-to 'folder' model.folder.id model.folder.slug}}
<div class="regular-button button-gray">
<div class="regular-button button-nav">
<i class="material-icons">arrow_back</i>
<div class="name">{{model.folder.name}}</div>
</div>

15
gui/app/services/document.js
View file

@ -79,21 +79,6 @@ export default Ember.Service.extend({
});
},
getBatchedPages: function (documentId, payload) {
let url = `documents/${documentId}/pages/batch`;
return this.get('ajax').request(url, {
method: 'POST',
data: payload
}).then((pages) => {
if (is.not.array(pages)) {
pages = [];
}
return pages;
});
},
changePageSequence: function (documentId, payload) {
let url = `documents/${documentId}/pages/sequence`;

45
gui/app/styles/color.scss
View file

@ -9,41 +9,46 @@
//
// https://documize.com
// Theme-neutral colors
$color-off-white: #f5f5f5;
$color-off-black: #393939;
$color-black: #000000;
$color-white: #ffffff;
$color-primary: #2667af;
$color-red: #d04134;
$color-green: #4caf50;
$color-blue: #2667af;
$color-gray: #8b9096;
$color-goldy: #cc9933;
$color-sidebar: #f3f5f8;
$color-link: #0092d3;
$color-border: #f3f5f8;
$color-input: #5a5a5a;
$color-stroke: #e1e1e1;
$color-tooltip: #a1a1a1;
$color-toast: #4c4c4c;
$color-checkbox: #2667af;
$color-card-active: #f7fcff;
$color-chip: #dff0f9;
$color-chip-border: #daeaf3;
$color-chip-text: #1b88e3;
$color-symbol-box: #dce5e8;
$color-symbol-icon: #a4b8be;
$color-table-border: #e1e1e1;
$color-table-header: #f5f5f5;
$color-toolbar: #eeeeee;
$color-wysiwyg: #3c3c3c;
$color-input: #5a5a5a;
$color-stroke: #e1e1e1;
$color-tooltip: #a1a1a1;
$color-toast: #4c4c4c;
// Theme colors
$color-primary: #2667af;
$color-link: #0092d3;
$color-border: #f3f5f8;
$color-checkbox: #0092d3;
$color-card-active: #f7fcff;
$color-nav-button: #f2faff;
$color-nav-button-text: #2667af;
$color-nav-button-border: #dff0f9;
$color-sidebar: #f2faff;
$color-sidebar-border: #dff0f9;
$color-sidebar-text: $color-off-black;
$color-sidebar-link: $color-link;
// Color utility classes for direct usage in HTML
.color-white {
color: $color-white !important;
}

13
gui/app/styles/view/document/view.scss
View file

@ -1,19 +1,20 @@
.zone-document-content {
> .document-header-zone {
padding: 20px 30px;
border: 1px solid $color-stroke;
@include border-radius(3px);
background-color: $color-off-white;
// padding: 20px 30px;
// @include border-radius(3px);
// border: 1px solid $color-stroke;
// background-color: $color-off-white;
}
.doc-title {
font-size: 2rem;
margin: 50px 0 10px;
font-weight: normal;
// color: $color-primary;
}
.doc-excerpt {
font-size: 1rem;
font-size: 1.2rem;
color: $color-gray;
margin: 0 0 45px;
}
@ -31,7 +32,7 @@
}
.edit-doc-excerpt {
font-size: 1rem;
font-size: 1.2rem;
margin: 0 0 10px;
color: $color-gray;
}

28
gui/app/styles/view/layout-sidebar.scss
View file

@ -10,7 +10,6 @@ $sidebar-width: 400px;
}
#sidebar-wrapper {
background-color: $color-off-white;
z-index: 888;
position: fixed;
overflow-x: hidden;
@ -19,12 +18,13 @@ $sidebar-width: 400px;
width: 0;
height: 100%;
margin-left: -$sidebar-width;
border-right: 1px solid $color-stroke;
overflow-y: auto;
-webkit-transition: all 0.5s ease;
-moz-transition: all 0.5s ease;
-o-transition: all 0.5s ease;
transition: all 0.5s ease;
background-color: $color-sidebar;
border-right: 1px solid $color-sidebar-border;
}
.page-container {
@ -68,22 +68,30 @@ $sidebar-width: 400px;
.zone-sidebar-page-title {
color: $color-primary;
font-size: 1.3rem;
font-size: 1.5rem;
font-weight: bold;
margin-bottom: 20px;
}
.zone-sidebar-page-info {
color: $color-gray;
color: $color-black;
font-size: 1rem;
line-height: 1.5rem;
margin-bottom: 30px;
}
color: $color-sidebar-text !important;
a, a:visited {
&:hover {
color: $color-sidebar-link !important;
}
}
}
.sidebar-wrapper {
padding: 40px 20px 40px 20px;
margin-left: 20px;
margin: 0 20px;
.sidebar-panel {
width: 300px;
@ -100,7 +108,15 @@ $sidebar-width: 400px;
@include border-radius(3px);
background-color: $color-white;
}
}
}
color: $color-sidebar-text !important;
a, a:visited {
&:hover {
color: $color-sidebar-link !important;
}
}
}
.navigation {

9
gui/app/styles/widget/widget-button.scss
View file

@ -242,11 +242,10 @@
border: 1px solid $color-gray;
}
.button-chip {
background-color: $color-chip;
color: $color-chip-text;
border: 1px solid $color-chip-border;
@include button-hover-state($color-chip);
.button-nav {
background-color: $color-nav-button;
color: $color-nav-button-text;
border: 1px solid $color-nav-button;
}
.flat-button {

36
gui/app/styles/widget/widget-chip.scss
View file

@ -5,45 +5,17 @@
height: 25px;
line-height: 0;
margin: 0 5px 10px 0;
border: 1px solid $color-chip-border;
background-color: $color-chip;
color: $color-chip-text;
&:hover {
> i.material-icons {
visibility: visible;
}
}
border: 1px solid $color-gray;
background-color: $color-gray;
color: $color-white;
> .chip-text {
display: inline-block;
font-weight: 400;
font-size: 1rem;
color: $color-chip-text;
color: $color-white;
padding: 11px 10px 0 10px;
letter-spacing: 0.7px;
line-height: 0;
}
> i.material-icons {
visibility: hidden;
color: $color-chip-text;
font-size: 13px;
margin: 13px 8px 0 0;
padding: 0;
line-height: 0;
}
}
.chip-action {
@extend .chip;
background-color: $color-white;
&:hover {
cursor: pointer;
}
> .chip-text {
color: $color-chip-text;
}
}

17
gui/app/styles/widget/widget-symbol.scss
View file

@ -1,17 +0,0 @@
.symbol {
display: inline-block;
border-radius: 2px;
height: 40px;
width: 40px;
padding: 0;
line-height: 0;
margin: 0;
text-align: center;
background-color: $color-symbol-box;
> .material-icons {
font-size: 22px;
margin-top: 20px;
color: $color-symbol-icon;
}
}

1
gui/app/styles/widget/widget.scss
View file

@ -73,7 +73,6 @@
@import "widget-radio";
@import "widget-selection";
@import "widget-sidebar-menu";
@import "widget-symbol";
@import "widget-tab";
@import "widget-table";
@import "widget-tooltip";

4
gui/app/templates/components/document/space-category.hbs
View file

@ -1,7 +1,7 @@
<div class="back-to-space document-space">
<div class="caption">Space</div>
{{#link-to 'folder' folder.id folder.slug}}
<div class="regular-button button-gray">
<div class="regular-button button-nav">
<i class="material-icons">arrow_back</i>
<div class="name">{{folder.name}}</div>
</div>
@ -12,7 +12,7 @@
<div class="caption">Category</div>
{{#each selectedCategories as |cat|}}
<div class="regular-button button-blue">{{cat.category}}</div>
<div class="regular-button button-nav">{{cat.category}}</div>
{{else}}
{{#if canAddCategory}}
{{#link-to 'folder.settings.category' folder.id folder.slug}}Manage{{/link-to}}

2
gui/app/templates/components/document/tag-editor.hbs
View file

@ -1,7 +1,7 @@
<div class="document-tags">
<div class="caption">Tag</div>
{{#each tagz as |t index|}}
<div class="regular-button button-chip" id="{{concat 'delete-tag-' index}}">{{concat '#' t}}</div>
<div class="regular-button button-gray" id="{{concat 'delete-tag-' index}}">{{concat '#' t}}</div>
{{/each}}
{{#if canAdd}}
<div class="regular-button button-white" id="document-tag-button">