css moved from main-content to base-design

This commit is contained in:
Silke Pisulla 2017-01-05 14:01:12 +01:00
commit 1d7ed72f93
2 changed files with 39 additions and 51 deletions

View file

@ -6,14 +6,6 @@
#dokuwiki__content.main-content { #dokuwiki__content.main-content {
img {
display: inline-block;
}
/* + + + source block + + + */
.code {
margin-top: @grid;
}
} }
@ -21,26 +13,6 @@
/* min-width: 1440px */ /* min-width: 1440px */
@media @screen_min-xlg { @media @screen_min-xlg {
#dokuwiki__content.main-content {
p, a,
li, dl,
td, th,
label,
button {
font-size: .88rem;
line-height: 140%;
* {
font-size: inherit;
line-height: inherit;
}
}
small,
.code {
font-size: .75rem;
}
}
} }
@ -48,23 +20,4 @@
/* max-width: 1199px */ /* max-width: 1199px */
@media @screen_max-xlg { @media @screen_max-xlg {
#dokuwiki__content.main-content {
p, a,
li, dl,
td, th,
label,
button {
font-size: 1rem;
line-height: 140%;
* {
font-size: inherit;
line-height: inherit;
}
}
.code {
font-size: .94rem;
}
}
} }

View file

@ -147,6 +147,8 @@ figure,
details, details,
fieldset, fieldset,
address { address {
font-size: .88rem;
line-height: 140%;
margin: 0 0 1.4em 0; /* bottom margin = line-height */ margin: 0 0 1.4em 0; /* bottom margin = line-height */
padding: 0; padding: 0;
} }
@ -158,6 +160,15 @@ audio {
padding: 0; padding: 0;
} }
small,
.code {
font-size: .75rem;
}
.code {
margin-top: @grid;
}
/*____________ lists ____________*/ /*____________ lists ____________*/
@ -165,6 +176,7 @@ ul,
ol { ol {
padding: 0 0 0 1.5em; padding: 0 0 0 1.5em;
} }
[dir=rtl] ul, [dir=rtl] ul,
[dir=rtl] ol { [dir=rtl] ol {
padding: 0 1.5em 0 0; padding: 0 1.5em 0 0;
@ -175,10 +187,12 @@ dd {
padding: 0; padding: 0;
margin: 0 0 0 1.5em; margin: 0 0 0 1.5em;
} }
[dir=rtl] li, [dir=rtl] li,
[dir=rtl] dd { [dir=rtl] dd {
margin: 0 1.5em 0 0; margin: 0 1.5em 0 0;
} }
dt { dt {
font-weight: bold; font-weight: bold;
margin: 0; margin: 0;
@ -194,6 +208,7 @@ dl dl {
margin-bottom: 0; margin-bottom: 0;
padding: 0; padding: 0;
} }
li li { li li {
font-size: 100%; font-size: 100%;
} }
@ -217,6 +232,7 @@ caption {
caption-side: top; caption-side: top;
text-align: left; text-align: left;
} }
[dir=rtl] caption { [dir=rtl] caption {
text-align: right; text-align: right;
} }
@ -228,11 +244,13 @@ td {
vertical-align: top; vertical-align: top;
border: 1px solid @ini_border; border: 1px solid @ini_border;
} }
th { th {
font-weight: bold; font-weight: bold;
background-color: @ini_background_alt; background-color: @ini_background_alt;
text-align: left; text-align: left;
} }
[dir=rtl] th { [dir=rtl] th {
text-align: right; text-align: right;
} }
@ -240,11 +258,13 @@ th {
a { a {
outline: none; outline: none;
} }
a:link, a:link,
a:visited { a:visited {
text-decoration: none; text-decoration: none;
color: @ini_link; color: @ini_link;
} }
a:hover, a:hover,
a:focus, a:focus,
a:active { a:active {
@ -252,6 +272,7 @@ a:active {
} }
img { img {
display: inline-block;
border-width: 0; border-width: 0;
vertical-align: middle; vertical-align: middle;
color: #666; color: #666;
@ -259,6 +280,7 @@ img {
font-style: italic; font-style: italic;
height: auto; height: auto;
} }
img, img,
object, object,
embed, embed,
@ -267,6 +289,7 @@ video,
audio { audio {
max-width: 100%; max-width: 100%;
} }
button img { button img {
max-width: none; max-width: none;
} }
@ -286,6 +309,7 @@ abbr {
border-bottom: 1px dotted; border-bottom: 1px dotted;
font-style: normal; font-style: normal;
} }
em acronym, em acronym,
em abbr { em abbr {
font-style: italic; font-style: italic;
@ -310,6 +334,7 @@ kbd {
box-shadow: inset 0 0 .3em @ini_border; box-shadow: inset 0 0 .3em @ini_border;
border-radius: 2px; border-radius: 2px;
} }
pre { pre {
overflow: auto; overflow: auto;
word-wrap: normal; word-wrap: normal;
@ -324,9 +349,11 @@ blockquote {
border: solid @ini_border; border: solid @ini_border;
border-width: 0 0 0 .25em; border-width: 0 0 0 .25em;
} }
[dir=rtl] blockquote { [dir=rtl] blockquote {
border-width: 0 .25em 0 0; border-width: 0 .25em 0 0;
} }
q:before, q:before,
q:after { q:after {
content: ''; content: '';
@ -337,9 +364,11 @@ sup {
font-size: .8em; font-size: .8em;
line-height: 1; line-height: 1;
} }
sub { sub {
vertical-align: sub; vertical-align: sub;
} }
sup { sup {
vertical-align: super; vertical-align: super;
} }
@ -348,6 +377,7 @@ small {
font-size: .8em; font-size: .8em;
} }
/*____________ forms ____________*/ /*____________ forms ____________*/
/* for all of the form styles, style.ini colours are not used on purpose (except for fieldset border) */ /* for all of the form styles, style.ini colours are not used on purpose (except for fieldset border) */
@ -357,18 +387,21 @@ form {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
fieldset { fieldset {
padding: .7em 1em 0; padding: .7rem 1rem;
padding: .7rem 1rem; /* for those browsers understanding :last-child */
border: 1px solid @ini_text_alt; border: 1px solid @ini_text_alt;
} }
fieldset > :last-child { fieldset > :last-child {
margin-bottom: 0; margin-bottom: 0;
} }
legend { legend {
margin: 0; margin: 0;
padding: 0 .1em; padding: 0 .1em;
} }
label { label {
vertical-align: middle; vertical-align: middle;
cursor: pointer; cursor: pointer;
@ -397,10 +430,12 @@ progress {
select { select {
max-width: 100%; max-width: 100%;
} }
optgroup { optgroup {
font-style: italic; font-style: italic;
font-weight: bold; font-weight: bold;
} }
option { option {
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
@ -414,6 +449,7 @@ keygen {
box-shadow: inset 0 0 1px #eee; box-shadow: inset 0 0 1px #eee;
border-radius: 2px; border-radius: 2px;
} }
input:active, input:active,
input:focus, input:focus,
textarea:active, textarea:active,
@ -424,6 +460,7 @@ keygen:active,
keygen:focus { keygen:focus {
border-color: #999; border-color: #999;
} }
input[type=radio], input[type=radio],
input[type=checkbox], input[type=checkbox],
input[type=image] { input[type=image] {
@ -494,5 +531,3 @@ textarea[readonly] {
opacity: .5; opacity: .5;
background-color: #eee; background-color: #eee;
} }