From 5b477e66aecdfd60b666fbebe93e4f0f1c9a540f Mon Sep 17 00:00:00 2001
From: Sjur Hernes <sjurher@ulrik.uio.no>
Date: Wed, 13 Jul 2011 01:14:07 +0200
Subject: [PATCH] =?UTF-8?q?endra=20hva=20som=20lagres=20i=20st=C3=B8relse?=
 =?UTF-8?q?=20til=20minst,=20liten,=20normalliten,=20normalstor,=20stor,?=
 =?UTF-8?q?=20mega,=20i=20stedet=20for=20tall?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitmodules                                    |  2 +-
 wp-content/plugins/neuf-artist/neuf-artist.php | 12 ++++++------
 wp-content/themes/studio11                     |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index d3acc0b..e2fd570 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,5 +5,5 @@
 	path = wp-content/plugins/neuf-venues
 	url = git@github.com:neuf/Neuf-Venues.git
 [submodule "wp-content/themes/studio11"]
-	path = wp-content/plugins/studio11
+	path = wp-content/themes/studio11
 	url = git@github.com:neuf/studio11-theme.git
diff --git a/wp-content/plugins/neuf-artist/neuf-artist.php b/wp-content/plugins/neuf-artist/neuf-artist.php
index 28be562..1cb2aa8 100644
--- a/wp-content/plugins/neuf-artist/neuf-artist.php
+++ b/wp-content/plugins/neuf-artist/neuf-artist.php
@@ -88,12 +88,12 @@ if (!class_exists("StudioArtist")) {
 	echo '<select name="studio_artist_font">';
 	echo $artist_font;
 
-	$types = array( array('name'  =>  'Flink i Guitarhero'   , 'size' => 12),
-			array('name'  =>  'Liten Artist'         , 'size' => 15),
-			array('name'  =>  'Mellomstor Artist'    , 'size' => 18),
-			array('name'  =>  'Stor Artist'          , 'size' => 21),
-			array('name'  =>  'Oh! Dette blir fest!' , 'size' => 24),
-			array('name'  =>  'Hopalong Knut!!'      , 'size' => 44),
+	$types = array( array('name'  =>  'Flink i Guitarhero'   , 'size' => 'minst'),
+			array('name'  =>  'Liten Artist'         , 'size' => 'liten'),
+			array('name'  =>  'Mellomstor Artist'    , 'size' => 'normalliten'),
+			array('name'  =>  'Stor Artist'          , 'size' => 'normalstor'),
+			array('name'  =>  'Oh! Dette blir fest!' , 'size' => 'stor'),
+			array('name'  =>  'Hopalong Knut!!'      , 'size' => 'mega'),
 			);
 
 	foreach($types as $type){
diff --git a/wp-content/themes/studio11 b/wp-content/themes/studio11
index 90a43e7..3d9f8af 160000
--- a/wp-content/themes/studio11
+++ b/wp-content/themes/studio11
@@ -1 +1 @@
-Subproject commit 90a43e7493edfec255f24a44097810d2b6f009a5
+Subproject commit 3d9f8afe7865a5e7cf9aea48d8704cc13c748bc2