Skip to content

Commit

Permalink
Merge pull request rails#38797 from JuanitoFatas/doc/line-height
Browse files Browse the repository at this point in the history
[Guides] line-height should be unitless
  • Loading branch information
kamipo authored Mar 23, 2020
2 parents ab8803d + f9dd0ca commit 6a41940
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
18 changes: 9 additions & 9 deletions guides/assets/stylesheets/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ body {
text-align: center;
font-family: Helvetica, Arial, sans-serif;
font-size: 87.5%;
line-height: 1.5em;
line-height: 1.5;
background: #fff;
color: #999;
}
Expand Down Expand Up @@ -256,7 +256,7 @@ body {
padding: 1em 1.5em 1em 1.25em;
width: 20em;
font-size: 0.9285em;
line-height: 1.3846em;
line-height: 1.3846;
margin-right: 1em;
}

Expand Down Expand Up @@ -469,14 +469,14 @@ a, a:link, a:visited {

h1 {
font-size: 2.5em;
line-height: 1em;
line-height: 1;
margin: 0.6em 0 .2em;
font-weight: bold;
}

h2 {
font-size: 2.1428em;
line-height: 1em;
line-height: 1;
margin: 0.7em 0 .2333em;
font-weight: bold;
}
Expand All @@ -489,7 +489,7 @@ h2 {

h3 {
font-size: 1.7142em;
line-height: 1.286em;
line-height: 1.286;
margin: 0.875em 0 0.2916em;
font-weight: bold;
}
Expand All @@ -502,21 +502,21 @@ h3 {

h4 {
font-size: 1.2857em;
line-height: 1.2em;
line-height: 1.2;
margin: 1.6667em 0 .3887em;
font-weight: bold;
}

h5 {
font-size: 1em;
line-height: 1.5em;
line-height: 1.5;
margin: 1em 0 .5em;
font-weight: bold;
}

h6 {
font-size: 1em;
line-height: 1.5em;
line-height: 1.5;
margin: 1em 0 .5em;
font-weight: normal;
}
Expand Down Expand Up @@ -692,7 +692,7 @@ div.code_container {

#subCol .content {
font-size: 0.7857em;
line-height: 1.5em;
line-height: 1.5;
}

#subCol .content li {
Expand Down
18 changes: 9 additions & 9 deletions guides/assets/stylesheets/main.rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ body {
text-align: center;
font-family: Helvetica, Arial, sans-serif;
font-size: 87.5%;
line-height: 1.5em;
line-height: 1.5;
background: #fff;
color: #999;
direction: rtl;
Expand Down Expand Up @@ -257,7 +257,7 @@ body {
padding: 1em 1.5em 1em 1.25em;
width: 20em;
font-size: 0.9285em;
line-height: 1.3846em;
line-height: 1.3846;
margin-left: 1em;
}

Expand Down Expand Up @@ -470,14 +470,14 @@ a, a:link, a:visited {

h1 {
font-size: 2.5em;
line-height: 1em;
line-height: 1;
margin: 0.6em 0 .2em;
font-weight: bold;
}

h2 {
font-size: 2.1428em;
line-height: 1em;
line-height: 1;
margin: 0.7em 0 .2333em;
font-weight: bold;
}
Expand All @@ -490,7 +490,7 @@ h2 {

h3 {
font-size: 1.7142em;
line-height: 1.286em;
line-height: 1.286;
margin: 0.875em 0 0.2916em;
font-weight: bold;
}
Expand All @@ -503,21 +503,21 @@ h3 {

h4 {
font-size: 1.2857em;
line-height: 1.2em;
line-height: 1.2;
margin: 1.6667em 0 .3887em;
font-weight: bold;
}

h5 {
font-size: 1em;
line-height: 1.5em;
line-height: 1.5;
margin: 1em 0 .5em;
font-weight: bold;
}

h6 {
font-size: 1em;
line-height: 1.5em;
line-height: 1.5;
margin: 1em 0 .5em;
font-weight: normal;
}
Expand Down Expand Up @@ -693,7 +693,7 @@ div.code_container {

#subCol .content {
font-size: 0.7857em;
line-height: 1.5em;
line-height: 1.5;
}

#subCol .content li {
Expand Down

0 comments on commit 6a41940

Please sign in to comment.