diff options
-rw-r--r-- | css/src/style.scss | 21 | ||||
-rw-r--r-- | templates/main.php | 9 |
2 files changed, 3 insertions, 27 deletions
diff --git a/css/src/style.scss b/css/src/style.scss index ac4b425b..3138ff1e 100644 --- a/css/src/style.scss +++ b/css/src/style.scss @@ -92,27 +92,6 @@ $white: #fff; box-shadow: 0 0 6px rgba($red, .3); } - .icon { - margin-top: -3px; - margin-left: 2px; - } - - .calendar-indicator { - min-width: 12px; - min-height: 12px; - background-color: $red; - display: inline-block; - height: 12px; - width: 12px; - margin-top: 0; - border-radius: 50%; - text-align: center; - vertical-align: middle; - line-height: 20px; - margin-left: 4px; - margin-right: 2px; - } - .title { margin-left: 11px; } diff --git a/templates/main.php b/templates/main.php index 2bbbaaa9..7149972f 100644 --- a/templates/main.php +++ b/templates/main.php @@ -21,10 +21,8 @@ dnd-list="draggedTasks" dnd-drop="dropCollection(event, index, item)" dnd-dragover="dragoverCollection(event, index)"> - <a href="#/collections/{{ collection.id }}"> - <span class="icon {{ collection.icon }}"> + <a href="#/collections/{{ collection.id }}" class="icon {{ collection.icon }}"> <text ng-if="collection.id=='today'"><?php p($_['DOM']); ?></text> - </span> <span class="title">{{ collection.displayname }}</span> </a> <div class="app-navigation-entry-utils"> @@ -42,8 +40,8 @@ dnd-list="draggedTasks" dnd-drop="dropList(event, index, item)" dnd-dragover="dragoverList(event, index)"> + <div class="app-navigation-entry-bullet" style="background-color: {{ calendar.color }};"></div> <a href="#/calendars/{{ calendar.uri }}" ng-dblclick="startRename(calendar)"> - <span class="calendar-indicator" style="background-color: {{ calendar.color }};"></span> <span class="title">{{ calendar.displayname }}</span> </a> <div class="app-navigation-entry-utils"> @@ -113,10 +111,9 @@ </div> </li> <li class="newList handler reactive" ng-class="{edit: status.addingList}"> - <a class="addlist" + <a class="addlist icon icon-add" ng-click="startCreate()" oc-click-focus="{selector: '#newList', timeout: 0}"> - <span class="icon icon-add"></span> <span class="title"><?php p($l->t('Add List...')); ?></span> </a> <div class="app-navigation-entry-edit name" ng-class="{error: nameError}"> |