Skip to content

Small fixes #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
selfthinker merged 3 commits into from
Apr 8, 2018
Merged

Small fixes #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6610e1
Change style.ini placeholders to LESS syntax
selfthinker Apr 3, 2018
b749717
Make '.dokuwiki' scope more consistent in shared print and pdf styles
selfthinker Apr 3, 2018
8cb0507
Change code in boxes and notes to normal text
selfthinker Apr 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions all.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Screen and Print Styles for the Wrap Plugin
/* emulate a bigger headline with a bottom border */
.plugin_wrap.wrap__emuhead em strong em.u {
font-size: 115%;
border-bottom: 1px solid __border__;
border-bottom: 1px solid @ini_border;
font-style: normal;
text-decoration: none;
display: block;
Expand Down Expand Up @@ -261,7 +261,7 @@ span.wrap_round {
********************************************************************/

.wrap_lo {
color: __text_neu__;
color: @ini_text_neu;
font-size: 85%;
}
.wrap_em {
Expand Down Expand Up @@ -342,7 +342,7 @@ div.wrap_spoiler {
.wrap_button a:link,
.wrap_button a:visited {
background-image: none;
border: 1px solid __border__;
border: 1px solid @ini_border;
border-radius: .3em;
padding: .5em .7em;
text-decoration: none;
Expand Down
26 changes: 14 additions & 12 deletions example.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,43 +191,43 @@ Center aligned text ...

<WRAP info 300px left>
=== Info ===
<WRAP info></WRAP>
%%<WRAP info></WRAP>%%
</WRAP>


<WRAP tip 300px left>
=== Tip ===
<WRAP tip></WRAP>
%%<WRAP tip></WRAP>%%
</WRAP>


<WRAP important 300px left>
=== Important ===
<WRAP important></WRAP>
%%<WRAP important></WRAP>%%
</WRAP>


<WRAP alert 300px left>
=== Alert ===
<WRAP alert></WRAP>
%%<WRAP alert></WRAP>%%
</WRAP>


<WRAP round help 300px left>
=== Help ===
<WRAP round help></WRAP>
%%<WRAP round help></WRAP>%%
</WRAP>


<WRAP download 300px left>
=== Download ===
<WRAP download></WRAP>
%%<WRAP download></WRAP>%%
</WRAP>


<WRAP todo 300px left>
=== Todo ===
<WRAP todo></WRAP>
%%<WRAP todo></WRAP>%%
</WRAP>


Expand All @@ -236,29 +236,31 @@ Center aligned text ...

**Safety Notes:**

Best only use simple markup in safety notes.

<WRAP danger 30% left>
=== Danger ===
<WRAP danger></WRAP>
%%<WRAP danger></WRAP>%%
</WRAP>

<WRAP warning 30% left>
=== Warning ===
<WRAP warning></WRAP>
%%<WRAP warning></WRAP>%%
</WRAP>

<WRAP caution 30% left>
=== Caution ===
<WRAP caution></WRAP>
%%<WRAP caution></WRAP>%%
</WRAP>

<WRAP round notice 30% left>
=== Notice ===
<WRAP round notice></WRAP>
%%<WRAP round notice></WRAP>%%
</WRAP>

<WRAP round safety 30% left>
=== Safety ===
<WRAP round safety></WRAP>
%%<WRAP round safety></WRAP>%%
</WRAP>

<WRAP clear />
Expand Down
4 changes: 2 additions & 2 deletions pdf.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ Styles used in PDFs by the DW2PDF plugin (in addition to all.css, and
the DW2PDF plugin also includes style.css via the 'usestyles' option)
********************************************************************/

.dokuwiki {

@import 'print_or_pdf.less';

.dokuwiki {

/*____________ only print ____________*/
/* due to including style.css, these need to be overwritten again */

Expand Down
4 changes: 2 additions & 2 deletions print.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
Print Styles for the Wrap Plugin (additional to all.css)
********************************************************************/

.dokuwiki {

@import 'print_or_pdf.less';

.dokuwiki {

/* boxes and notes with icons
********************************************************************/

Expand Down
4 changes: 4 additions & 0 deletions print_or_pdf.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
Styles shared between print.css and pdf.css
********************************************************************/

.dokuwiki {

/* miscellaneous
********************************************************************/

Expand All @@ -23,3 +25,5 @@ Styles shared between print.css and pdf.css
.wrap_noprint {
display: none;
}

} /* /.dokuwiki */
12 changes: 6 additions & 6 deletions style.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Screen Styles for the Wrap Plugin (additional to all.css)
********************************************************************/

.wrap_box {
background: __background_alt__;
color: __text__;
background: @ini_background_alt;
color: @ini_text;
}
div.wrap_box,
div.wrap_danger,
Expand Down Expand Up @@ -179,8 +179,8 @@ span.wrap_download { background-image: url(images/note/16/download.png); }
/*____________ spoiler ____________*/

.wrap_spoiler {
background-color: __background__ !important;
color: __background__ !important;
background-color: @ini_background !important;
color: @ini_background !important;
border: 1px dotted red;
}

Expand All @@ -201,15 +201,15 @@ span.wrap_download { background-image: url(images/note/16/download.png); }

.wrap_button a:link,
.wrap_button a:visited {
background-color: __background_alt__;
background-color: @ini_background_alt;
}
.wrap_button a:link:hover,
.wrap_button a:visited:hover,
.wrap_button a:link:focus,
.wrap_button a:visited:focus,
.wrap_button a:link:active,
.wrap_button a:visited:active {
background-color: __background_neu__;
background-color: @ini_background_neu;
}

} /* /.dokuwiki */