Skip to content

Commit

Permalink
Change line height of 24px to 1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
vidya-ram committed Nov 12, 2019
1 parent 5a4bda5 commit c1a989e
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 23 deletions.
20 changes: 13 additions & 7 deletions baseframe/static/css/mui.css
Original file line number Diff line number Diff line change
Expand Up @@ -3304,31 +3304,36 @@ h4, h5, h6 {
line-height: 1.2;
}

.mui--text-display1, h1, h1 {
.mui--text-display1, h1,
h1 {
font-weight: 400;
font-size: 32px;
line-height: 1.2;
}

.mui--text-headline, h2, .header__site-title, .header__site-title__item, h2 {
.mui--text-headline, h2, .header__site-title, .header__site-title__item,
h2 {
font-weight: 400;
font-size: 24px;
line-height: 1.2;
line-height: 1.4;
}

.mui--text-title, h3, .header__side-nav-list .header__side-nav-list__item__icon, .form-message, .modal .modal__header, h3 {
.mui--text-title, h3, .header__side-nav-list .header__side-nav-list__item__icon, .form-message, .modal .modal__header,
h3 {
font-weight: 400;
font-size: 18px;
line-height: 1.5;
}

.mui--text-subhead, h4, .alert .alert__text, h4 {
.mui--text-subhead, h4, .alert .alert__text,
h4 {
font-weight: 400;
font-size: 16px;
line-height: 1.5;
}

.mui--text-body2, h5, .header__dropdown-app-title, .header__side-nav-list .header__side-nav-list__item, .card .card__body, .modal .modal__body, h5 {
.mui--text-body2, h5, .header__dropdown-app-title, .header__side-nav-list .header__side-nav-list__item, .card .card__body, .modal .modal__body,
h5 {
font-weight: 400;
font-size: 14px;
line-height: 1.5;
Expand All @@ -3341,7 +3346,8 @@ h4, h5, h6 {
}

.mui--text-caption, .footer .footer__container, .mui-form .mui-form__sidetext,
.mui-form .mui-form__helptext, .mui-form .mui-form__error, h6 {
.mui-form .mui-form__helptext, .mui-form .mui-form__error,
h6 {
font-weight: 400;
font-size: 12px;
line-height: 1.5;
Expand Down
38 changes: 22 additions & 16 deletions baseframe/static/sass/baseframe-material/_helper.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// ============================================================================

.mui-list--aligned {
padding-left: $reflex-cell-spacing;
padding-left: $reflex-cell-spacing;
}

// ============================================================================
Expand Down Expand Up @@ -54,31 +54,36 @@
line-height: 1.2;
}

.mui--text-display1, h1 {
.mui--text-display1,
h1 {
font-weight: 400;
font-size: 32px;
line-height: 1.2;
}

.mui--text-headline, h2 {
.mui--text-headline,
h2 {
font-weight: 400;
font-size: 24px;
line-height: 1.2;
line-height: 1.4;
}

.mui--text-title, h3 {
.mui--text-title,
h3 {
font-weight: 400;
font-size: 18px;
line-height: 1.5;
}

.mui--text-subhead, h4 {
font-weight: 400;
font-size: 16px;
line-height: 1.5;
.mui--text-subhead,
h4 {
font-weight: 400;
font-size: 16px;
line-height: 1.5;
}

.mui--text-body2, h5 {
.mui--text-body2,
h5 {
font-weight: 400;
font-size: 14px;
line-height: 1.5;
Expand All @@ -90,7 +95,8 @@
line-height: 24px;
}

.mui--text-caption, h6 {
.mui--text-caption,
h6 {
font-weight: 400;
font-size: 12px;
line-height: 1.5;
Expand Down Expand Up @@ -128,9 +134,9 @@
// ============================================================================

.mui-btn--nostyle {
padding: 0;
border: 0;
margin: 0;
cursor: pointer;
background: none;
padding: 0;
border: 0;
margin: 0;
cursor: pointer;
background: none;
}

0 comments on commit c1a989e

Please sign in to comment.