mirror of
https://github.com/Jermolene/TiddlyWiki5
synced 2024-11-30 05:19:57 +00:00
Merge branch 'master' into multi-wiki-support
This commit is contained in:
commit
eac8a2c3d8
@ -55,7 +55,7 @@ var PutSaver = function(wiki) {
|
||||
callback: function(err,data,xhr) {
|
||||
// Check DAV header http://www.webdav.org/specs/rfc2518.html#rfc.section.9.1
|
||||
if(!err) {
|
||||
self.serverAcceptsPuts = xhr.status === 200 && !!xhr.getResponseHeader("dav");
|
||||
self.serverAcceptsPuts = xhr.status >= 200 && xhr.status < 300 && !!xhr.getResponseHeader("dav");
|
||||
}
|
||||
}
|
||||
});
|
||||
|
@ -39,6 +39,7 @@ caption: {{$:/language/Search/Standard/Caption}}
|
||||
</$keyboard>
|
||||
</$keyboard>
|
||||
</$keyboard>
|
||||
 
|
||||
<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
|
||||
<$button class="tc-btn-invisible">
|
||||
<<cancel-search-actions>>
|
||||
|
@ -55,7 +55,7 @@ tags: $:/tags/SideBarSegment
|
||||
<$macrocall $name="keyboard-driven-input" tiddler=<<editTiddler>> storeTitle=<<searchTiddler>>
|
||||
selectionStateTitle=<<searchListState>> refreshTitle="$:/temp/search/refresh" type="search"
|
||||
tag="input" focus={{$:/config/Search/AutoFocus}} focusPopup=<<qualify "$:/state/popup/search-dropdown">>
|
||||
class="tc-popup-handle" filterMinLength={{$:/config/Search/MinLength}} inputCancelActions=<<cancel-search-actions>>
|
||||
class="tc-tiny-gap-right tc-popup-handle" filterMinLength={{$:/config/Search/MinLength}} inputCancelActions=<<cancel-search-actions>>
|
||||
inputAcceptActions=<<input-accept-actions>> inputAcceptVariantActions=<<input-accept-variant-actions>> cancelPopups="yes"
|
||||
configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}]"/>
|
||||
</form>
|
||||
|
@ -71,10 +71,16 @@ $else$
|
||||
|
||||
{{$:/themes/tiddlywiki/vanilla/reset}}
|
||||
|
||||
*, input[type="search"] {
|
||||
box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
-webkit-box-sizing: border-box;
|
||||
input[type="search"] {
|
||||
outline-offset: initial;
|
||||
}
|
||||
|
||||
button, textarea, input, select {
|
||||
outline-color: <<colour primary>>;
|
||||
}
|
||||
|
||||
:-moz-focusring {
|
||||
outline: 2px solid <<colour primary>>;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -157,7 +163,7 @@ code {
|
||||
color: <<colour code-foreground>>;
|
||||
background-color: <<colour code-background>>;
|
||||
border: 1px solid <<colour code-border>>;
|
||||
white-space: {{$:/themes/tiddlywiki/vanilla/options/codewrapping}};
|
||||
white-space: pre-wrap;
|
||||
padding: 0 3px 2px;
|
||||
border-radius: 3px;
|
||||
font-family: {{$:/themes/tiddlywiki/vanilla/settings/codefontfamily}};
|
||||
@ -293,10 +299,13 @@ form.tc-form-inline {
|
||||
Markdown likes putting code elements inside pre elements
|
||||
*/
|
||||
pre > code {
|
||||
padding: 0;
|
||||
display: block;
|
||||
padding: 0.5em;
|
||||
border: none;
|
||||
white-space: {{$:/themes/tiddlywiki/vanilla/options/codewrapping}};
|
||||
background-color: inherit;
|
||||
color: inherit;
|
||||
overflow-x: auto;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -707,7 +716,7 @@ html body.tc-body .tc-btn-rounded:hover svg {
|
||||
}
|
||||
|
||||
button svg.tc-image-button, button .tc-image-button img {
|
||||
height: 1em;
|
||||
height: auto;
|
||||
width: 1em;
|
||||
}
|
||||
|
||||
@ -2819,7 +2828,7 @@ a.tc-tiddlylink.tc-plugin-info:hover > .tc-plugin-info-chunk .tc-plugin-info-sta
|
||||
}
|
||||
|
||||
.tc-language-chooser .tc-image-button img {
|
||||
width: 2em;
|
||||
width: auto;
|
||||
vertical-align: -0.15em;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user