Merge branch 'master' of git.neuf.no:studio13

This commit is contained in:
nikolark committed 2013-05-07 23:40:05 +02:00
commit 0d4aaa44d2
4 files changed
+4 -4

No files matched your search

+1 -1
View File
@@ -1,7 +1,7 @@
<article id="post-<?php the_ID(); ?>" role="article" class="sticky">
<header class="article-header row">
<div class="small-12 columns">
<?php the_post_thumbnail(); ?>
<a href="<?php the_permalink() ?>" title="<?php the_title_attribute(); ?>"><?php the_post_thumbnail(); ?></a>
<h1><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php the_title_attribute(); ?>"><?php the_title(); ?></a></h1>
<!--<p class="byline vcard"><time class="updated" datetime="<?php echo get_the_time('Y-m-j'); ?>" pubdate><?php echo get_the_time(get_option('date_format'));?></time> av <span class="author"><?php the_author_posts_link(); ?></span></p>-->
</div>
@@ -2,7 +2,7 @@
<article id="post-<?php the_ID(); ?>" role="article" class="sticky">
<header class="article-header row">
<div class="small-12 columns">
<?php the_post_thumbnail(); ?>
<a href="<?php the_permalink() ?>" title="<?php the_title_attribute(); ?>"><?php the_post_thumbnail(); ?></a>
<h1><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php the_title_attribute(); ?>"><?php the_title(); ?></a></h1>
<!--<p class="byline vcard"><time class="updated" datetime="<?php echo get_the_time('Y-m-j'); ?>" pubdate><?php echo get_the_time(get_option('date_format'));?></time> av <span class="author"><?php the_author_posts_link(); ?></span></p>-->
</div>
+1 -1
View File
@@ -1,7 +1,7 @@
<article id="post-<?php the_ID(); ?>" role="article">
<div class="row">
<div class="small-6 columns">
<?php the_post_thumbnail(); ?>
<a href="<?php the_permalink() ?>" title="<?php the_title_attribute(); ?>"><?php the_post_thumbnail(); ?></a>
</div>
<div class="small-6 columns">
<header class="article-header">
+1 -1
View File
@@ -8,7 +8,7 @@
<meta charset="utf-8">
<!-- Google Chrome Frame for IE -->
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title><?php wp_title(''); ?></title>
<title><?php wp_title(' ', true, 'right'); ?><?php bloginfo('name'); ?></title>
<!-- mobile meta (hooray!) -->
<meta name="HandheldFriendly" content="True">
<meta name="MobileOptimized" content="320">