Minz/quicknotes
1
0
Fork 0
mirror of https://github.com/JanGross/quicknotes.git synced 2025-11-30 23:37:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some regressions in NC28 (Issue #109) and improves the dark theme a bit.

Browse Source
This commit is contained in:
Matias De lellis
2024-01-31 11:52:58 -03:00
parent 88d73504c8
commit 7313d30beb
4 changed files with 53 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
js/script.js
View File

@@ -730,9 +730,9 @@ View.prototype = {
$('#colors-folder .circle-toolbar').click(function (event) {
event.stopPropagation();
self._cleanNavigation();
$(this).addClass('icon-checkmark');
$(this).addClass('icon-filter-checkmark');
if (!$(this).hasClass("any-color")) {
if (!$(this).hasClass("any-color-filter")) {
var color = $(this).css("background-color");
self._filterColor(color);
setFilterUrl('c', color);
@@ -788,7 +788,7 @@ View.prototype = {
var colors = $("#setting-defaul-color")[0].getElementsByClassName("circle-toolbar");
$.each(colors, function(i, c) {
if (color === self._colorToHex(c.style.backgroundColor)) {
c.className += " icon-checkmark";
c.className += " icon-filter-checkmark";
}
});
});
@@ -827,8 +827,8 @@ View.prototype = {
'value': color
},
success: function (response) {
$('#setting-defaul-color .circle-toolbar').removeClass('icon-checkmark');
currentColor.addClass('icon-checkmark');
$('#setting-defaul-color .circle-toolbar').removeClass('icon-filter-checkmark');
currentColor.addClass('icon-filter-checkmark');
}
});
});
@@ -1163,7 +1163,7 @@ View.prototype = {
var circles = $("#colors-folder")[0].getElementsByClassName("circle-toolbar");
$.each(circles, function(i, c) {
if (color == c.style.backgroundColor) {
c.className += " icon-checkmark";
c.className += " icon-filter-checkmark";
}
});
},
@@ -1172,9 +1172,9 @@ View.prototype = {
$.each(navItems, function(i, item) {
$(item).removeClass('active');
});
var oldColorTool = $('#app-navigation .circle-toolbar.icon-checkmark');
var oldColorTool = $('#app-navigation .circle-toolbar.icon-filter-checkmark');
$.each(oldColorTool, function(i, oct) {
$(oct).removeClass('icon-checkmark');
$(oct).removeClass('icon-filter-checkmark');
});
},
render: function () {

6
js/templates/navigation.handlebars
View File

@@ -1,6 +1,6 @@
<div id="new-note-fixed">
<div>
<button type="button" id="new-note" class="icon-add">{{newNoteTxt}}</button>
<button type="button" id="new-note" class="icon-button-add">{{newNoteTxt}}</button>
</div>
</div>
<li id="all-notes">
@@ -24,8 +24,8 @@
<button class="collapse"></button>
<a href="#" class="icon-search svg">{{colorsTxt}}</a>
<ul>
<li style="display: flex; justify-content: center;">
<button class="circle-toolbar icon-checkmark any-color"></button>
<li class="color-filter">
<button class="circle-toolbar icon-filter-checkmark any-color-filter"></button>
{{#each colors}}
<button class="circle-toolbar" style="background-color: {{color}} "></button>
{{/each}}