Change some margins to use $ic-sp not $ic-line-height

fixes: CNVS-26786

Regression from our line-height commit where we needed to change any
margins or padding using $ic-line-height to use $ic-sp instead.

Test Plan:
- Go to an area in Canvas that uses tiny mce
- Create an h2 header - using inspector note the
margin using px sizing, not relative sizing. Output should be
margin-top: 6px; margin-bottom: 6px;
- Go to a Course > Settings > Apps and inspect the "External Apps" title.
The padding-bottom should be 6px

Change-Id: I6192deb6e214f7536e294362f1a1af51661ed4b8
Reviewed-on: https://gerrit.instructure.com/71545
Tested-by: Jenkins
Reviewed-by: Pam Hiett <phiett@instructure.com>
Product-Review: Pam Hiett <phiett@instructure.com>
QA-Review: Myller de Araujo <myller@instructure.com>
This commit is contained in:
Colleen Palmer 2016-02-04 16:13:26 -07:00
parent e3beb3bb6e
commit a1ddff2a74
1 changed files with 3 additions and 3 deletions

View File

@ -42,7 +42,7 @@ cite {
font-style: normal;
}
.lead {
margin-bottom: $ic-line-height;
margin-bottom: $ic-sp;
@include fontSize($ic-font-size);
font-weight: 200;
line-height: $ic-line-height * 1.5;
@ -68,7 +68,7 @@ a.text-success:hover { color: darken($ic-color-success, 10%); }
///////==============
h1, h2, h3, h4, h5, h6 {
margin: ($ic-line-height / 2) 0;
margin: $ic-sp/2 0;
font-family: $ic-font-family;
font-weight: $ic-font-weight;
line-height: $ic-line-height;
@ -112,7 +112,7 @@ h3, .h3 {
}
.page-header {
padding-bottom: ($ic-line-height / 2) - 1;
padding-bottom: ($ic-sp / 2);
margin: 20px 0 30px;
border-bottom: 1px solid $ic-border-color;
}