mirror of
https://github.com/documize/community.git
synced 2025-08-10 07:55:25 +02:00
Merge branch 'master' into github-config
This commit is contained in:
commit
8a6af3d0a1
4 changed files with 17 additions and 3 deletions
|
@ -136,6 +136,11 @@
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
border: none;
|
border: none;
|
||||||
@extend .no-select;
|
@extend .no-select;
|
||||||
|
|
||||||
|
> .name {
|
||||||
|
vertical-align: top;
|
||||||
|
display: inline-block;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.button-red {
|
.button-red {
|
||||||
|
@ -158,6 +163,12 @@
|
||||||
@include button-hover-state($color-gray);
|
@include button-hover-state($color-gray);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.button-transparent {
|
||||||
|
background-color: transparent;
|
||||||
|
color: $color-gray;
|
||||||
|
border: 1px solid $color-gray;
|
||||||
|
}
|
||||||
|
|
||||||
.flat-button {
|
.flat-button {
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
|
|
|
@ -40,8 +40,9 @@
|
||||||
<div class="actions pull-right hidden-xs hidden-sm">
|
<div class="actions pull-right hidden-xs hidden-sm">
|
||||||
{{#if isEditor}}
|
{{#if isEditor}}
|
||||||
{{#link-to 'document.wizard' folder.id folder.slug document.id document.slug}}
|
{{#link-to 'document.wizard' folder.id folder.slug document.id document.slug}}
|
||||||
<div class="square-button button-green" id="add-section-button" data-tooltip="Add section" data-tooltip-position="top center">
|
<div class="regular-button button-green" id="add-section-button" data-tooltip="Add section" data-tooltip-position="top center">
|
||||||
<i class="material-icons">add</i>
|
<i class="material-icons">add</i>
|
||||||
|
<div class="name">section</div>
|
||||||
</div>
|
</div>
|
||||||
{{/link-to}}
|
{{/link-to}}
|
||||||
<div class="button-gap"></div>
|
<div class="button-gap"></div>
|
||||||
|
|
|
@ -28,8 +28,9 @@
|
||||||
{{/dropdown-dialog}}
|
{{/dropdown-dialog}}
|
||||||
{{else}}
|
{{else}}
|
||||||
{{#if folderService.canEditCurrentFolder}}
|
{{#if folderService.canEditCurrentFolder}}
|
||||||
<div class="square-button button-green" id="start-document-button" data-tooltip="Add or import document" data-tooltip-position="top center">
|
<div class="regular-button button-green" id="start-document-button" data-tooltip="Add or import document" data-tooltip-position="top center">
|
||||||
<i class="material-icons">add</i>
|
<i class="material-icons">add</i>
|
||||||
|
<div class="name">Document</div>
|
||||||
</div>
|
</div>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{#if isFolderOwner}}
|
{{#if isFolderOwner}}
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
<span class="hidden-xs hidden-sm">
|
<span class="hidden-xs hidden-sm">
|
||||||
{{#if session.isEditor}}
|
{{#if session.isEditor}}
|
||||||
<div class="round-button-mono" id="add-folder-button" data-tooltip="New space" data-tooltip-position="top center">
|
<div class="regular-button button-transparent" id="add-folder-button" data-tooltip="New space" data-tooltip-position="top center">
|
||||||
<i class="material-icons">add</i>
|
<i class="material-icons">add</i>
|
||||||
|
<div class="name">space</div>
|
||||||
</div>
|
</div>
|
||||||
{{#dropdown-dialog target="add-folder-button" position="bottom left" button="Add" color="flat-green" onAction=(action 'addFolder') focusOn="new-folder-name"}}
|
{{#dropdown-dialog target="add-folder-button" position="bottom left" button="Add" color="flat-green" onAction=(action 'addFolder') focusOn="new-folder-name"}}
|
||||||
<div>
|
<div>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue