Merge branch 'master' into colour-improvements

core/modules/widgets/browse.js

@@ -56,6 +56,9 @@ BrowseWidget.prototype.render = function(parent,nextSibling) {
 	if(this.nwdirectory) {
 		domNode.setAttribute("nwdirectory",this.nwdirectory);
 	}
+	if(this.isDisabled === "yes") {
+		domNode.setAttribute("disabled", true);
+	}
 	// Add a click event handler
 	domNode.addEventListener("change",function (event) {
 		if(self.message) {
@@ -94,6 +97,7 @@ BrowseWidget.prototype.execute = function() {
 	this.accept = this.getAttribute("accept");
 	this.webkitdirectory = this.getAttribute("webkitdirectory");
 	this.nwdirectory = this.getAttribute("nwdirectory");
+	this.isDisabled = this.getAttribute("disabled", "no");
 };
 
 /*

core/modules/widgets/edit-shortcut.js

@@ -48,6 +48,9 @@ EditShortcutWidget.prototype.render = function(parent,nextSibling) {
 	if(this.shortcutAriaLabel) {
 		this.inputNode.setAttribute("aria-label",this.shortcutAriaLabel);
 	}
+	if(this.isDisabled === "yes") {
+		this.inputNode.setAttribute("disabled", true);
+	}
 	// Assign the current shortcut
 	this.updateInputNode();
 	// Add event handlers
@@ -77,6 +80,7 @@ EditShortcutWidget.prototype.execute = function() {
 	this.shortcutTooltip = this.getAttribute("tooltip");
 	this.shortcutAriaLabel = this.getAttribute("aria-label");
 	this.shortcutFocus = this.getAttribute("focus");
+	this.isDisabled = this.getAttribute("disabled", "no");
 };
 
 /*
@@ -138,7 +142,7 @@ Selectively refreshes the widget if needed. Returns true if the widget needed re
 */
 EditShortcutWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.placeholder || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.style || changedAttributes.tooltip || changedAttributes["aria-label"] || changedAttributes.focus) {
+	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.placeholder || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.style || changedAttributes.tooltip || changedAttributes["aria-label"] || changedAttributes.focus || changedAttributes.disabled) {
 		this.refreshSelf();
 		return true;
 	} else if(changedTiddlers[this.shortcutTiddler]) {

core/modules/widgets/select.js

@@ -53,6 +53,9 @@ SelectWidget.prototype.render = function(parent,nextSibling) {
 	if(this.selectMultiple) {
 		domNode.setAttribute("multiple","multiple");
 	}
+	if(this.isDisabled === "yes") {
+		domNode.setAttribute("disabled", true);
+	}
 	if(this.selectSize) {
 		domNode.setAttribute("size",this.selectSize);
 	}
@@ -172,6 +175,7 @@ SelectWidget.prototype.execute = function() {
 	this.selectTabindex = this.getAttribute("tabindex");
 	this.selectTooltip = this.getAttribute("tooltip");
 	this.selectFocus = this.getAttribute("focus");
+	this.isDisabled = this.getAttribute("disabled","no");
 	// Make the child widgets
 	this.makeChildWidgets();
 };
@@ -182,7 +186,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 SelectWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
 	// If we're using a different tiddler/field/index then completely refresh ourselves
-	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.tooltip || changedAttributes.tabindex) {
+	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.tooltip || changedAttributes.tabindex || changedAttributes.disabled) {
 		this.refreshSelf();
 		return true;
 	} else {

core/palettes/FlexokiDark.tid

@@ -65,8 +65,8 @@ flexoki-bl-2: <<colour flexoki-blue-600>>
 flexoki-pu-2: <<colour flexoki-purple-600>>
 flexoki-ma-2: <<colour flexoki-magenta-600>>
 
-alert-background: <<colour flexoki-yellow-100>>
-alert-border: <<colour flexoki-ye-2>>
+alert-background: <<colour flexoki-yellow-900>>
+alert-border: <<colour flexoki-ye>>
 alert-highlight: <<colour flexoki-re>>
 alert-muted-foreground: <<colour flexoki-ye>>
 background: #100F0F
@@ -103,8 +103,8 @@ external-link-foreground-visited: <<colour flexoki-bl>>
 external-link-foreground: <<colour flexoki-bl>>
 footnote-target-background: <<colour flexoki-bg-2>>
 foreground: #CECDC3
-highlight-background: #ffff00
-highlight-foreground: #000000
+highlight-background: <<colour flexoki-cyan-950>>
+highlight-foreground: <<colour flexoki-cyan-400>>
 menubar-background: <<colour primary>>
 menubar-foreground: <<colour flexoki-paper>>
 message-background: <<colour background>>
@@ -118,14 +118,14 @@ modal-footer-border: <<colour flexoki-ui-3>>
 modal-header-border: <<colour flexoki-ui-3>>
 muted-foreground: <<colour flexoki-tx-2>>
 network-activity-foreground: <<colour flexoki-cy>>
-notification-background: <<colour flexoki-ui-3>>
-notification-border: <<colour flexoki-ui>>
+notification-background: <<colour flexoki-bg>>
+notification-border: <<colour flexoki-paper>>
 page-background: <<colour flexoki-bg-2>>
-pre-background: <<colour flexoki-ui-3>>
+pre-background: <<colour flexoki-bg-2>>
 pre-border: <<colour flexoki-ui-2>>
 primary: <<colour flexoki-cy>>
-selection-background: #2b7b73
-selection-foreground: <<colour flexoki-tx>>
+selection-background: <<colour primary>>
+selection-foreground: <<colour background>>
 select-tag-background: <<colour flexoki-bg>>
 select-tag-foreground: <<colour flexoki-paper>>
 sidebar-button-foreground: <<colour foreground>>
@@ -193,20 +193,20 @@ toolbar-cancel-button:
 toolbar-done-button: 
 untagged-background: <<colour flexoki-tx-3>>
 very-muted-foreground: <<colour flexoki-600>>
-wikilist-background: #e5e5e5
-wikilist-item: #fff
-wikilist-info: #000
-wikilist-title: #666
+wikilist-background: <<colour flexoki-ui>>
+wikilist-item: <<colour flexoki-black>>
+wikilist-info: <<colour flexoki-paper>>
+wikilist-title: <<colour flexoki-tx-2>>
 wikilist-title-svg: <<colour wikilist-title>>
-wikilist-url: #aaa
-wikilist-button-open: #4fb82b
-wikilist-button-open-hover: green
-wikilist-button-reveal: #5778d8
-wikilist-button-reveal-hover: blue
-wikilist-button-remove: #d85778
-wikilist-button-remove-hover: red
-wikilist-toolbar-background: #d3d3d3
-wikilist-toolbar-foreground: #888
-wikilist-droplink-dragover: rgba(255,192,192,0.5)
-wikilist-button-background: #acacac
-wikilist-button-foreground: #000
+wikilist-url: <<colour flexoki-tx-3>>
+wikilist-button-open: <<colour flexoki-gr>>
+wikilist-button-open-hover: <<colour flexoki-gr-2>>
+wikilist-button-reveal: <<colour flexoki-cy>>
+wikilist-button-reveal-hover: <<colour flexoki-cy-2>>
+wikilist-button-remove: <<colour flexoki-re>>
+wikilist-button-remove-hover: <<colour flexoki-re-2>>
+wikilist-toolbar-background: <<colour flexoki-ui-2>>
+wikilist-toolbar-foreground: <<colour flexoki-600>>
+wikilist-droplink-dragover: <<colour flexoki-pu>>
+wikilist-button-background: <<colour flexoki-tx-3>>
+wikilist-button-foreground: <<colour flexoki-paper>>

core/palettes/FlexokiLight.tid

@@ -94,8 +94,8 @@ dragger-background: <<colour foreground>>
 dragger-foreground: <<colour background>>
 dropdown-background: <<colour background>>
 dropdown-border: <<colour muted-foreground>>
-dropdown-tab-background-selected: #fff
-dropdown-tab-background: #ececec
+dropdown-tab-background-selected: <<colour background>>
+dropdown-tab-background: <<colour flexoki-bg-2>>
 dropzone-background: <<colour flexoki-gr>>
 external-link-background-hover: inherit
 external-link-background-visited: inherit
@@ -105,8 +105,8 @@ external-link-foreground-visited: <<colour flexoki-bl>>
 external-link-foreground: <<colour flexoki-bl>>
 footnote-target-background: <<colour flexoki-bg-2>>
 foreground: #100F0F
-highlight-background: #ffff00
-highlight-foreground: #000000
+highlight-background: <<colour flexoki-cyan-050>>
+highlight-foreground: inherit
 menubar-background: <<colour primary>>
 menubar-foreground: <<colour flexoki-paper>>
 message-background: <<colour flexoki-bg>>
@@ -123,7 +123,7 @@ network-activity-foreground: <<colour flexoki-cy-2>>
 notification-background: <<colour flexoki-bg>>
 notification-border: <<color flexoki-black>>
 page-background: <<colour flexoki-bg-2>>
-pre-background: <<colour flexoki-bg>>
+pre-background: <<colour flexoki-bg-2>>
 pre-border: <<colour flexoki-ui-2>>
 primary: <<colour flexoki-cy-2>>
 selection-background: <<colour flexoki-cy-2>>
@@ -196,19 +196,19 @@ toolbar-done-button:
 untagged-background: <<colour flexoki-tx-3>>
 very-muted-foreground: <<colour flexoki-500>>
 wikilist-background: <<colour flexoki-ui>>
-wikilist-item: #fff
-wikilist-info: #000
-wikilist-title: #666
+wikilist-item: <<colour flexoki-paper>>
+wikilist-info: <<colour flexoki-black>>
+wikilist-title: <<colour flexoki-tx-2>>
 wikilist-title-svg: <<colour wikilist-title>>
-wikilist-url: #aaa
-wikilist-button-open: #4fb82b
-wikilist-button-open-hover: green
-wikilist-button-reveal: #5778d8
-wikilist-button-reveal-hover: blue
-wikilist-button-remove: #d85778
-wikilist-button-remove-hover: red
-wikilist-toolbar-background: #d3d3d3
-wikilist-toolbar-foreground: #888
-wikilist-droplink-dragover: rgba(255,192,192,0.5)
-wikilist-button-background: #acacac
-wikilist-button-foreground: #000
+wikilist-url: <<colour flexoki-tx-3>>
+wikilist-button-open: <<colour flexoki-gr-2>>
+wikilist-button-open-hover: <<colour flexoki-gr>>
+wikilist-button-reveal: <<colour flexoki-cy-2>>
+wikilist-button-reveal-hover: <<colour flexoki-cy>>
+wikilist-button-remove: <<colour flexoki-re-2>>
+wikilist-button-remove-hover: <<colour flexoki-re>>
+wikilist-toolbar-background: <<colour flexoki-ui-2>>
+wikilist-toolbar-foreground: <<colour flexoki-500>>
+wikilist-droplink-dragover: <<colour flexoki-pu>>
+wikilist-button-background: <<colour flexoki-tx-3>>
+wikilist-button-foreground: <<colour flexoki-black>>

editions/dev/tiddlers/$__github-ribbon.tid

@@ -0,0 +1,9 @@
+code-body: yes
+created: 20241205094051389
+modified: 20241205094051389
+tags: $:/tags/PageTemplate
+title: $:/github-ribbon
+type: text/vnd.tiddlywiki
+
+\whitespace trim
+<$transclude $tiddler="$:/plugins/tiddlywiki/github-fork-ribbon/template" top="30px" fixed=fixed color="green"/>

editions/dev/tiddlers/system/tw5.com-dev-styles.tid

@@ -1,3 +1,5 @@
 title: $:/_tw5.com-dev-styles
 tags: $:/tags/Stylesheet
+list-after: $:/editions/tw5.com/doc-styles
 
+<!-- styles that are unique to the TW dev edition. If possible use $:/_tw_shared/styles or $:/editions/tw5.com/doc-styles -->