diff options
| -rw-r--r-- | _includes/header.html | 5 | ||||
| -rw-r--r-- | _layouts/fronpage.html | 0 | ||||
| -rw-r--r-- | _layouts/index_page.html | 13 | ||||
| -rw-r--r-- | _sass/_base.scss | 6 | ||||
| -rw-r--r-- | _sass/_gt-theme.scss | 3 | ||||
| -rw-r--r-- | index.html | 48 |
6 files changed, 47 insertions, 28 deletions
diff --git a/_includes/header.html b/_includes/header.html index 4cdb0be..caaf0e5 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -9,12 +9,7 @@ </div> <nav class="navigation header__navigation"> <ul> -<<<<<<< b9aea514b507fe98e351c54dcd95f58b6342d8be - <li class="navigation__item"><a href="{{ site.baseurl }}/">Etusivu</a></li> -======= <li class="navigation__item"><a href="{{ '/home/' | prepend: site.baseurl}}">Etusivu</a></li> - <li class="navigation__item"><a href="{{ '/hallitus/' | prepend: site.baseurl }}">Hallitus</a></li> ->>>>>>> rebaseee <li class="navigation__item"><a href="{{ '/kilta/' | prepend: site.baseurl }}">Kilta</a></li> <li class="navigation__item"><a href="{{ '/opiskelu/' | prepend: site.baseurl }}">Opiskelu</a></li> <li class="navigation__item"><a href="{{ '/phuksit/' | prepend: site.baseurl }}">Uudet opiskelijat</a></li> diff --git a/_layouts/fronpage.html b/_layouts/fronpage.html deleted file mode 100644 index e69de29..0000000 --- a/_layouts/fronpage.html +++ /dev/null diff --git a/_layouts/index_page.html b/_layouts/index_page.html new file mode 100644 index 0000000..81f7d74 --- /dev/null +++ b/_layouts/index_page.html @@ -0,0 +1,13 @@ +<!DOCTYPE html> +<html style='height:100%;'> + + {% include head.html %} +<body style='height:100%; box-sizing: border-box; margin: 0; padding: 0;'> + <div style='height:100%;'> + + {{ content }} + + </div> + </div> +</body> +</html>
\ No newline at end of file diff --git a/_sass/_base.scss b/_sass/_base.scss index 1c74a9d..bd0f919 100644 --- a/_sass/_base.scss +++ b/_sass/_base.scss @@ -95,11 +95,9 @@ li { */ h1, h2, h3, h4, h5, h6 { font-weight: $base-font-weight; -} - -h1 { color: $purple-color; } + /** * Links */ @@ -208,3 +206,5 @@ pre { } } } + + diff --git a/_sass/_gt-theme.scss b/_sass/_gt-theme.scss index 979fcd2..4ffe729 100644 --- a/_sass/_gt-theme.scss +++ b/_sass/_gt-theme.scss @@ -73,6 +73,9 @@ body { text-decoration: none; color: $text-color; } + a:hover{ + color: $purple-color; + } } .header__title { @@ -1,23 +1,31 @@ +--- +layout: index_page +--- -<div class="home"> - -<article class="post"> - - <header class="post-header"> - <h1 class="post-title">le dank guild of as</h1> - </header> - - <div class="post-content"> - -<p>tervetuloa aalto shitpostersiin</p> - -<p>look around you</p> - -<img src="/static/norri.jpg"> - - </div> - -</article> - +<div style='float:left;height:100%; width:60%; background-color:#5c3c7c; text-align: center;'> + <h1 style="margin-top:10%"> + <img src="/static/aswhite.png"/ height="200px"> + <div class="site-title" style="font-size: 30px;" href="{{ site.baseurl }}/">{{ site.title }}</div> + </h1> + <p style="color: white; margin:30px;">Automaatio- ja systeemitekniikan kilta yhdistää Aalot yliopistossa opiskelevia automaatio- ja systeemitekniikan sekä tietoliikenne tekniikan opiskelijoita. Kilta tarjoaa monipuolisia palveluita ja tapahtumia sekä tekee laajasti yhteistyötä yritysten sekä aluminensa kanssa.</p> + <ul> + <div><a style="color:white; text-decoration:none;" href="{{ '/home' | prepend: site.baseurl }}">Etusivu</a></div> + <div><a style="color:white; text-decoration:none;" href="{{ '/kilta/' | prepend: site.baseurl }}">Kilta</a></div> + <div><a style="color:white; text-decoration:none;" href="{{ '/opiskelu/' | prepend: site.baseurl }}">Opiskelu</a></div> + <div><a style="color:white; text-decoration:none;" href="{{ '/phuksit/' | prepend: site.baseurl }}">Uudet opiskelijat</a></div> + <div><a style="color:white; text-decoration:none;" href="{{ '/tapahtumat/' | prepend: site.baseurl }}">Tapahtumat</a></div> + <div><a style="color:white; text-decoration:none;" href="{{ '/yrityksille/' | prepend: site.baseurl }}">Yrityksille</a></div> + <div><a style="color:white; text-decoration:none;" href="{{ '/yhteystiedot/' | prepend: site.baseurl }}">Yhteystiedot</a></div> + <div><a style="color:white; text-decoration:none;" href="{{ '/in-english/' | prepend: site.baseurl }}">In English</a></div> + </ul> </div> + +<div style='float:right;height:100%; width:40%; background-color:white; text-align: center;'> + <h1 style="margin-top:20%">Yhteistyössä</h1> + <div><a href="http://new.abb.com/fi"><img width="200" style="margin:20px;border:0;" src="/static/sponsors/ABB.png" alt=""></a></div> + + <div><a href="http://reaktor.com/"><img width="250" style="margin:20px;border:0;" src="/static/sponsors/reaktor.png" alt=""></a></div> + + <div><a href="http://www.eficode.fi/"><img width="200" style="margin:20px;border:0;" src="/static/sponsors/eficode.png" alt=""></a></div> +</div>
\ No newline at end of file |