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 7 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
169 changes: 130 additions & 39 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
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
Loading