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

Icon postcard block completed with approval from John on the design #104

Merged
merged 11 commits into from
Apr 30, 2018
Merged

Icon postcard block completed with approval from John on the design #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ccfbeb6
Icon postcard block completed with approval from John on the design
Apr 23, 2018
d1b2afb
margin FIXUP and spacing cleanup
Apr 25, 2018
168cd3a
Merge master into icon-postcard-block (#110)
Apr 27, 2018
e1057df
updated src and alt attributes for this and the quote component to us…
Apr 27, 2018
346e988
FIXUP
Apr 27, 2018
9ab54d1
Merge branch 'master' into icon-postcard-block
Apr 27, 2018
467b8d2
updated variable names from camelCase and made headshot image a png
Apr 27, 2018
a5989a3
#104: Updated normalize for compile.
sherakama Apr 30, 2018
8150b43
quote template FIXUP
Apr 30, 2018
3cce9b6
normalize FIXUP
Apr 30, 2018
5c153bf
Jane not John
Apr 30, 2018
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
19 changes: 19 additions & 0 deletions css/decanter.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 img/headshot.jpg → img/headshot.png
View file
Open in desktop
File renamed without changes
8 changes: 4 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions scss/components/molecules/_icon-block.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@charset "UTF-8";

//
// Icon Block
//
// A postcard block with an icon (or images) and text.
//
// Markup: ../templates/components/molecules/icon-block/icon-block.html.twig
//
// Style guide: Molecules.IconBlock
//
.decanter-icon-block {
@include icon-block;
}
1 change: 1 addition & 0 deletions scss/components/molecules/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

@import
'alerts',
'icon-block',
'icon-grid',
'navigation',
'main-menu',
Expand Down
38 changes: 38 additions & 0 deletions scss/utilities/mixins/icon-block/_icon-block.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
@charset "UTF-8";

//
// @icon-block
//
// A postcard block with an icon (or images) and text.
//
// Style guide: Mixins.IconBlock.icon-block
//
@mixin icon-block {
@include padding(1em);
@include overflow;

display: block;

.decanter-icon-block__img {
@include media-block-img;

margin-right: modular-scale(2);
}

.decanter-icon-block__body {
.decanter-icon-block__heading {
font-size: 1.25em;
font-weight: 600;

@include margin(0);
}

.decanter-icon-block__detail {
@include margin(0.3em null);
}

.decanter-icon-block__link {
@include margin(0.25em null);
}
}
}
12 changes: 12 additions & 0 deletions scss/utilities/mixins/icon-block/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
@charset "UTF-8";

//
// Icon Grid
//
// Mixins for Icon Block
//
// Style guide: Mixins.IconBlock
//

@import
'icon-block';
1 change: 1 addition & 0 deletions scss/utilities/mixins/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
'buttons/index',
'display/index',
'grid/index',
'icon-block/index',
'icon-grid/index',
'links/index',
'lists/index',
Expand Down
8 changes: 4 additions & 4 deletions styleguide/item-elements-quote.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ <h2 class="kss-title kss-title--level-2">

<div class="kss-modifier__example">
<div class="decanter-quote">
<img class="decanter-quote__img " src="../../../img/headshot.jpg" alt="Jane Doe">
<div class="decanter-quote__body ">
<img class="decanter-quote__img" src="../../../img/headshot.png" alt="Jane Doe">
<div class="decanter-quote__body">
<p class="decanter-quote__heading">Jane Doe</p>
<p class="decanter-quote__bio">Jane Doe's title<br/>Jane Doe's company</p>
<p class="decanter-quote__quote">"This is the actual quote. Lorem ipsur adipisicing elit, sed do eiusmod tempor incididunt ut labore et..."</p>
Expand All @@ -153,8 +153,8 @@ <h2 class="kss-title kss-title--level-2">
Markup: <code>../templates/elements/quote/quote.html.twig</code>
</summary>
<pre class="prettyprint linenums lang-html"><code data-language="html">&lt;div class=&quot;decanter-quote&quot;&gt;
&lt;img class=&quot;decanter-quote__img &quot; src=&quot;../../../img/headshot.jpg&quot; alt=&quot;Jane Doe&quot;&gt;
&lt;div class=&quot;decanter-quote__body &quot;&gt;
&lt;img class=&quot;decanter-quote__img&quot; src=&quot;../../../img/headshot.png&quot; alt=&quot;Jane Doe&quot;&gt;
&lt;div class=&quot;decanter-quote__body&quot;&gt;
&lt;p class=&quot;decanter-quote__heading&quot;&gt;Jane Doe&lt;/p&gt;
&lt;p class=&quot;decanter-quote__bio&quot;&gt;Jane Doe&#039;s title&lt;br/&gt;Jane Doe&#039;s company&lt;/p&gt;
&lt;p class=&quot;decanter-quote__quote&quot;&gt;&quot;This is the actual quote. Lorem ipsur adipisicing elit, sed do eiusmod tempor incididunt ut labore et...&quot;&lt;/p&gt;
Expand Down
142 changes: 142 additions & 0 deletions styleguide/item-mixins-iconblock-icon-block.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
<!DOCTYPE html>
<html class="no-js" lang="en">
<head>
<meta charset="utf-8">
<title>Decanter Style Guide and Pattern Library</title>

<meta name="description" content="">
<meta name="generator" content="kss-node">
<meta name="viewport" content="width=device-width">

<link rel="stylesheet" href="kss-assets/kss.css">
<link rel="stylesheet" href="css/decanter.css">

</head>
<body id="kss-node" class="kss-fullscreen-mode">

<div class="kss-sidebar kss-style">
<header class="kss-header">
<h1 class="kss-doc-title">Decanter Style Guide and Pattern Library</h1>
</header>
<nav class="kss-nav">
<ul class="kss-nav__menu">
<li class="kss-nav__menu-item">
<a class="kss-nav__menu-link" href="./">
<span class="kss-nav__ref">0</span
><span class="kss-nav__name">Overview</span>
</a>
</li>
<li class="kss-nav__menu-item">
<a class="kss-nav__menu-link" href="section-atoms.html">
<span class="kss-nav__ref">1</span><span class="kss-nav__name">Atoms</span>
</a>
</li>
<li class="kss-nav__menu-item">
<a class="kss-nav__menu-link" href="section-molecules.html">
<span class="kss-nav__ref">2</span><span class="kss-nav__name">Molecules</span>
</a>
</li>
<li class="kss-nav__menu-item">
<a class="kss-nav__menu-link" href="section-organisims.html">
<span class="kss-nav__ref">3</span><span class="kss-nav__name">Organisims</span>
</a>
</li>
<li class="kss-nav__menu-item">
<a class="kss-nav__menu-link" href="section-templates.html">
<span class="kss-nav__ref">4</span><span class="kss-nav__name">Templates</span>
</a>
</li>
<li class="kss-nav__menu-item">
<a class="kss-nav__menu-link" href="section-core.html">
<span class="kss-nav__ref">5</span><span class="kss-nav__name">Core</span>
</a>
</li>
<li class="kss-nav__menu-item">
<a class="kss-nav__menu-link" href="section-elements.html">
<span class="kss-nav__ref">6</span><span class="kss-nav__name">Elements</span>
</a>
</li>
<li class="kss-nav__menu-item">
<a class="kss-nav__menu-link" href="section-functions.html">
<span class="kss-nav__ref">7</span><span class="kss-nav__name">Functions</span>
</a>
</li>
<li class="kss-nav__menu-item">
<a class="kss-nav__menu-link" href="section-mixins.html">
<span class="kss-nav__ref">8</span><span class="kss-nav__name">Mixins</span>
</a>
</li>
<li class="kss-nav__menu-item">
<a class="kss-nav__menu-link" href="section-variables.html">
<span class="kss-nav__ref">9</span><span class="kss-nav__name">Variables</span>
</a>
</li>
</ul>
</nav>
</div>
<article role="main" class="kss-main">


<div id="kssref-mixins-iconblock-icon-block" class="kss-section kss-section--depth-3 is-fullscreen">
<div class="kss-style">
<h3 class="kss-title kss-title--level-3">
<a class="kss-title__permalink" href="#kssref-mixins-iconblock-icon-block">
<span class="kss-title__ref">
8.7.1
<span class="kss-title__permalink-hash">
Mixins.IconBlock.icon-block
</span>
</span>
@icon-block
</a>
</h3>


<div class="kss-description">
<p>A postcard block with an icon (or images) and text.</p>

</div>

</div>


<div class="kss-source kss-style">
Source: <code>utilities/mixins/icon-block/_icon-block.scss</code>, line 3
</div>
</div>
</article>

<!-- SCRIPTS -->
<script src="kss-assets/kss.js"></script>
<script src="kss-assets/scrollspy.js"></script>
<script src="kss-assets/prettify.js"></script>
<script src="kss-assets/kss-fullscreen.js"></script>
<script src="kss-assets/kss-guides.js"></script>
<script src="kss-assets/kss-markup.js"></script>
<script>
prettyPrint();
var spy = new ScrollSpy('#kss-node', {
nav: '.kss-nav__menu-child > li > a',
className: 'is-in-viewport'
});
var kssFullScreen = new KssFullScreen({
idPrefix: 'kss-fullscreen-',
bodyClass: 'kss-fullscreen-mode',
elementClass: 'is-fullscreen'
});
var kssGuides = new KssGuides({
bodyClass: 'kss-guides-mode'
});
var kssMarkup = new KssMarkup({
bodyClass: 'kss-markup-mode',
detailsClass: 'kss-markup'
});
</script>
<script src="js/decanter.min.js"></script>




<!-- Automatically built using <a href="https://github.com/kss-node/kss-node">kss-node</a>. -->
</body>
</html>
Loading