Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LHC-397 #79

Merged
merged 2 commits into from
Apr 18, 2019
Merged

LHC-397 #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45e7988
LHC-397 typography tweaks
rdai10 Apr 18, 2019
9380402
LHC-397 mobile screen sizes
rdai10 Apr 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions theme/src/css/_zendesk-article.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
.avatar {
margin-right: $avatar-spacer-right;
}

.author-name {
margin: 0;
}
}

.article-body {
Expand Down Expand Up @@ -114,6 +110,17 @@
}
}

.article-info {
h1,
h2,
h3,
h4,
h5,
h6 {
margin-bottom: $margin-default;
}
}

.article-relatives {
@include media-breakpoint-down(sm) {
display: flex;
Expand Down
27 changes: 26 additions & 1 deletion theme/src/css/_zendesk-elements.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,25 @@ h1 {
font-size: $h1-display-font-size;
line-height: 1.17;
}

&.title {
margin-bottom: 0.5rem;
}

@include media-breakpoint-down(sm) {
font-size: $mobile-font-size;
margin-bottom: $margin-default;

&.display,
&.title {
margin-bottom: 0;
}

&.display {
font-size: $h1-font-size;
line-height: 1.5;
}
}
}

h1,
Expand All @@ -19,7 +38,13 @@ h4,
h5,
h6 {
font-weight: $font-weight-semi-bold;
margin-bottom: $margin-default;
margin: 0;
}

h2 {
&.display {
margin-bottom: $margin-md;
}
}

h3,
Expand Down
4 changes: 0 additions & 4 deletions theme/src/css/_zendesk-requests.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,6 @@
padding: $padding-default;
}
}

.request-subject {
margin-bottom: $margin-default;
}
}

.meta-data {
Expand Down
5 changes: 0 additions & 5 deletions theme/src/css/_zendesk-search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@
}
}

.page-header-description {
margin-bottom: $margin-md;
}

.search-filter {
align-items: baseline;
display: flex;
Expand All @@ -45,7 +41,6 @@

.search-result-description {
font-weight: $font-weight-normal;
margin-bottom: 0;

em {
font-style: initial;
Expand Down
1 change: 1 addition & 0 deletions theme/src/css/_zendesk-variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ $h3-font-size: 1rem !default; // 16px
$h4-font-size: 1rem !default; // 16px
$h5-font-size: 0.875rem !default; // 14px
$h6-font-size: $small-font-size !default; // 12px
$mobile-font-size: 1.75rem !default; // 28px

$code-font-size: 14px !default; // set pixel value to prevent nested <pre> and <code> from scaling down font size

Expand Down
2 changes: 1 addition & 1 deletion theme/src/resources/templates/category_page.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<div class="categories-main row">
<div class="category-heading col-12">
<h1>
<h1 class="title">
{{category.name}}
</h1>

Expand Down
2 changes: 1 addition & 1 deletion theme/src/resources/templates/search_results.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<div class="col-md-8 offset-md-2 search">
<header>
<h2 class="page-header-description">
<h2 class="display">
<span id="searchResultsCount"></span> {{t 'results' query=query}}
</h2>

Expand Down
2 changes: 1 addition & 1 deletion theme/src/resources/templates/section_page.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div class="col-md-6">
{{#with section}}
<header class="section-heading">
<h1>
<h1 class="title">
{{name}}

{{#if internal}}
Expand Down