diff options
| -rw-r--r-- | _includes/footer.html | 36 | ||||
| -rw-r--r-- | _includes/header.html | 2 | ||||
| -rw-r--r-- | _sass/_gt-theme.scss | 40 | ||||
| -rw-r--r-- | _sass/_layout.scss | 6 | ||||
| -rw-r--r-- | css/main.scss | 9 | ||||
| -rw-r--r-- | static/aswhite.png | bin | 0 -> 2906 bytes | |||
| -rw-r--r-- | static/sponsors/ABB.png | bin | 0 -> 3046 bytes | |||
| -rw-r--r-- | static/sponsors/eficode.png | bin | 0 -> 4850 bytes | |||
| -rw-r--r-- | static/sponsors/reaktor.png | bin | 0 -> 2642 bytes |
9 files changed, 30 insertions, 63 deletions
diff --git a/_includes/footer.html b/_includes/footer.html index 72239f1..cea5f85 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,36 +1,14 @@ <footer class="site-footer"> - <div class="wrapper"> - - <h2 class="footer-heading">{{ site.title }}</h2> + <div class="wrapper" style="text-align:center;"> + <h2 class="footer-heading">Yhteistyössä</h2> <div class="footer-col-wrapper"> - <div class="footer-col footer-col-1"> - <ul class="contact-list"> - <li>{{ site.title }}</li> - <li><a href="mailto:{{ site.email }}">{{ site.email }}</a></li> - </ul> - </div> - - <div class="footer-col footer-col-2"> - <ul class="social-media-list"> - {% if site.github_username %} - <li> - {% include icon-github.html username=site.github_username %} - </li> - {% endif %} - - {% if site.twitter_username %} - <li> - {% include icon-twitter.html username=site.twitter_username %} - </li> - {% endif %} - </ul> - </div> - - <div class="footer-col footer-col-3"> - <p>{{ site.description }}</p> - </div> + <div class="footer-col footer-col-1"> + <a href="http://new.abb.com/fi"><img width="100" style="margin:20px;border:0;" src="/static/sponsors/ABB.png" alt=""></a> + <a href="http://reaktor.com/"><img width="150" style="margin:20px;border:0;" src="/static/sponsors/reaktor.png" alt=""></a> + <a href="http://www.eficode.fi/"><img width="100" style="margin:20px;border:0;" src="/static/sponsors/eficode.png" alt=""></a> + </div> </div> </div> diff --git a/_includes/header.html b/_includes/header.html index c76545e..3b59f84 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -4,7 +4,7 @@ <div class="header__title"> <h1> - <a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a> + <img src="/static/aswhite.png"/ height="40px" style="margin:20px "><a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a> </h1> </div> <nav class="navigation header__navigation"> diff --git a/_sass/_gt-theme.scss b/_sass/_gt-theme.scss index 4a2b383..4b3c8ad 100644 --- a/_sass/_gt-theme.scss +++ b/_sass/_gt-theme.scss @@ -1,6 +1,7 @@ + body { font-family: $font-sans; - background-color: $grey-color-light; + background-color: $white-color; } .teaser { @@ -36,15 +37,14 @@ body { } .site-footer { - background: $grey-color-dark; - border-top: 5px solid $brand-color; + background: $grey-color-light; padding: $spacing-unit; - color: $background-color; + color: black; .footer-col { - color: $background-color; + color: black; } h2 { - font-family: 'Fjalla One'; + font-family: 'Sintony', sans-serif; text-transform: uppercase; letter-spacing: 1px; font-size: 1.3em; @@ -52,26 +52,21 @@ body { } .header__navigation { - border-top: 3px solid $brand-color; + margin-top: $spacing-unit / 4; overflow: hidden; ul { overflow: hidden; - background: $white-color; + background: $grey-color-light; margin: 0; padding: $spacing-unit /2 0; } text-align: center; .navigation__item { display: inline-block; - padding: 0 20px; - @include breakpoint(tablet) { - padding: 0; - display: block; - float: left; - width: 20%; - } - font-size: 1.2em; + padding: 0 10px; + + font-size: 1.0em; } a, a:visited, a:hover { color: $text-color; @@ -79,23 +74,20 @@ body { } .header__title { - padding-top: $spacing-unit; - padding-bottom: $spacing-unit; + padding-top: $spacing-unit/2; + padding-bottom: $spacing-unit/2; + background-color: #730099; h1 { - margin: 0 auto; - max-width: 200px; text-align: center; //border-bottom: 1px solid; //border-top: 1px solid; - } } .site-title { - font-family: 'Fjalla One'; + font-family: 'Sintony', sans-serif; letter-spacing: 1px; - font-size: 1.5em; - text-transform: uppercase; + font-size: 1.0em; } .header__logo { diff --git a/_sass/_layout.scss b/_sass/_layout.scss index 590495d..883cfa5 100644 --- a/_sass/_layout.scss +++ b/_sass/_layout.scss @@ -3,14 +3,10 @@ */ .site-title { - font-size: 26px; - font-weight: 300; - line-height: 56px; - margin: 0; &, &:visited, &:hover { - color: $text-color; + color: $site-title-color; text-decoration: none; } } diff --git a/css/main.scss b/css/main.scss index 073decc..93237dd 100644 --- a/css/main.scss +++ b/css/main.scss @@ -5,12 +5,12 @@ @charset "utf-8"; -@import url('https://fonts.googleapis.com/css?family=Noto+Sans|Noto+Serif|Fjalla+One'); +@import url(https://fonts.googleapis.com/css?family=Sintony:400,700); $baseurl: '{{site.baseurl}}'; // Our variables -$base-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; +$base-font-family: 'Sintony', sans-serif; $base-font-size: 16px; $base-font-weight: 400; $small-font-size: $base-font-size * 0.875; @@ -19,6 +19,7 @@ $base-line-height: 1.5; $spacing-unit: 30px; $text-color: #111; +$site-title-color: white; $background-color: #fdfdfd; $brand-color: darken(#c6f, 15%); $brand-color-light: #c6f; @@ -40,8 +41,8 @@ $breakpoints: ( desktop: 992px ); -$font-sans: 'Noto Sans', sans-serif; -$font-serif: 'Noto Serif', serif; +$font-sans: 'Sintony', sans-serif; +$font-serif: 'Sintony', sans-serif; // // Breakpoint mixin with named or pixel values. diff --git a/static/aswhite.png b/static/aswhite.png Binary files differnew file mode 100644 index 0000000..28c0454 --- /dev/null +++ b/static/aswhite.png diff --git a/static/sponsors/ABB.png b/static/sponsors/ABB.png Binary files differnew file mode 100644 index 0000000..39974bb --- /dev/null +++ b/static/sponsors/ABB.png diff --git a/static/sponsors/eficode.png b/static/sponsors/eficode.png Binary files differnew file mode 100644 index 0000000..21b0ac9 --- /dev/null +++ b/static/sponsors/eficode.png diff --git a/static/sponsors/reaktor.png b/static/sponsors/reaktor.png Binary files differnew file mode 100644 index 0000000..241b0b3 --- /dev/null +++ b/static/sponsors/reaktor.png |
