cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/2469'

Browse source
This commit is contained in:
Tom Hughes 2019-12-30 21:29:00 +00:00
commit 5ff4e4e331
1 changed files with 3 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/assets/stylesheets/common.scss
View file

@ -5,11 +5,10 @@
/* Minimal CSS reset */
html, body, ul, ol, li, form, fieldset, legend, h1, h2, h3, h4, h5, h6, p, input {
html, body, ul, ol, li, form, fieldset, legend, input {
margin: 0;
padding: 0;
border: 0;
font-size:100%;
}
fieldset,img { border: 0; }
@ -542,8 +541,6 @@ body.compact {
#sidebar {
float: left;
width: $sidebarWidth;
background: #fff;
font-size: 12px;
#sidebar_loader {
display: none;
@ -558,12 +555,13 @@ body.compact {
h2 {
padding: $lineheight $lineheight $lineheight/2;
font-size: 1.5rem;
}
h3, h4 {
margin-top: $lineheight;
margin-bottom: $lineheight/2;
font-size: 13px;
font-size: 1.25rem;
}
.close-wrap {
@ -1384,8 +1382,6 @@ tr.turn:hover {
.content-heading {
background: $lightgrey;
h1 { font-size: 22px; }
}
.content-body {
@ -1682,7 +1678,6 @@ tr.turn:hover {
h2 {
margin-top: 0;
margin-bottom: $lineheight/2;
font-size: 24px;
}
}
@ -2314,18 +2309,6 @@ a.button {
margin-bottom: $lineheight/2;
}
h1 {
font-size: 24px;
}
h2 {
font-size: 18px;
}
h3 {
font-size: $typeheight;
}
code {
font-size: 13px;
background: $lightgrey;