Skip to content

Commit 0efee9a

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent 2c34431 commit 0efee9a

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

‎src/main/resources/templates/layout/projects.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
<span id="project_0"
1414
ondrop="drop2project(event)" ondragover="allowDrop2Project(event)">
1515
<a th:href="@{/project/root}"
16-
th:if="${thisProject != null or taskstateType != null}"
16+
th:if="${thisProject != null or taskstateType != 'projects'}"
1717
class="m-2 btn btn-outline-dark btn-sm" id="project_0_a">
1818
<i class="fas fa-folder-open" id="project_0_a_i"></i>
1919
<span th:text="#{right.nav.projects}" id="project_0_a_span">Projects</span>
2020
</a>
21-
<a th:if="${thisProject == null and taskstateType == null}"
21+
<a th:if="${thisProject == null and taskstateType == 'projects'}"
2222
th:href="@{/project/root}" class="m-2 btn btn-dark btn-sm" id="project_0_aa">
2323
<i class="fas fa-folder-open" id="project_0_aa_i"></i>
2424
<span th:text="#{right.nav.projects}" id="project_0_aa_span">Projects</span>

‎src/main/resources/templates/layout/taskstates.html‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
<i class="fas fa-inbox link-dark"></i>
1515
<span th:text="#{layout.page.inbox}" class="link-dark">Inbox</span>
1616
</a>
17-
<a id="taskstate_inbox" class="nav-link link-light"
17+
<a id="taskstate_inbox" class="nav-link link-dark"
1818
th:href="@{/taskstate/inbox}"
1919
th:if="${taskstateType != 'inbox'}">
20-
<i class="fas fa-inbox link-light"></i>
21-
<span th:text="#{layout.page.inbox}" class="link-light">Inbox</span>
20+
<i class="fas fa-inbox link-dark"></i>
21+
<span th:text="#{layout.page.inbox}" class="link-dark">Inbox</span>
2222
</a>
2323
</li>
2424
<li class="nav-item" ondrop="drop2today(event)" ondragover="allowDropOfTask(event)">
@@ -28,38 +28,38 @@
2828
<i class="fas fa-clock link-dark"></i>
2929
<span th:text="#{layout.page.today}" class="link-dark">Today</span>
3030
</a>
31-
<a id="taskstate_today" class="nav-link link-light"
31+
<a id="taskstate_today" class="nav-link link-dark"
3232
th:href="@{/taskstate/today}"
3333
th:if="${taskstateType != 'today'}">
34-
<i class="fas fa-clock link-light"></i>
35-
<span th:text="#{layout.page.today}" class="link-light">Today</span>
34+
<i class="fas fa-clock link-dark"></i>
35+
<span th:text="#{layout.page.today}" class="link-dark">Today</span>
3636
</a>
3737
</li>
3838
<li class="nav-item" ondrop="drop2next(event)" ondragover="allowDropOfTask(event)">
3939
<a id="taskstate_next" class="nav-link active link-dark"
4040
th:href="@{/taskstate/next}"
4141
th:if="${taskstateType == 'next'}">
42-
<i class="fas fa-cogs"></i>
42+
<i class="fas fa-cogs link-dark"></i>
4343
<span th:text="#{layout.page.next}">Next</span>
4444
</a>
45-
<a id="taskstate_next" class="nav-link link-light"
45+
<a id="taskstate_next" class="nav-link link-dark"
4646
th:href="@{/taskstate/next}"
4747
th:if="${taskstateType != 'next'}">
48-
<i class="fas fa-cogs"></i>
48+
<i class="fas fa-cogs link-dark"></i>
4949
<span th:text="#{layout.page.next}">Next</span>
5050
</a>
5151
</li>
5252
<li class="nav-item" ondrop="drop2waiting(event)" ondragover="allowDropOfTask(event)">
5353
<a id="taskstate_waiting" class="nav-link active link-dark"
5454
th:href="@{/taskstate/waiting}"
5555
th:if="${taskstateType == 'waiting'}">
56-
<i class="fas fa-hourglass-half"></i>
56+
<i class="fas fa-hourglass-half link-dark"></i>
5757
<span th:text="#{layout.page.waiting}">Waiting</span>
5858
</a>
59-
<a id="taskstate_waiting" class="nav-link link-light"
59+
<a id="taskstate_waiting" class="nav-link link-dark"
6060
th:href="@{/taskstate/waiting}"
6161
th:if="${taskstateType != 'waiting'}">
62-
<i class="fas fa-hourglass-half"></i>
62+
<i class="fas fa-hourglass-half link-dark"></i>
6363
<span th:text="#{layout.page.waiting}">Waiting</span>
6464
</a>
6565
</li>
@@ -70,7 +70,7 @@
7070
<i class="fas fa-calendar-alt"></i>
7171
<span th:text="#{layout.page.scheduled}">Scheduled</span>
7272
</a>
73-
<a id="taskstate_scheduled" class="nav-link link-light"
73+
<a id="taskstate_scheduled" class="nav-link link-dark"
7474
th:href="@{/taskstate/scheduled}"
7575
th:if="${taskstateType != 'scheduled'}">
7676
<i class="fas fa-calendar-alt"></i>
@@ -84,7 +84,7 @@
8484
<i class="fas fa-road"></i>
8585
<span th:text="#{layout.page.someday}">Someday</span>
8686
</a>
87-
<a id="taskstate_someday" class="nav-link link-light"
87+
<a id="taskstate_someday" class="nav-link link-dark"
8888
th:href="@{/taskstate/someday}"
8989
th:if="${taskstateType != 'someday'}">
9090
<i class="fas fa-road"></i>
@@ -98,7 +98,7 @@
9898
<i class="fas fa-star"></i>
9999
<span th:text="#{layout.page.focus}">Focus</span>
100100
</a>
101-
<a id="taskstate_focus" class="nav-link link-light"
101+
<a id="taskstate_focus" class="nav-link link-dark"
102102
th:href="@{/taskstate/focus}"
103103
th:if="${taskstateType != 'focus'}">
104104
<i class="fas fa-star"></i>
@@ -112,7 +112,7 @@
112112
<i class="fas fa-check-square"></i>
113113
<span th:text="#{layout.page.completed}">Completed Tasks</span>
114114
</a>
115-
<a id="taskstate_completed" class="nav-link link-light"
115+
<a id="taskstate_completed" class="nav-link link-dark"
116116
th:href="@{/taskstate/completed}"
117117
th:if="${taskstateType != 'completed'}">
118118
<i class="fas fa-check-square"></i>
@@ -126,11 +126,11 @@
126126
<i class="fas fa-trash-alt link-dark"></i>
127127
<span th:text="#{layout.page.trash}" class="link-dark">Trash</span>
128128
</a>
129-
<a id="taskstate_trash" class="nav-link link-light"
129+
<a id="taskstate_trash" class="nav-link link-dark"
130130
th:href="@{/taskstate/trash}"
131131
th:if="${taskstateType != 'trash'}">
132-
<i class="fas fa-trash-alt link-light"></i>
133-
<span th:text="#{layout.page.trash}" class="link-light">Trash</span>
132+
<i class="fas fa-trash-alt link-dark"></i>
133+
<span th:text="#{layout.page.trash}" class="link-dark">Trash</span>
134134
</a>
135135
</li>
136136
<li class="nav-item" ondrop="drop2trash(event)" ondragover="allowDropOfTask(event)">
@@ -140,11 +140,11 @@
140140
<i class="fa-solid fa-diagram-project link-dark"></i>
141141
<span th:text="#{layout.page.projects}" class="link-dark">Projects</span>
142142
</a>
143-
<a id="taskstate_projects" class="nav-link link-light"
143+
<a id="taskstate_projects" class="nav-link link-dark"
144144
th:href="@{/project/root}"
145145
th:if="${taskstateType != 'projects'}">
146-
<i class="fa-solid fa-diagram-project link-light"></i>
147-
<span th:text="#{layout.page.projects}" class="link-light">Projects</span>
146+
<i class="fa-solid fa-diagram-project link-dark"></i>
147+
<span th:text="#{layout.page.projects}" class="link-dark">Projects</span>
148148
</a>
149149
</li>
150150
</ul>

0 commit comments

Comments
 (0)