Skip to content

Commit 6b9660d

Browse files
dregaddregad
committed
Merge branch 'tpl-dokuwiki' into master
Changes from 'dokuwiki' template version 2020-07-29 Hogfather # Conflicts: # tpl_footer.php
2 parents e024acb + de96c7b commit 6b9660d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+594
-369
lines changed

‎css/_admin.less

+19-16
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,31 @@
2020
list-style-type: none;
2121
white-space: nowrap;
2222

23-
a span {
24-
display: inline-block;
23+
a {
24+
display: flex;
25+
span {
26+
display: inline-block;
2527

26-
&.icon {
27-
width: 1.5em;
28-
min-height: 1.5em;
29-
margin: 0 0.5em;
30-
vertical-align: top;
31-
32-
svg {
28+
&.icon {
3329
width: 1.5em;
34-
height: 1.5em;
35-
fill: @ini_link;
36-
display: inline-block;
37-
path {
30+
min-height: 1.5em;
31+
margin: 0 0.5em;
32+
vertical-align: top;
33+
34+
svg {
35+
width: 1.5em;
36+
height: 1.5em;
3837
fill: @ini_link;
38+
display: inline-block;
39+
path {
40+
fill: @ini_link;
41+
}
3942
}
4043
}
41-
}
4244

43-
&.prompt {
44-
white-space: normal;
45+
&.prompt {
46+
white-space: normal;
47+
}
4548
}
4649
}
4750
}

‎css/_edit.css

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/*____________ toolbar ____________*/
1313

1414
.dokuwiki div.toolbar {
15+
display: inline-block;
1516
margin-bottom: .5em;
1617
}
1718
#draft__status {

‎css/_search.less

+204
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
/**
2+
* This file provides styles for the search results page (?do=search)
3+
* and the AJAX search popup.
4+
*/
5+
6+
/* general
7+
********************************************************************/
8+
9+
/* search hit in normal text */
10+
.dokuwiki .search_hit {
11+
color: @ini_text;
12+
background-color: __highlight__;
13+
}
14+
15+
/* "nothing found" at search + media */
16+
.dokuwiki div.nothing {
17+
margin-bottom: 1.4em;
18+
}
19+
20+
/* search results page
21+
********************************************************************/
22+
23+
/*____________ advanced search form ____________*/
24+
.dokuwiki .search-results-form fieldset.search-form {
25+
width: 100%;
26+
margin: 1em 0;
27+
28+
input[name="q"] {
29+
width: 50%;
30+
}
31+
32+
button.toggleAssistant {
33+
float: right;
34+
}
35+
36+
.advancedOptions {
37+
padding: 1em 0;
38+
39+
> div {
40+
display: inline-block;
41+
position: relative;
42+
margin: 0 0.5em;
43+
}
44+
45+
div.toggle {
46+
// default closed toggle state
47+
div.current {
48+
cursor: pointer;
49+
max-width: 10em;
50+
white-space: nowrap;
51+
overflow: hidden;
52+
text-overflow: ellipsis;
53+
54+
&::after {
55+
content: '▼';
56+
font-size: smaller;
57+
color: @ini_text_alt;
58+
}
59+
}
60+
div.changed {
61+
font-weight: bold;
62+
}
63+
ul {
64+
display: none;
65+
position: absolute;
66+
border: 1px solid @ini_border;
67+
background-color: @ini_background;
68+
padding: 0.25em 0.5em;
69+
text-align: left;
70+
min-width: 10em;
71+
max-width: 15em;
72+
max-height: 50vh;
73+
overflow: auto;
74+
z-index: 100;
75+
li {
76+
margin: 0.25em 0;
77+
list-style: none;
78+
79+
a {
80+
display: block;
81+
}
82+
}
83+
}
84+
85+
// open toggle state
86+
&.open {
87+
div.current::after {
88+
content: '▲';
89+
}
90+
91+
ul {
92+
display: block;
93+
}
94+
}
95+
}
96+
}
97+
}
98+
99+
[dir=rtl] .search-results-form fieldset.search-form .advancedOptions {
100+
div.toggle ul {
101+
text-align: right;
102+
}
103+
}
104+
105+
106+
/*____________ matching pagenames ____________*/
107+
108+
.dokuwiki div.search_quickresult {
109+
margin-bottom: 1.4em;
110+
111+
ul {
112+
padding: 0;
113+
114+
li {
115+
float: left;
116+
width: 12em;
117+
margin: 0 1.5em;
118+
}
119+
}
120+
}
121+
122+
[dir=rtl] .dokuwiki div.search_quickresult ul li {
123+
float: right;
124+
}
125+
126+
/*____________ search results ____________*/
127+
128+
.dokuwiki dl.search_results {
129+
margin-bottom: 1.2em;
130+
131+
/* search heading */
132+
dt {
133+
font-weight: normal;
134+
margin-bottom: .2em;
135+
}
136+
137+
/* last modified line */
138+
dd.meta {
139+
margin: 0 0 .2em 0;
140+
}
141+
142+
/* search snippet */
143+
dd.snippet {
144+
color: @ini_text_alt;
145+
background-color: inherit;
146+
margin: 0 0 1.2em 0;
147+
148+
/* search hit in search results */
149+
strong.search_hit {
150+
font-weight: normal;
151+
/* color is set in general */
152+
}
153+
154+
/* ellipsis separating snippets */
155+
.search_sep {
156+
color: @ini_text;
157+
background-color: inherit;
158+
}
159+
}
160+
}
161+
162+
/* AJAX quicksearch popup
163+
********************************************************************/
164+
165+
.dokuwiki form.search {
166+
div.no {
167+
position: relative;
168+
}
169+
170+
/* .JSpopup */
171+
div.ajax_qsearch {
172+
position: absolute;
173+
top: 0;
174+
left: -13.5em; /* -( width of #qsearch__in + padding of .ajax_qsearch + a bit more ) */
175+
width: 12em;
176+
padding: 0.5em;
177+
font-size: .9em;
178+
z-index: 20;
179+
text-align: left;
180+
display: none;
181+
182+
strong {
183+
display: block;
184+
margin-bottom: .3em;
185+
}
186+
187+
ul {
188+
margin: 0 !important;
189+
padding: 0 !important;
190+
191+
li {
192+
margin: 0;
193+
padding: 0;
194+
display: block !important;
195+
}
196+
}
197+
}
198+
}
199+
200+
[dir=rtl] .dokuwiki form.search div.ajax_qsearch {
201+
left: auto;
202+
right: -13.5em;
203+
text-align: right;
204+
}

‎css/_tabs.css

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
bottom: 0;
1919
left: 0;
2020
border-bottom: 1px solid @ini_border;
21-
z-index: 1;
2221
}
2322

2423
.dokuwiki .tabs > ul li,

‎css/basic.less

+4
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,10 @@ small {
312312
font-size: .8em;
313313
}
314314

315+
wbr {
316+
display: inline-block; /* for IE 11 */
317+
}
318+
315319
/*____________ forms ____________*/
316320

317321
/* for all of the form styles, style.ini colours are not used on purpose (except for fieldset border) */

‎css/design.less

+10-84
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,16 @@
6666
********************************************************************/
6767

6868
/* highlight selected tool */
69-
.mode_admin a.action.admin,
70-
.mode_login a.action.login,
71-
.mode_register a.action.register,
72-
.mode_profile a.action.profile,
73-
.mode_recent a.action.recent,
74-
.mode_index a.action.index,
75-
.mode_media a.action.media,
76-
.mode_revisions a.action.revs,
77-
.mode_backlink a.action.backlink,
78-
.mode_subscribe a.action.subscribe {
69+
.mode_admin .action.admin a,
70+
.mode_login .action.login a,
71+
.mode_register .action.register a,
72+
.mode_profile .action.profile a,
73+
.mode_recent .action.recent a,
74+
.mode_index .action.index a,
75+
.mode_media .action.media a,
76+
.mode_revisions .action.revs a,
77+
.mode_backlink .action.backlink a,
78+
.mode_subscribe .action.subscribe a {
7979
font-weight: bold;
8080
}
8181

@@ -106,84 +106,10 @@
106106
margin-left: 0;
107107
}
108108

109-
#dokuwiki__usertools a.action,
110-
#dokuwiki__usertools a.iw_user {
111-
padding-left: 20px;
112-
background: transparent url(images/usertools.png) no-repeat 0 0;
113-
}
114-
115-
[dir=rtl] #dokuwiki__usertools a.action {
116-
padding-left: 0;
117-
padding-right: 20px;
118-
}
119-
120109
#dokuwiki__header .mobileTools {
121110
display: none; /* hide mobile tools dropdown to only show in mobile view */
122111
}
123112

