1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-28 04:19:56 +00:00

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Bram Chen 2014-07-10 00:13:48 +08:00
commit 786bfc6e24

View File

@ -485,12 +485,24 @@ a.tw-tiddlylink-external:hover {
} }
@media print { @media print {
body.tw-body {
background-color: transparent;
}
.sidebar-header, .tw-topbar { .sidebar-header, .tw-topbar {
display: none; display: none;
} }
.story-river { .story-river {
margin-left: 14px; margin: 0;
padding: 0;
}
.story-river .tw-tiddler-frame {
margin: 0;
border: none;
padding: 28px;
} }
} }
@ -504,13 +516,6 @@ a.tw-tiddlylink-external:hover {
border: 1px solid <<colour tiddler-border>>; border: 1px solid <<colour tiddler-border>>;
} }
@media print {
.tw-tiddler-frame {
border: none;
}
}
.tw-tiddler-info { .tw-tiddler-info {
padding: 14px 42px 14px 42px; padding: 14px 42px 14px 42px;
background-color: <<colour tiddler-info-background>>; background-color: <<colour tiddler-info-background>>;