Skip to content

Commit

Permalink
Merge pull request #34 from bixgomez/18-19-20-footer-01
Browse files Browse the repository at this point in the history 
18 19 20 footer 01
  • Loading branch information
@nerdstein
nerdstein authored Nov 6, 2017
2 parents 010e7bd + 5b100dd commit f0c48d4
Show file tree
Hide file tree
Showing 34 changed files with 146 additions and 42 deletions.
2 changes: 2 additions & 0 deletions design-library/config/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ plugins:
- source/_patterns/01-atoms/07-section-content
- source/_patterns/01-atoms/08-logo
- source/_patterns/01-atoms/09-social-icon
- source/_patterns/01-atoms/10-footer-text
molecules:
paths:
- source/_patterns/02-molecules/01-blog-tags
Expand All @@ -68,6 +69,7 @@ plugins:
paths:
- source/_patterns/03-organisms/01-blog-list
- source/_patterns/03-organisms/02-header
- source/_patterns/03-organisms/03-footer
#pages:
#paths:
#- source/_patterns/04-pages
5 changes: 5 additions & 0 deletions design-library/source/_patterns/01-atoms/10-footer-text/_footer-text.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.footer-text {
p {

}
}
3 changes: 3 additions & 0 deletions design-library/source/_patterns/01-atoms/10-footer-text/footer-text.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"content": "<p>Donec sed odio dui. Nulla vitae elit libero, a pharetra augue. Nullam id dolor id nibh ultricies vehicula ut id elit. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>"
}
5 changes: 5 additions & 0 deletions design-library/source/_patterns/01-atoms/10-footer-text/footer-text.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Atom: Footer Text

*Belongs to*

* Organism: Footer
3 changes: 3 additions & 0 deletions design-library/source/_patterns/01-atoms/10-footer-text/footer-text.twig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<div class="footer-text">
{{ content }}
</div>
8 changes: 8 additions & 0 deletions design-library/source/_patterns/03-organisms/03-footer/_footer.scss
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#site-footer {
background-color: $dark-gray;
border-top: 2px solid $key-color-1--base;
padding: 1.5vw;
color: $light-gray;
padding: 2em 3em;
font-size: 1.25em;
}
3 changes: 3 additions & 0 deletions design-library/source/_patterns/03-organisms/03-footer/footer.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"content":"Maecenas faucibus mollis interdum. Etiam porta sem malesuada magna mollis euismod. Vestibulum id ligula porta felis euismod semper. Donec ullamcorper nulla non metus auctor fringilla. Morbi leo risus, porta ac consectetur ac, vestibulum at eros."
}
5 changes: 5 additions & 0 deletions design-library/source/_patterns/03-organisms/03-footer/footer.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Organism: Site Footer

*Depends on*

* Atom: Footer Text
5 changes: 5 additions & 0 deletions design-library/source/_patterns/03-organisms/03-footer/footer.twig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<header id="site-footer">
{% include "@atoms/footer-text.twig" with {
"content":content
} %}
</header>
1 change: 1 addition & 0 deletions design-library/source/_patterns/04-pages/01-one-sidebar/one-sidebar.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{

"footer_text": "Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec id elit non mi porta gravida at eget metus. Donec id elit non mi porta gravida at eget metus. Aenean lacinia bibendum nulla sed consectetur.",
"image_url": "/images/nerdstein_11.png",
"image_alt": "Nerdstein Logo",
"image_link": "#",
Expand Down
6 changes: 6 additions & 0 deletions design-library/source/_patterns/04-pages/01-one-sidebar/one-sidebar.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Page: One Sidebar

*Depends on*

* Organism: Header
* Organism: Footer
6 changes: 3 additions & 3 deletions design-library/source/_patterns/04-pages/01-one-sidebar/one-sidebar.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
</div>
</div>
<footer class="section section-footer">

{% include "@organisms/footer.twig" with {
"content":footer_text
} %}
</footer>
</div>


2 changes: 1 addition & 1 deletion design-library/source/css/style.css
View file

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

1 change: 1 addition & 0 deletions design-library/source/scss/base/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ $link-color--hover: $key-color-2--base;

$light-gray: #EDEDED;
$medium-gray: rgb(150, 150, 150);
$dark-gray: #1d1d1d;

@mixin font-profile--base {
font-family: $base-font-family;
Expand Down
2 changes: 1 addition & 1 deletion html/css/style.css
View file

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

4 changes: 2 additions & 2 deletions html/patterns/01-atoms-01-list-title-list-title/01-atoms-01-list-title-list-title.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width" />

<link rel="stylesheet" href="../../css/style.css?1509668445" media="all" />
<link rel="stylesheet" href="../../css/pattern-scaffolding.css?1509668445" media="all" />
<link rel="stylesheet" href="../../css/style.css?1510003333" media="all" />
<link rel="stylesheet" href="../../css/pattern-scaffolding.css?1510003333" media="all" />
<link href='https://fonts.googleapis.com/css?family=PT+Sans' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Pavanam' rel='stylesheet' type='text/css'>

Expand Down
4 changes: 2 additions & 2 deletions html/patterns/01-atoms-02-list-body-list-body/01-atoms-02-list-body-list-body.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width" />

<link rel="stylesheet" href="../../css/style.css?1509668445" media="all" />
<link rel="stylesheet" href="../../css/pattern-scaffolding.css?1509668445" media="all" />
<link rel="stylesheet" href="../../css/style.css?1510003333" media="all" />
<link rel="stylesheet" href="../../css/pattern-scaffolding.css?1510003333" media="all" />
<link href='https://fonts.googleapis.com/css?family=PT+Sans' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Pavanam' rel='stylesheet' type='text/css'>

Expand Down
4 changes: 2 additions & 2 deletions html/patterns/01-atoms-03-list-image-list-image/01-atoms-03-list-image-list-image.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width" />

<link rel="stylesheet" href="../../css/style.css?1509668445" media="all" />
<link rel="stylesheet" href="../../css/pattern-scaffolding.css?1509668445" media="all" />
<link rel="stylesheet" href="../../css/style.css?1510003333" media="all" />
<link rel="stylesheet" href="../../css/pattern-scaffolding.css?1510003333" media="all" />
<link href='https://fonts.googleapis.com/css?family=PT+Sans' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Pavanam' rel='stylesheet' type='text/css'>

Expand Down
Loading

0 comments on commit f0c48d4

Please sign in to comment.