aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/utilities/journal-calendar-widget.tid16
-rw-r--r--tiddlers/日历.tid20
2 files changed, 16 insertions, 20 deletions
diff --git a/plugins/utilities/journal-calendar-widget.tid b/plugins/utilities/journal-calendar-widget.tid
index c16276d..d3d804f 100644
--- a/plugins/utilities/journal-calendar-widget.tid
+++ b/plugins/utilities/journal-calendar-widget.tid
@@ -361,12 +361,18 @@ JournalCalendarWidget.prototype.renderMonth = function(value,byDate,showHeading)
if(journal) {
journal.tags.forEach(function(tag) {
- var tagButton = self.createButton(tag,"tc-btn-invisible tc-tag-label tc-journal-calendar-tag",function(event) {
- self.navigateTo(tag,event.currentTarget,event);
+ var tagNode = self.document.createElement("div"),
+ tagWidget = self.makeChildWidget({
+ type: "macrocall",
+ attributes: {
+ $name: {type: "string",value: "tag"},
+ tag: {type: "string",value: tag}
+ }
});
- tagButton.title = "打开标签:" + tag;
- tagButton.setAttribute("aria-label","打开标签:" + tag);
- dayNode.appendChild(tagButton);
+ tagNode.className = "tc-journal-calendar-tag";
+ dayNode.appendChild(tagNode);
+ self.children.push(tagWidget);
+ tagWidget.render(tagNode,null);
});
}
grid.appendChild(dayNode);
diff --git a/tiddlers/日历.tid b/tiddlers/日历.tid
index ce84a8b..b5a12f9 100644
--- a/tiddlers/日历.tid
+++ b/tiddlers/日历.tid
@@ -163,23 +163,15 @@ type: text/vnd.tiddlywiki
}
.tc-journal-calendar-tag {
- display: block;
- max-width: 100%;
- width: 100%;
margin-top: 0.25rem;
- padding: 0.25rem 0.35rem;
- text-align: left;
- line-height: 1.25;
+}
+
+.tc-journal-calendar-tag .tc-tag-label {
+ max-width: 100%;
+ box-sizing: border-box;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
- border-radius: 0.3rem;
- background: <<colour sidebar-tab-background>>;
-}
-
-.tc-journal-calendar-tag:hover,
-.tc-journal-calendar-tag:focus {
- text-decoration: underline;
}
.tc-journal-calendar-empty {
@@ -258,9 +250,7 @@ type: text/vnd.tiddlywiki
.tc-journal-calendar-tag {
margin-top: 0.15rem;
- padding: 0.15rem 0.2rem;
font-size: 0.7rem;
- text-align: center;
}
}
</style>