Skip to content

overlay shared-icon like in app files #669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cloud2018 wants to merge 1 commit into from
Closed

overlay shared-icon like in app files #669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 29 additions & 5 deletions css/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ button,
border: 0;
background-color: transparent;
}
&.button-inline:hover {
&.button-inline:hover {
border: 0;
background-color: transparent;
}
}
}

input.input-inline {
Expand Down Expand Up @@ -109,7 +109,7 @@ input.input-inline {

#app-navigation {
/** menu */
.board-bullet {
.board-bullet, .board-bullet-shared, .board-bullet-shared-white {
position: absolute;
margin-left: 17px;
margin-top: 16px;
Expand All @@ -119,6 +119,19 @@ input.input-inline {
border-radius: 50%;
cursor: pointer;
}

.board-bullet-shared, .board-bullet-shared-white {
background-image: var(--icon-share-000);
background-size: 6px;
background-position: center center;
background-repeat: no-repeat;
opacity: 1;
}

.board-bullet-shared-white {
background-image: var(--icon-share-fff);
}

.app-navigation-entry-utils-menu-share i {
height: 100%;
width: 100%;
Expand Down Expand Up @@ -237,7 +250,7 @@ input.input-inline {
display: flex;
align-items: center;
position: inherit;
padding-left: 44px;
padding-left: 44px;

.crumb {
order: 0;
Expand Down Expand Up @@ -1149,14 +1162,25 @@ input.input-inline {
padding: 0 10px;
border-bottom: 1px solid $color-grey;

.board-bullet {
.board-bullet, .board-bullet-shared, .board-bullet-shared-white {
width: 32px;
height: 32px;
border-radius: 50%;
cursor: pointer;
margin: 6px;
}

.board-bullet-shared, .board-bullet-shared-white{
background-image: var(--icon-share-000);
background-position: center center;
background-repeat: no-repeat;
opacity: 1;
}

.board-bullet-shared-white {
background-image: var(--icon-share-fff);
}

form {
display: flex;
width: 100%;
Expand Down
25 changes: 13 additions & 12 deletions templates/part.boardlist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,20 @@
<tbody>
<tr data-ng-repeat="b in boardservice.sorted track by b.id" ng-class="{deleted: b.deletedAt > 0}">
<td ng-click="gotoBoard(b)">
<div class="board-bullet" ng-style="{'background-color':'#'+b.color}"> </div>
<div ng-if="b.acl.length !== 0" class="board-bullet-shared{{ b.color | iconWhiteFilter }}" ng-style="{'background-color':'#'+b.color}"></div>
<div ng-if="b.acl.length === 0" class="board-bullet" ng-style="{'background-color':'#'+b.color}"></div>
</td>
<td>
<div ng-click="gotoBoard(b)" ng-show="!b.status.edit">{{ b.title }}</div>
<div class="app-navigation-entry-edit" ng-show="b.status.edit">
<form ng-disabled="isAddingList" class="ng-pristine ng-valid" ng-submit="boardUpdate(b)">
<input class="edit ng-valid ng-empty" type="text" autofocus-on-insert ng-model="b.title" maxlength="100" ng-model-options="{ debounce: 250 }">
<div class="colorselect" ng-controller="ColorPickerController">
<div class="color" ng-repeat="c in ::colors" ng-style="{'background-color':'#{{ c }}'}" ng-click="b=setColor(b,c)" ng-class="{'selected': (c == b.color) }"></div>
<label class="colorselect-label{{ b.color | iconWhiteFilter }} color" ng-style="getCustomBackground(b.hashedColor)" ng-init="b.hashedColor='#' + b.color">
<input class="color" type="color" ng-model="b.hashedColor" value="#{{b.color}}" ng-change="b=setHashedColor(b)"/>
</label>
</div>
<div class="color" ng-repeat="c in ::colors" ng-style="{'background-color':'#{{ c }}'}" ng-click="b=setColor(b,c)" ng-class="{'selected': (c == b.color) }"></div>
<label class="colorselect-label{{ b.color | iconWhiteFilter }} color" ng-style="getCustomBackground(b.hashedColor)" ng-init="b.hashedColor='#' + b.color">
<input class="color" type="color" ng-model="b.hashedColor" value="#{{b.color}}" ng-change="b=setHashedColor(b)"/>
</label>
</div>
</form>
</div>
</td>
Expand Down Expand Up @@ -113,12 +114,12 @@ class="ng-pristine ng-valid" ng-submit="boardCreate()">
<input class="edit ng-valid ng-empty"
type="text" placeholder="<?php p($l->t('New board title')); ?>"
autofocus-on-insert ng-model="newBoard.title" maxlength="100" ng-model-options="{ debounce: 250 }">
<div class="colorselect" ng-controller="ColorPickerController">
<div class="color" ng-repeat="c in ::colors" ng-style="{'background-color':'#{{ c }}'}" ng-click="selectColor(c);b=setColor(b,c);"ng-class="{'selected': (c == newBoard.color), 'dark': (newBoard.color | textColorFilter) === '#ffffff' }"></div>
<label class="colorselect-label{{ newBoard.color | iconWhiteFilter }} color" ng-style="getCustomBackground(newBoard.hashedColor)" ng-init="newBoard.hashedColor='#' + newBoard.color">
<input class="color" type="color" ng-model="newBoard.hashedColor" value="#{{newBoard.color}}" ng-change="newBoard=setHashedColor(newBoard)"/>
</label>
</div>
<div class="colorselect" ng-controller="ColorPickerController">
<div class="color" ng-repeat="c in ::colors" ng-style="{'background-color':'#{{ c }}'}" ng-click="selectColor(c);b=setColor(b,c);"ng-class="{'selected': (c == newBoard.color), 'dark': (newBoard.color | textColorFilter) === '#ffffff' }"></div>
<label class="colorselect-label{{ newBoard.color | iconWhiteFilter }} color" ng-style="getCustomBackground(newBoard.hashedColor)" ng-init="newBoard.hashedColor='#' + newBoard.color">
<input class="color" type="color" ng-model="newBoard.hashedColor" value="#{{newBoard.color}}" ng-change="newBoard=setHashedColor(newBoard)"/>
</label>
</div>
</form>
</td>
<td></td>
Expand Down
4 changes: 2 additions & 2 deletions templates/part.navigation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<li ng-class="{active: status.filter === 'shared'}"><a ui-sref="list({ filter: 'shared' })" class="icon-share"><?php p($l->t('Shared boards')); ?></a></li>

<li class="with-icon with-menu" ng-class="{active: b.id === boardservice.getCurrent().id, editing: b.status.editNavigation}" data-ng-repeat="b in boardservice.sidebar track by b.id" ng-if="b.deletedAt == 0">

<span class="board-bullet" ng-style="{'background-color': '#' + b.color}"> </span>
<span ng-if="b.acl.length !== 0" class="board-bullet-shared{{ b.color | iconWhiteFilter }}" ng-style="{'background-color': '#' + b.color}"></span>
<span ng-if="b.acl.length === 0" class="board-bullet" ng-style="{'background-color': '#' + b.color}"></span>
<a href="#!/board/{{b.id}}/">{{ b.title }}</a>
<div class="app-navigation-entry-utils">
<ul>
Expand Down