Skip to content

Commit

Permalink
Squashed merge of site/frontera/main at commit 2f8911e
Browse files Browse the repository at this point in the history
  • Loading branch information
wesleyboar committed Aug 23, 2021
1 parent 94110b6 commit 6adfecb
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ A style guide. This is intended for:
Styleguide Trumps.Scopes.StyleGuide
*/

.s-style-guide {
margin-top: var(--global-space--large);
margin-bottom: var(--global-space--x-large);
}




Expand All @@ -24,16 +19,34 @@ Styleguide Trumps.Scopes.StyleGuide

/* ELEMENTS: Content Sectioning */

.s-style-guide section {
clear: both;
}
.s-style-guide section:not(section section) {
border-top: var(--global-border--x-thick);
padding-top: var(--global-space--x-large);
/* NOTE: Similar to `s-document` "ELEMENTS: Content Sectioning" */

/* To give little margin above isolated headings for sections */
/* FAQ: Headings with no prior sibling need spacing before the heading */
/* FAQ: Headings that begin `o-section` already have spacing from `o-section` */
.s-style-guide section:not(.o-section) > h1:first-child,
.s-style-guide section:not(.o-section) > h2:first-child,
.s-style-guide section:not(.o-section) > h3:first-child,
.s-style-guide section:not(.o-section) > h4:first-child,
.s-style-guide section:not(.o-section) > h5:first-child,
.s-style-guide section:not(.o-section) > h6:first-child,
/* FAQ: Headings after non-headings need spacing before the heading */
/* FAQ: Headings after headings already have spacing from prior heading */
.s-style-guide section > :not(h1, h2, h3, h4, h5, h6) + h1,
.s-style-guide section > :not(h1, h2, h3, h4, h5, h6) + h2,
.s-style-guide section > :not(h1, h2, h3, h4, h5, h6) + h3,
.s-style-guide section > :not(h1, h2, h3, h4, h5, h6) + h4,
.s-style-guide section > :not(h1, h2, h3, h4, h5, h6) + h5,
.s-style-guide section > :not(h1, h2, h3, h4, h5, h6) + h6 {
margin-top: var(--global-space--x-large);
}
.s-style-guide section section {
border-top: var(--global-border--normal);
padding-top: var(--global-space--normal);
margin-top: var(--global-space--normal);

/* To give much margin below all headings for sections */
.s-style-guide section > h1,
.s-style-guide section > h2,
.s-style-guide section > h3,
.s-style-guide section > h4,
.s-style-guide section > h5,
.s-style-guide section > h6 {
margin-bottom: var(--global-space--normal);
}
3 changes: 2 additions & 1 deletion taccsite_cms/templates/style_guide.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends "fullwidth.html" %}
{% extends "standard.html" %}
{% load cms_tags staticfiles %}

{% block assets_custom %}
Expand All @@ -13,6 +13,7 @@
{% block content %}
<div class="container s-document s-style-guide">
{% block guide %}
{% include "nav_cms_breadcrumbs.html" %}
{% placeholder "content" %}
{% endblock guide %}
</div>
Expand Down

0 comments on commit 6adfecb

Please sign in to comment.