; ?>/img/knapp.png)
+
-
Nyheter
+Siste nyheter
have_posts() ) : while ( $digest_news->have_posts() ) : $digest_news->the_post(); ?> -">
+
>
-
+
+
diff --git a/wp-content/themes/tn-2014/footer.php b/wp-content/themes/tn-2014/footer.php
index 80f6327..7a43c0f 100644
--- a/wp-content/themes/tn-2014/footer.php
+++ b/wp-content/themes/tn-2014/footer.php
@@ -7,14 +7,14 @@
+
Teater Neuf - Studentteatret i Oslo er Norges eldste studentteater, tilbyr studenter både kunstnerisk utvikling og lavterskelmoro ved siden av pensum. Vi holder til på Det Norske Studentersamfund og har i tillegg til fire forestillinger per semester og én storproduksjon i året, også ukentlige aktiviteter, workshops, interne fester og mer.
; ?>/img/facebook.png)
; ?>/img/twitter.png)
- 
" />
<%= moment.unix(post.custom_fields._neuf_events_starttime).utc().format("YYYY-MM-DD HH:mm") %>
<%= post.title %> (<%= post.custom_fields._neuf_events_price_regular %>/<%= post.custom_fields._neuf_events_price_member %>)>
-
-
-
-
diff --git a/wp-content/themes/tn-2014/page-foreningene.php b/wp-content/themes/tn-2014/page-foreningene.php
deleted file mode 100644
index e17a48d..0000000
--- a/wp-content/themes/tn-2014/page-foreningene.php
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
Teater Neuf, Det Norske Studentersamfund
+
diff --git a/wp-content/themes/tn-2014/front-page.php b/wp-content/themes/tn-2014/front-page.php
deleted file mode 100644
index 5826d31..0000000
--- a/wp-content/themes/tn-2014/front-page.php
+++ /dev/null
@@ -1,18 +0,0 @@
-
-Teater Neuf, en del av Det Norske Studentersamfund
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/wp-content/themes/tn-2014/functions.php b/wp-content/themes/tn-2014/functions.php
index b7516c7..52d09b4 100644
--- a/wp-content/themes/tn-2014/functions.php
+++ b/wp-content/themes/tn-2014/functions.php
@@ -5,6 +5,7 @@ add_theme_support( 'automatic-feed-links' );
$content_width = 770;
+add_image_size( 'cover-photo' , 1440, 480, true );
add_image_size( 'six-column-promo' , 570 , 322 , true );
add_image_size( 'six-column-slim' , 570 , 161 , true );
@@ -24,6 +25,8 @@ add_action( 'init' , 'neuf_register_nav_menus' );
function neuf_enqueue_scripts() {
// enqueue the scripts
wp_enqueue_script( 'jquery' );
+ wp_enqueue_script( 'underscore' );
+
}
add_action( 'wp_enqueue_scripts' , 'neuf_enqueue_scripts' );
diff --git a/wp-content/themes/tn-2014/header.php b/wp-content/themes/tn-2014/header.php
index 743b52a..4a2a2d8 100644
--- a/wp-content/themes/tn-2014/header.php
+++ b/wp-content/themes/tn-2014/header.php
@@ -10,7 +10,10 @@
+
+
+
diff --git a/wp-content/themes/tn-2014/img/knapp.png b/wp-content/themes/tn-2014/img/knapp.png
new file mode 100644
index 0000000..db83da4
Binary files /dev/null and b/wp-content/themes/tn-2014/img/knapp.png differ
diff --git a/wp-content/themes/tn-2014/js/app.js b/wp-content/themes/tn-2014/js/app.js
new file mode 100644
index 0000000..d6e6343
--- /dev/null
+++ b/wp-content/themes/tn-2014/js/app.js
@@ -0,0 +1,32 @@
+var program_endpoint = "https://studentersamfundet.no/api/get_type_event/";
+var custom_fields = [
+ "_neuf_events_starttime",
+ "_neuf_events_endtime",
+ "_neuf_events_price_regular",
+ "_neuf_events_price_member"];
+var query_params = {
+ json: '1',
+ post_type: 'event',
+ type: 'teater', // TODO not implemented
+ order_by: '_neuf_events_starttime',
+ custom_fields: custom_fields.join()
+};
+
+var list = '<% _.each(posts, function(post) { %> <%= moment.unix(post.custom_fields._neuf_events_starttime).utc().format("YYYY-MM-DD HH:mm") %>
<%= post.title %> (<%= post.custom_fields._neuf_events_price_regular %>/<%= post.custom_fields._neuf_events_price_member %>)
-
-
-
-
-
-
-
-
-
-
-
- 'display:block;margin:auto;' ) ); ?>
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/wp-content/themes/tn-2014/page-front-page.php b/wp-content/themes/tn-2014/page-front-page.php
new file mode 100644
index 0000000..6b78ad2
--- /dev/null
+++ b/wp-content/themes/tn-2014/page-front-page.php
@@ -0,0 +1,19 @@
+
+
+
+
-
-
- 'association',
- 'posts_per_page' => 50,
-);
-
-$associations = new WP_Query( $args );
-
-if ( $associations->have_posts() ) : ?>
-
-
-
-
-
-
-
- have_posts() ) : $associations->the_post();
- if ( $associations->current_post%4==0 && $associations->current_post != 0)
- echo '
'; ?>
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/wp-content/themes/tn-2014/program-upcoming.php b/wp-content/themes/tn-2014/program-upcoming.php
new file mode 100644
index 0000000..5c97551
--- /dev/null
+++ b/wp-content/themes/tn-2014/program-upcoming.php
@@ -0,0 +1,4 @@
+
+
diff --git a/wp-content/themes/tn-2014/scss/_settings.scss b/wp-content/themes/tn-2014/scss/_settings.scss
index def28b8..dfa69ce 100644
--- a/wp-content/themes/tn-2014/scss/_settings.scss
+++ b/wp-content/themes/tn-2014/scss/_settings.scss
@@ -33,14 +33,14 @@
// $include-html-grid-classes: $include-html-classes;
// $include-xl-html-grid-classes: false;
-$row-width: rem-calc(1440);
+// $row-width: rem-calc(1440);
// $column-gutter: rem-calc(30);
// $total-columns: 12;
// We use these to control various global styles
// $body-bg: #fff;
// $body-font-color: #222;
-$body-font-family: 'Arial', sans-serif;
+// $body-font-family: 'Arial', sans-serif;
// $body-font-weight: normal;
// $body-font-style: normal;
diff --git a/wp-content/themes/tn-2014/scss/style.scss b/wp-content/themes/tn-2014/scss/style.scss
index b96b833..ffc57e7 100644
--- a/wp-content/themes/tn-2014/scss/style.scss
+++ b/wp-content/themes/tn-2014/scss/style.scss
@@ -4,10 +4,11 @@
@import "settings";
// Foundation overrides
+//$row-width: rem-calc(1440);
$primary-color: #650A15;
$secondary-color: #404040;
$anchor-font-color: lighten($primary-color, 5%);
-$body-font-family: Arial, sans-serif;
+$body-font-family: "Open Sans", sans-serif;
$header-font-family: Arvo, Georgia, serif;
$header-font-color: $secondary-color;
@@ -24,6 +25,7 @@ $yellow-color: #fdb813;
body {
a {
text-decoration: none;
+ transition: all 0.3 linear;
}
ul {
list-style: disc;
@@ -51,41 +53,37 @@ body {
margin: 0px;
padding: 0px;
z-index: 1;
+ width: 85px;
+ @media #{$large-up} {
+ width: auto;
+ }
}
#site-header {
background-color: $primary-color;
- min-width: 100%;
- height: 150px;
- padding-top: 25px;
- padding-bottom: 25px;
- position: relative;
- margin-bottom: 10px;
#header-container {
@include grid-row();
.site-title {
- @include grid-column(6);
+ @include grid-column(4);
.logo {
background: url('../img/teater_neuf_logo.png') no-repeat;
+ background-size: contain;
display: inline-block;
- width: 185px;
- height: 120px;
- margin-top: 10px;
+ width: 92px;
+ height: 44px;
text-indent: -9999px;
position: relative;
- bottom: 10px;
+ margin-top: 12px;
}
}
}
}
#menu {
- @include grid-column(6);
- @extend h2;
+ @include grid-column(6, $offset: 2);
position: relative;
- top: 36px;
text-transform: uppercase;
a {
@@ -97,156 +95,175 @@ body {
list-style-type: none;
margin: 0px;
padding: 0px;
- display: inline;
+ display: block;
+ }
- ul {
+ ul > li {
+ margin: 0px;
+ padding: 0px;
+ display: block;
+ float: left;
+ position: relative;
+
+ &:hover ul, &:focus ul {
+ display:block;
+ z-index: 9;
+ color: $yellow-color;
+ background:darken($primary-color, 10%);
+ }
+
+ a {
+ display: block;
+ padding: 24px 20px;
+ text-decoration: none;
+ position: relative;
+ font-weight: 600;
+
+
+ &:hover, .current {
+ color: $yellow-color;
+ }
+ }
+
+ .sub-menu {
position: absolute;
display: none;
margin: 0;
- }
-
- li {
- margin: 0px;
- padding: 0px;
- display: inline;
- float: left;
- position: relative;
-
- &:hover ul, &:focus ul {
- display:block;
- z-index: 9;
- color:rgba(255,255,255,1);
- background:darken($primary-color, 10%);
- }
-
- a {
- display: block;
- padding: 20px 25px;
- text-decoration: none;
- border-right: 1px solid #FFFFE1;
+ top: 72px;
+ left: 20px;
+ li {
position: relative;
- &:hover, .current {
- color:rgba(255,255,255,1);
- background:darken($primary-color, 10%);
- }
- }
-
- .sub-menu li {
- position: relative;
a {
- border: 0px;
+ padding: 18px 18px;
}
}
-
- &:first-child {
- padding-left: 0px;
- }
}
}
}
+#cover-photo {
+ background-size: cover;
+ background-repeat: no-repeat;
+ background-position: center center;
+ height: 480px;
+ margin-bottom: rem-calc(20);
+}
#content {
@include grid-row();
+ //#featured {
+ // @include grid-column(12);
+ // padding-bottom: 25px;
- #featured {
+ // #prevLink {
+ // display: inline-block;
+ // width: 0;
+ // height: 0;
+ // border-top: 8px solid transparent;
+ // border-bottom: 8px solid transparent;
+ // border-right: 16px solid $primary-color;
+ // cursor: pointer;
+
+ // &:hover {
+ // border-right: 16px solid lighten($primary-color, 20%);
+ // }
+ // }
+ // #nextLink {
+ // display: inline-block;
+ // width: 0;
+ // height: 0;
+ // border-top: 8px solid transparent;
+ // border-bottom: 8px solid transparent;
+ // border-left: 16px solid $primary-color;
+ // cursor: pointer;
+
+ // &:hover {
+ // border-left: 16px solid lighten($primary-color, 20%);
+ // }
+ // }
+ // #slidernav {
+ // display: inline-block;
+ // a {
+ // content: '';
+ // background: lighten($primary-color, 20%);
+ // border-radius: 50%;
+ // width: 16px;
+ // height: 16px;
+ // display: inline-block;
+ // z-index: 10;
+ // margin-left: 4px;
+ // margin-right: 4px;
+
+ // &.activeSlide {
+ // background: $primary-color;
+
+ // }
+ // }
+ // }
+ // #slider-buttons {
+ // position: relative;
+ // top: 350px;
+ // z-index: 10;
+ // }
+
+ // #slider {
+ // .featured-text {
+ // @include grid-column(6);
+ // height: 328px;
+
+ // .entry-meta {
+ // position: absolute;
+ // bottom: 6px;
+ // color: #fff;
+ // background: darken(#fff, 40%);
+ // padding: 4px;
+
+ // .datetime {
+ // @include grid-column(2);
+ // }
+ // .venue {
+ // @include grid-column(2);
+ // }
+ // .price {
+ // @include grid-column(2);
+ // }
+ // }
+ // }
+ //
+ // .featured-image {
+ // @include grid-column(6);
+ // }
+
+ // }
+ //}
+ .program-upcoming {
@include grid-column(12);
- padding-bottom: 25px;
- a h1 {
- color: #000;
- }
-
- #prevLink {
- display: inline-block;
- width: 0;
- height: 0;
- border-top: 8px solid transparent;
- border-bottom: 8px solid transparent;
- border-right: 16px solid $primary-color;
- cursor: pointer;
-
- &:hover {
- border-right: 16px solid lighten($primary-color, 20%);
- }
- }
- #nextLink {
- display: inline-block;
- width: 0;
- height: 0;
- border-top: 8px solid transparent;
- border-bottom: 8px solid transparent;
- border-left: 16px solid $primary-color;
- cursor: pointer;
-
- &:hover {
- border-left: 16px solid lighten($primary-color, 20%);
- }
- }
- #slidernav {
- display: inline-block;
- a {
- content: '';
- background: lighten($primary-color, 20%);
- border-radius: 50%;
- width: 16px;
- height: 16px;
- display: inline-block;
- z-index: 10;
- margin-left: 4px;
- margin-right: 4px;
-
- &.activeSlide {
- background: $primary-color;
-
- }
- }
- }
- #slider-buttons {
- position: relative;
- top: 350px;
- z-index: 10;
- }
-
- #slider {
- .featured-text {
- @include grid-column(6);
- height: 328px;
-
- .entry-meta {
- position: absolute;
- bottom: 6px;
- color: #fff;
- background: darken(#fff, 40%);
- padding: 4px;
-
- .datetime {
- @include grid-column(2);
- }
- .venue {
- @include grid-column(2);
- }
- .price {
- @include grid-column(2);
- }
- }
- }
-
- .featured-image {
- @include grid-column(6);
- }
+ margin-top: rem-calc(20);
+ margin-bottom: rem-calc(20);
+ ul.program-list {
+ @include block-grid(4);
}
}
#digest-news {
- @include grid-column(12);
- margin-top: 10px;
+ margin-bottom: rem-calc(20);
- h2 a {
- color: #000;
+ h3 a {
+ color: $header-font-color;
+ margin-left: $column-gutter/2;
}
.news-entry {
@include grid-column(4);
-
+ img.button {
+ width: 32px;
+ height: auto;
+ position: relative;
+ top: -4px;
+ }
+ a.entry-title{
+ font-size: rem-calc(24);
+ font-weight: bold;
+ }
.entry-meta {
font-size: 12px;
line-height: 1em;
@@ -255,9 +272,11 @@ body {
}
}
}
+ /* Single pages */
.body {
@include grid-column(6);
- margin-bottom: 25px;
+ margin-bottom: rem-calc(25);
+ margin-top: rem-calc(25);
}
.featured-image {
@@ -306,6 +325,7 @@ body {
#posts-nav-link {
@include grid-column(12);
}
+
}
#site-footer {
$footer-color: #fff;
@@ -317,6 +337,10 @@ body {
padding-bottom: 25px;
color: $footer-color;
+
+ h2 {
+ font-size: rem-calc(20);
+ }
a {
color: $footer-color;
text-decoration: none;
@@ -330,8 +354,13 @@ body {
@include grid-row();
#footer-about {
- @include grid-column(6);
- font-size: rem-calc(14);
+ @include grid-column(7);
+
+ p,
+ {
+ font-size: rem-calc(14);
+ line-height: 1.4;
+ }
ul{
list-style: none;
@@ -343,13 +372,16 @@ body {
display: inline-block;
margin: 0;
padding: 0;
- a {
- border: 0px;
- &:first-child {
- padding-right: 20px;
- }
+ font-size: rem-calc(14);
+
+ img {
+ margin-right: 4px;
}
}
+ #facebook-icon img {
+ position: relative;
+ top: -2px;
+ }
}
}
}
@@ -358,6 +390,7 @@ body {
#kolofon-text {
@include grid-column(12);
+ font-size: rem-calc(14);
margin-top: 25px;
}
@@ -368,6 +401,7 @@ body {
.credits {
margin-top: 25px;
+ margin-bottom: 25px;
@include grid-column(12);
text-align: center;
color: #666;
@@ -378,3 +412,9 @@ body {
.love {
color: #faafba;
}
+/* Overrides */
+.vcard {
+ margin: 0;
+ padding: 0;
+ border: 0;
+}