diff options
| -rw-r--r-- | _includes/header.html | 11 | ||||
| -rw-r--r-- | _layouts/fronpage.html | 0 | ||||
| -rw-r--r-- | _sass/_base.scss | 5 | ||||
| -rw-r--r-- | _sass/_gt-theme.scss | 4 | ||||
| -rw-r--r-- | css/main.scss | 2 | ||||
| -rw-r--r-- | home.html | 25 | ||||
| -rw-r--r-- | index.html | 4 |
7 files changed, 42 insertions, 9 deletions
diff --git a/_includes/header.html b/_includes/header.html index 729ddc0..4cdb0be 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,15 +1,20 @@ <header class="site-header"> - <div class="wrapper"> + <div class="header__title"> <h1> - <img src="/static/aswhite.png"/ height="40px" style="margin:20px "><a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a> + <a class="site-title" href="{{ site.baseurl }}/"><img src="/static/aswhite.png"/ height="40px" style="margin:20px ">{{ site.title }}</a> </h1> </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> @@ -20,6 +25,6 @@ </ul> </nav> - </div> + </header> diff --git a/_layouts/fronpage.html b/_layouts/fronpage.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/_layouts/fronpage.html diff --git a/_sass/_base.scss b/_sass/_base.scss index 8a19ae3..1c74a9d 100644 --- a/_sass/_base.scss +++ b/_sass/_base.scss @@ -97,8 +97,9 @@ h1, h2, h3, h4, h5, h6 { font-weight: $base-font-weight; } - - +h1 { + color: $purple-color; +} /** * Links */ diff --git a/_sass/_gt-theme.scss b/_sass/_gt-theme.scss index 4b3c8ad..979fcd2 100644 --- a/_sass/_gt-theme.scss +++ b/_sass/_gt-theme.scss @@ -56,6 +56,7 @@ body { margin-top: $spacing-unit / 4; overflow: hidden; ul { + overflow: hidden; background: $grey-color-light; margin: 0; @@ -69,6 +70,7 @@ body { font-size: 1.0em; } a, a:visited, a:hover { + text-decoration: none; color: $text-color; } } @@ -76,7 +78,7 @@ body { .header__title { padding-top: $spacing-unit/2; padding-bottom: $spacing-unit/2; - background-color: #730099; + background-color: $purple-color; h1 { text-align: center; //border-bottom: 1px solid; diff --git a/css/main.scss b/css/main.scss index 93237dd..4347ab1 100644 --- a/css/main.scss +++ b/css/main.scss @@ -29,6 +29,8 @@ $grey-color: #828282; $grey-color-light: lighten($grey-color, 43%); $grey-color-dark: darken($grey-color, 25%); +$purple-color : #5c3c7c; + $border-color: #ddd; $white-color: #fff; diff --git a/home.html b/home.html new file mode 100644 index 0000000..83ccda1 --- /dev/null +++ b/home.html @@ -0,0 +1,25 @@ +--- +layout: default +--- + +<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>
\ No newline at end of file @@ -1,6 +1,4 @@ ---- -layout: default ---- + <div class="home"> |