From 230066eeae9ace8336612e02c78f8cdaa3f717e4 Mon Sep 17 00:00:00 2001 From: Jermolene Date: Sun, 21 Dec 2014 16:04:40 +0000 Subject: [PATCH] Incorporate stickytitles theme into snow white theme --- core/modules/upgraders/plugins.js | 3 +++ editions/dev/tiddlywiki.info | 1 - editions/fr-FR/tiddlywiki.info | 1 - editions/introduction/tiddlywiki.info | 1 - editions/ja-JP/tiddlywiki.info | 1 - editions/prerelease/tiddlywiki.info | 1 - editions/tw5.com/tiddlywiki.info | 1 - editions/zh-Hans/tiddlywiki.info | 1 - editions/zh-Hant/tiddlywiki.info | 1 - themes/tiddlywiki/snowwhite/base.tid | 11 +++++++++++ themes/tiddlywiki/stickytitles/plugin.info | 9 --------- themes/tiddlywiki/stickytitles/styles.tid | 15 --------------- 12 files changed, 14 insertions(+), 32 deletions(-) delete mode 100644 themes/tiddlywiki/stickytitles/plugin.info delete mode 100644 themes/tiddlywiki/stickytitles/styles.tid diff --git a/core/modules/upgraders/plugins.js b/core/modules/upgraders/plugins.js index d770ea29a..5d0b13b2a 100644 --- a/core/modules/upgraders/plugins.js +++ b/core/modules/upgraders/plugins.js @@ -15,6 +15,9 @@ Upgrader module that checks that plugins are newer than any already installed ve var UPGRADE_LIBRARY_TITLE = "$:/UpgradeLibrary"; var BLOCKED_PLUGINS = { + "$:/themes/tiddlywiki/stickytitles": { + versions: ["*"] + }, "$:/plugins/tiddlywiki/fullscreen": { versions: ["*"] } diff --git a/editions/dev/tiddlywiki.info b/editions/dev/tiddlywiki.info index 926dfd1e8..2c4e090ea 100644 --- a/editions/dev/tiddlywiki.info +++ b/editions/dev/tiddlywiki.info @@ -12,7 +12,6 @@ "tiddlywiki/nighttime", "tiddlywiki/starlight", "tiddlywiki/seamless", - "tiddlywiki/stickytitles", "tiddlywiki/centralised", "tiddlywiki/readonly" ], diff --git a/editions/fr-FR/tiddlywiki.info b/editions/fr-FR/tiddlywiki.info index b856e23b3..fb6c0ee08 100644 --- a/editions/fr-FR/tiddlywiki.info +++ b/editions/fr-FR/tiddlywiki.info @@ -7,7 +7,6 @@ "tiddlywiki/snowwhite", "tiddlywiki/nighttime", "tiddlywiki/starlight", - "tiddlywiki/stickytitles", "tiddlywiki/centralised", "tiddlywiki/readonly" ], diff --git a/editions/introduction/tiddlywiki.info b/editions/introduction/tiddlywiki.info index 8ba57fefa..d04140f42 100644 --- a/editions/introduction/tiddlywiki.info +++ b/editions/introduction/tiddlywiki.info @@ -12,7 +12,6 @@ "tiddlywiki/nighttime", "tiddlywiki/starlight", "tiddlywiki/seamless", - "tiddlywiki/stickytitles", "tiddlywiki/centralised", "tiddlywiki/readonly" ], diff --git a/editions/ja-JP/tiddlywiki.info b/editions/ja-JP/tiddlywiki.info index 6f5e40961..a0ff6b72f 100644 --- a/editions/ja-JP/tiddlywiki.info +++ b/editions/ja-JP/tiddlywiki.info @@ -8,7 +8,6 @@ "tiddlywiki/nighttime", "tiddlywiki/starlight", "tiddlywiki/seamless", - "tiddlywiki/stickytitles", "tiddlywiki/centralised", "tiddlywiki/readonly" ], diff --git a/editions/prerelease/tiddlywiki.info b/editions/prerelease/tiddlywiki.info index e89fb3bef..9c8ae7fa8 100644 --- a/editions/prerelease/tiddlywiki.info +++ b/editions/prerelease/tiddlywiki.info @@ -12,7 +12,6 @@ "tiddlywiki/nighttime", "tiddlywiki/starlight", "tiddlywiki/seamless", - "tiddlywiki/stickytitles", "tiddlywiki/centralised", "tiddlywiki/readonly" ], diff --git a/editions/tw5.com/tiddlywiki.info b/editions/tw5.com/tiddlywiki.info index d9c6c3640..3e32f96ba 100644 --- a/editions/tw5.com/tiddlywiki.info +++ b/editions/tw5.com/tiddlywiki.info @@ -12,7 +12,6 @@ "tiddlywiki/nighttime", "tiddlywiki/starlight", "tiddlywiki/seamless", - "tiddlywiki/stickytitles", "tiddlywiki/centralised", "tiddlywiki/readonly" ], diff --git a/editions/zh-Hans/tiddlywiki.info b/editions/zh-Hans/tiddlywiki.info index f53efea22..b2c6adb6c 100644 --- a/editions/zh-Hans/tiddlywiki.info +++ b/editions/zh-Hans/tiddlywiki.info @@ -8,7 +8,6 @@ "tiddlywiki/nighttime", "tiddlywiki/starlight", "tiddlywiki/seamless", - "tiddlywiki/stickytitles", "tiddlywiki/centralised", "tiddlywiki/readonly" ], diff --git a/editions/zh-Hant/tiddlywiki.info b/editions/zh-Hant/tiddlywiki.info index 3148f747f..037095e06 100644 --- a/editions/zh-Hant/tiddlywiki.info +++ b/editions/zh-Hant/tiddlywiki.info @@ -8,7 +8,6 @@ "tiddlywiki/nighttime", "tiddlywiki/starlight", "tiddlywiki/seamless", - "tiddlywiki/stickytitles", "tiddlywiki/centralised", "tiddlywiki/readonly" ], diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid index d7af9b38b..a1c08d9a0 100644 --- a/themes/tiddlywiki/snowwhite/base.tid +++ b/themes/tiddlywiki/snowwhite/base.tid @@ -7,6 +7,17 @@ tags: [[$:/tags/Stylesheet]] text-shadow: 0 1px 0 <>; } +.tc-tiddler-title { + position: -webkit-sticky; + position: -moz-sticky; + position: -o-sticky; + position: -ms-sticky; + position: sticky; + top: 0px; + background: <>; + z-index: 500; +} + .tc-tiddler-info { <> } diff --git a/themes/tiddlywiki/stickytitles/plugin.info b/themes/tiddlywiki/stickytitles/plugin.info deleted file mode 100644 index f66b7cdc8..000000000 --- a/themes/tiddlywiki/stickytitles/plugin.info +++ /dev/null @@ -1,9 +0,0 @@ -{ - "title": "$:/themes/tiddlywiki/stickytitles", - "name": "Sticky Titles", - "author": "JeremyRuston", - "core-version": ">=5.0.0", - "plugin-type": "theme", - "description": "Experimental theme with titles that stick to the top of the window", - "dependents": ["$:/themes/tiddlywiki/snowwhite"] -} diff --git a/themes/tiddlywiki/stickytitles/styles.tid b/themes/tiddlywiki/stickytitles/styles.tid deleted file mode 100644 index 43c442ea8..000000000 --- a/themes/tiddlywiki/stickytitles/styles.tid +++ /dev/null @@ -1,15 +0,0 @@ -title: $:/themes/tiddlywiki/stickytitles/styles.tid -tags: [[$:/tags/Stylesheet]] - -\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline - -.tc-tiddler-title { - position: -webkit-sticky; - position: -moz-sticky; - position: -o-sticky; - position: -ms-sticky; - position: sticky; - top: 0px; - background: <>; - z-index: 500; -}