mirror of
https://github.com/documize/community.git
synced 2025-08-07 14:35:28 +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;
|
||||
border: none;
|
||||
@extend .no-select;
|
||||
|
||||
> .name {
|
||||
vertical-align: top;
|
||||
display: inline-block;
|
||||
}
|
||||
}
|
||||
|
||||
.button-red {
|
||||
|
@ -158,6 +163,12 @@
|
|||
@include button-hover-state($color-gray);
|
||||
}
|
||||
|
||||
.button-transparent {
|
||||
background-color: transparent;
|
||||
color: $color-gray;
|
||||
border: 1px solid $color-gray;
|
||||
}
|
||||
|
||||
.flat-button {
|
||||
box-shadow: none;
|
||||
background-color: transparent;
|
||||
|
|
|
@ -40,8 +40,9 @@
|
|||
<div class="actions pull-right hidden-xs hidden-sm">
|
||||
{{#if isEditor}}
|
||||
{{#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>
|
||||
<div class="name">section</div>
|
||||
</div>
|
||||
{{/link-to}}
|
||||
<div class="button-gap"></div>
|
||||
|
|
|
@ -28,8 +28,9 @@
|
|||
{{/dropdown-dialog}}
|
||||
{{else}}
|
||||
{{#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>
|
||||
<div class="name">Document</div>
|
||||
</div>
|
||||
{{/if}}
|
||||
{{#if isFolderOwner}}
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
<span class="hidden-xs hidden-sm">
|
||||
{{#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>
|
||||
<div class="name">space</div>
|
||||
</div>
|
||||
{{#dropdown-dialog target="add-folder-button" position="bottom left" button="Add" color="flat-green" onAction=(action 'addFolder') focusOn="new-folder-name"}}
|
||||
<div>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue