Merge branch 'master' of git://git.neuf.no/inside

css/style.css

@@ -571,7 +571,9 @@ img {
     margin: 0 10px 10px 0;
 }
 
-/* Bootstrap preparations. */
+/**
+ * Bootstrap preparations.
+ **/
 .list-item {
     display:block;
 }
@@ -630,6 +632,11 @@ img {
     background-color: #FFF;
     border-color: #CCC;
 }
+.btn-primary {
+    color: #FFF;
+    background-color: #428BCA;
+    border-color: #357EBD;
+}
 
 /******************************
  * Styles for inividual pages *

inside/Page.php

@@ -615,14 +615,14 @@ class Page {
   if (!isActive()){?>
     	<?php
     if (!isMember()){?>
-			<p><a href="index.php?page=register-membership">Registrér eller kjøp medlemskap</a></p>
+			<a class="btn btn-primary" href="index.php?page=register-membership">Registrér eller kjøp medlemskap</a>
 			<?php
     }else if (membershipExpired(getCurrentUser())){?>
-			<p><a href="index.php?page=register-membership">Registrér eller kjøp medlemskap</a></p>
+			<a class="btn btn-primary" href="index.php?page=register-membership">Registrér eller kjøp medlemskap</a>
 			<?php
     }
 		?>
-			<p><a href="index.php?page=display-current-user">Oppdatér din brukerinformasjon</a></p>
+			<a class="btn" href="index.php?page=display-current-user">Oppdatér brukerinfo</a>
 		<?php
   } else {