edb/teater-neuf
Archived
9
0 Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Style updates

Browse Source
This commit is contained in:
nikolark committed 2012-06-21 00:22:27 +02:00
1 parent af0b86b539
commit e157b6205e
7 files changed
+317 -110
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

wp-content/themes/neuf-old-style/digest.php
+2 -2
View File
@@ -1,4 +1,4 @@
<div id="digest_news" class="grid_12 hfeed">
<div id="digest-news" class="grid_12 hfeed">
<h2>Aktuelt</h2>
@@ -7,7 +7,7 @@
$counter = 1;
if ( $digest_news->have_posts() ) : while ( $digest_news->have_posts() ) : $digest_news->the_post();
?>
<div class="grid_4<?php
<div class="news-entry grid_4<?php
if($counter == 1) { echo " alpha"; }
elseif($counter == 3) { echo" omega"; }
?>">
wp-content/themes/neuf-old-style/footer.php
+9 -35
View File
@@ -1,45 +1,19 @@
<footer id="site-footer">
<div class="container_12">
<div class="grid_12">
<div id="footer-about" class="grid_4 alpha">
<h2>Konsertforeningen Betong</h2>
<p>
Konsertforeningen Betong er ansvarlige for konsertdriften på Det Norske Studentersamfund i Oslo, også kjent som Chateau Neuf. Vi disponerer konsertscenene Betong og Klubbscenen, to av byens største og beste av sitt slag. Tidligere har blant annet White Stripes, Ramones, Pearl Jam, Frank Zappa, Xzibit og Sigur Rós gjestet Det Norske Studentersamfund.
</p>
</div> <!-- #footer-about -->
<div id="fb-like-box" class="grid_4">
<div class="fb-like-box" data-href="https://www.facebook.com/betongoslo" data-width="315" data-height="350" data-show-faces="true" data-stream="false" data-header="false" data-colorscheme="dark" data-border-color="#ffffff"></div>
</div>
<div id="flickr-box" class="grid_4 omega">
<h2><a href='http://www.flickr.com/photos/studentenesfotoklubb/tags/betong' target="_blank">Bilder fra flickr</a></h2>
<div id="flickr-images">
<ul id="flickr_feed"></ul>
</div>
</div>
</div>
<div id="footer-container">
<div id="footer-about" class="grid_4 alpha">
<h2>Konsertforeningen Betong</h2>
<p>
Konsertforeningen Betong er ansvarlige for konsertdriften på Det Norske Studentersamfund i Oslo, også kjent som Chateau Neuf. Vi disponerer konsertscenene Betong og Klubbscenen, to av byens største og beste av sitt slag. Tidligere har blant annet White Stripes, Ramones, Pearl Jam, Frank Zappa, Xzibit og Sigur Rós gjestet Det Norske Studentersamfund.
</p>
</div> <!-- #footer-about -->
</div>
<div id="kolofon" class="grid_12">
<span>Det Norske Studentersamfund | Slemdalsveien 15, 0369 Oslo | Webdesign av <a href="http://edb.neuf.no">EDB-gjengen</a> og Designerne i <a href="http://studentersamfundet.no/association/kommunikasjonsavdelingen/">KAK</a>.</span>
<div id="kolofon-text">Teater Neuf, Det Norske Studentersamfund | Slemdalsveien 15, 0369 Oslo | Webdesign av <a href="http://edb.neuf.no">EDB-gjengen</a> og Designerne i <a href="http://studentersamfundet.no/association/kommunikasjonsavdelingen/">KAK</a>.</div>
</div> <!-- #kolofon -->
<!-- Google Analytics -->
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-52914-1']);
_gaq.push(['_setDomainName', 'studentersamfundet.no']);
_gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
<!-- end Google Analytics -->
</div>
</footer> <!-- #site-footer -->
wp-content/themes/neuf-old-style/front-page.php
+5 -9
View File
@@ -5,17 +5,13 @@ get_header();
?>
<div id="content">
<div class="container_12">
<?php get_template_part( 'eventslider' ); ?>
<?php get_template_part( 'eventslider' ); ?>
<?php //get_template_part( 'program' , '3days' ); ?>
<?php //get_template_part( 'program' , '6days' ); ?>
<?php get_template_part( 'program' , '6days' ); ?>
<?php //get_template_part( 'program' , '3days' ); ?>
<?php //get_template_part( 'program' , '6days' ); ?>
<?php get_template_part( 'program' , '6days' ); ?>
<?php get_template_part( 'digest' ); ?>
</div> <!-- .container_12 -->
<?php get_template_part( 'digest' ); ?>
</div> <!-- #content -->
wp-content/themes/neuf-old-style/header.php
+3 -3
View File
@@ -28,14 +28,14 @@
js.src = "//connect.facebook.net/nb_NO/all.js#xfbml=1&appId=220213643760";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
<div id="site-topbar"><a href="http://studentersamfundet.no/" title="Det Norske Studentersamfund" class="topbar-logo">Det Norske Studentersamfund</a></div>
<div id="site-topbar"><a href="http://studentersamfundet.no/" title="Det Norske Studentersamfund" class="logo">Det Norske Studentersamfund</a></div>
<header id="site-header">
<div class="container_12" style="margin-left:auto;margin-right:auto">
<div id="header-container" class="container_12" style="margin-left:auto;margin-right:auto">
<div id="access"><a href="#content">Gå direkte til innholdet</a></div>
<div class="site-title grid_7">
<a href="<?php bloginfo('url') ?>/" title="<?php bloginfo('name') ?>" rel="home" class="betong"><?php bloginfo('name') ?></a>
<a href="<?php bloginfo('url') ?>/" title="<?php bloginfo('name') ?>" rel="home" class="logo"><?php bloginfo('name') ?></a>
</span>
</div>
wp-content/themes/neuf-old-style/menu.php
+4 -4
View File
@@ -1,7 +1,7 @@
<nav id="menu" class="grid_5">
<ul class="social-icons">
<li><a id="facebook-icon" href="http://facebook.com/betongoslo" target="_blank"><img src="<?php bloginfo( 'stylesheet_directory' ); ?>/img/facebook.png" /></a></li>
<li><a id="twitter-icon" href="http://twitter.com/betongoslo" target="_blank"><img src="<?php bloginfo( 'stylesheet_directory' ); ?>/img/twitter.png" /></a></li>
</ul>
<?php wp_nav_menu( array( 'theme_location' => 'main-menu', 'container' => 'false' ) ); ?>
<ul>
<li class="social-icon"><a id="facebook-icon" href="http://facebook.com/teaterneuf" target="_blank"><img src="<?php bloginfo( 'stylesheet_directory' ); ?>/img/facebook.png" /></a></li>
<li class="social-icon"><a id="twitter-icon" href="http://twitter.com/teaterneuf" target="_blank"><img src="<?php bloginfo( 'stylesheet_directory' ); ?>/img/twitter.png" /></a></li>
</ul>
</nav> <!-- #menu -->
wp-content/themes/neuf-old-style/sass/screen.scss
+140 -27
View File
@@ -5,7 +5,7 @@
@import "compass/reset";
@import "compass/utilities/general/clearfix";
@import "compass/typography/lists/inline-block-list";
@import "compass/typography/lists";
@import "960/grid";
$main-color: #7650b3;
@@ -14,36 +14,149 @@ $main-color: #7650b3;
$ninesixty-grid-width (default: 960px) controls the default overall grid width
$ninesixty-gutter-width */
$ninesixty-grid-width: 1200px;
body {
font-size: 16px;
font: 14px Arial, sans-serif;
line-height: 1.5em;
#container {
@include grid_container;
@include clearfix;
#branding {
background: $main-color;
height: 200px;
/* TODO you are here... move menu right. */
nav#access {
a {
color: #ffffff;
}
ul {
@include inline-block-list;
li {
margin: 4px;
}
}
}
h1,h2,h3,h4 {
font-family: Arvo, Georgia, serif;
font-weight: bold;
font-size: 18px;
}
#content{
@include grid(12);
@include clearfix;
#site-header {
background-color: $main-color;
min-width: 100%;
height: 90px;
padding-top: 25px;
padding-bottom: 25px;
position: relative;
margin-bottom: 50px;
margin-top: 30px;
#header-container {
@include grid_container;
@include clearfix;
.site-title {
@include grid(7);
.logo {
background: url('../img/teater_neuf.jpg') no-repeat;
display: inline-block;
width: 340px;
height: 120px;
margin-top: 10px;
text-indent: -9999px;
position: relative;
}
}
#menu {
@include grid(5);
@extend h1;
text-transform: uppercase;
a {
color: #ffffff;
text-decoration: none;
}
ul {
@include inline-list;
li {
border-right: 1px solid #FFFFE1;
padding: 4px;
&.social-icon {
border: 0px;
}
}
}
}
}
}
#site-topbar {
position: fixed;
top: 0px;
left: 0px;
background-color: #E99835;
width: 100%;
height: 30px;
z-index: 9999;
text-align: center;
.logo {
background: url('../img/dns_30px.png') no-repeat;
display: inline-block;
width: 271px;
height: 100%;
margin-top: 4px;
text-indent: -9999px;
}
}
#access {
display: none;
}
#content {
@include grid_container;
@include clearfix;
#featured {
@include grid(12);
}
#program-6days {
@include grid(12);
.day-1 {
@include alpha();
}
.day-6 {
@include omega();
}
}
#digest-news {
@include grid(12);
margin-top: 25px;
.news-entry {
@include grid(4);
&.alpha {
@include alpha();
}
&.omega {
@include omega();
}
}
}
}
#site-footer {
background-color: $main-color;
min-width: 100%;
margin-top: 25px;
padding-top: 25px;
padding-bottom: 25px;
#footer-container {
@include grid_container;
@include clearfix;
#footer-about {
@include grid(4);
}
}
#kolofon {
@include grid_container;
@include clearfix;
#kolofon-text {
@include grid(12);
margin-top: 25px;
}
}
}
}
}
wp-content/themes/neuf-old-style/stylesheets/screen.css
+154 -30
View File
@@ -3,7 +3,8 @@
* Import this file using the following HTML or equivalent:
* <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css" /> */
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
h1,
body #site-header #header-container #menu, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
@@ -62,53 +63,176 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
$ninesixty-grid-width (default: 960px) controls the default overall grid width
$ninesixty-gutter-width */
body {
font-size: 16px;
font: 14px Arial, sans-serif;
line-height: 1.5em;
}
body #container {
body h1, body #site-header #header-container #menu, body h2, body h3, body h4 {
font-family: Arvo, Georgia, serif;
font-weight: bold;
font-size: 18px;
}
body #site-header {
background-color: #7650b3;
min-width: 100%;
height: 90px;
padding-top: 25px;
padding-bottom: 25px;
position: relative;
margin-bottom: 50px;
margin-top: 30px;
}
body #site-header #header-container {
margin-left: auto;
margin-right: auto;
width: 1200px;
overflow: hidden;
*zoom: 1;
}
body #container #branding {
background: #7650b3;
height: 200px;
/* TODO you are here... move menu right. */
body #site-header #header-container .site-title {
display: inline;
float: left;
margin-left: 10px;
margin-right: 10px;
width: 680px;
}
body #container #branding nav#access a {
body #site-header #header-container .site-title .logo {
background: url("../img/teater_neuf.jpg") no-repeat;
display: inline-block;
width: 340px;
height: 120px;
margin-top: 10px;
text-indent: -9999px;
position: relative;
}
body #site-header #header-container #menu {
display: inline;
float: left;
margin-left: 10px;
margin-right: 10px;
width: 480px;
text-transform: uppercase;
}
body #site-header #header-container #menu a {
color: #ffffff;
text-decoration: none;
}
body #container #branding nav#access ul {
margin: 0;
padding: 0;
border: 0;
body #site-header #header-container #menu ul {
list-style-type: none;
}
body #site-header #header-container #menu ul, body #site-header #header-container #menu ul li {
margin: 0px;
padding: 0px;
display: inline;
}
body #site-header #header-container #menu ul li {
border-right: 1px solid #FFFFE1;
padding: 4px;
}
body #site-header #header-container #menu ul li.social-icon {
border: 0px;
}
body #site-topbar {
position: fixed;
top: 0px;
left: 0px;
background-color: #E99835;
width: 100%;
height: 30px;
z-index: 9999;
text-align: center;
}
body #site-topbar .logo {
background: url("../img/dns_30px.png") no-repeat;
display: inline-block;
width: 271px;
height: 100%;
margin-top: 4px;
text-indent: -9999px;
}
body #access {
display: none;
}
body #content {
margin-left: auto;
margin-right: auto;
width: 1200px;
overflow: hidden;
*zoom: 1;
}
body #container #branding nav#access ul li {
list-style-image: none;
list-style-type: none;
margin-left: 0;
display: -moz-inline-box;
-moz-box-orient: vertical;
display: inline-block;
vertical-align: middle;
*vertical-align: auto;
white-space: nowrap;
}
body #container #branding nav#access ul li {
*display: inline;
}
body #container #branding nav#access ul li {
margin: 4px;
}
body #container #content {
body #content #featured {
display: inline;
float: left;
margin-left: 10px;
margin-right: 10px;
width: 1180px;
}
body #content #program-6days {
display: inline;
float: left;
margin-left: 10px;
margin-right: 10px;
width: 1180px;
}
body #content #program-6days .day-1 {
margin-left: 0;
}
body #content #program-6days .day-6 {
margin-right: 0;
}
body #content #digest-news {
display: inline;
float: left;
margin-left: 10px;
margin-right: 10px;
width: 1180px;
margin-top: 25px;
}
body #content #digest-news .news-entry {
display: inline;
float: left;
margin-left: 10px;
margin-right: 10px;
width: 380px;
}
body #content #digest-news .news-entry.alpha {
margin-left: 0;
}
body #content #digest-news .news-entry.omega {
margin-right: 0;
}
body #site-footer {
background-color: #7650b3;
min-width: 100%;
margin-top: 25px;
padding-top: 25px;
padding-bottom: 25px;
}
body #site-footer #footer-container {
margin-left: auto;
margin-right: auto;
width: 1200px;
overflow: hidden;
*zoom: 1;
}
body #site-footer #footer-container #footer-about {
display: inline;
float: left;
margin-left: 10px;
margin-right: 10px;
width: 380px;
}
body #site-footer #kolofon {
margin-left: auto;
margin-right: auto;
width: 1200px;
overflow: hidden;
*zoom: 1;
}
body #site-footer #kolofon #kolofon-text {
display: inline;
float: left;
margin-left: 10px;
margin-right: 10px;
width: 1180px;
margin-top: 25px;
}