124-
/*____________ user tools ____________*/
125-
126-
#dokuwiki__usertools {
127-
position: absolute;
128-
top: .5em;
129-
right: .5em;
130-
text-align: right;
131-
width: 100%;
132-
133-
ul {
134-
margin: 0 auto;
135-
padding: 0;
136-
max-width: @ini_site_width;
137-
}
138-
139-
a.action.admin {
140-
background-position: left 0;
141-
}
142-
143-
a.iw_user,
144-
a.action.profile {
145-
background-position: left -32px;
146-
}
147-
148-
a.action.register {
149-
background-position: left -64px;
150-
}
151-
152-
a.action.login {
153-
background-position: left -96px;
154-
}
155-
156-
a.action.logout {
157-
background-position: left -128px;
158-
}
159-
}
160-
161-
[dir=rtl] #dokuwiki__usertools {
162-
text-align: left;
163-
left: 40px;
164-
right: auto;
165-
166-
a.action.admin {
167-
background-position: right 0;
168-
}
169-
170-
a.action.profile {
171-
background-position: right -32px;
172-
}
173-
174-
a.action.register {
175-
background-position: right -64px;
176-
}
177-
178-
a.action.login {
179-
background-position: right -96px;
180-
}
181-
182-
a.action.logout {
183-
background-position: right -128px;
184-
}
185-
}
186-
187113
/*____________ site tools ____________*/
188114

189115
#dokuwiki__sitetools {

0 commit comments

Comments
 (0)