From 99a8a3aeb4c8b41a6075173660f37b0e0958f019 Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Mon, 19 Mar 2012 18:55:13 +0100
Subject: [PATCH] Updates bootstrap to v2.0.1.2 and fixes empty orders

---
 main/views.py                       |   4 +
 static/gaute/config.rb              |   2 +-
 static/gaute/sass/screen.scss       |   2 +
 static/gaute/stylesheets/print.css  | 263 +++++++++++++++++++++-------
 static/gaute/stylesheets/screen.css | 263 +++++++++++++++++++++-------
 templates/register.html             |   2 +-
 6 files changed, 404 insertions(+), 132 deletions(-)

diff --git a/main/views.py b/main/views.py
index 54adcbe..2c524bf 100755
--- a/main/views.py
+++ b/main/views.py
@@ -51,6 +51,10 @@ def register(request):
                     order.customer,
                     int(order_sum - profile.balance)))
                 return HttpResponseRedirect( reverse('main.views.register') )
+            # empty order?
+            if order_sum == 0:
+                messages.error(request, 'Du har ikke valgt hva du skal kjøpe...')
+                return HttpResponseRedirect( reverse('main.views.register') )
             order.order_sum = order_sum
             order.save()
             # substract order from balance
diff --git a/static/gaute/config.rb b/static/gaute/config.rb
index f0e12c6..12db9e6 100644
--- a/static/gaute/config.rb
+++ b/static/gaute/config.rb
@@ -5,7 +5,7 @@ require 'compass_twitter_bootstrap'
 http_path = "/"
 css_dir = "stylesheets"
 sass_dir = "sass"
-images_dir = "images"
+images_dir = "img"
 javascripts_dir = "javascripts"
 
 # You can select your preferred output style here (can be overridden via the command line):
diff --git a/static/gaute/sass/screen.scss b/static/gaute/sass/screen.scss
index f812cc4..1b73fbb 100644
--- a/static/gaute/sass/screen.scss
+++ b/static/gaute/sass/screen.scss
@@ -5,6 +5,7 @@ body {
 
     #header {
     }
+
     #customer {
         ul {
             @include inline-block-list;
@@ -59,6 +60,7 @@ body {
                 }
             }
         }
+        
         #total {
             div {
                 color: #ffffff;
diff --git a/static/gaute/stylesheets/print.css b/static/gaute/stylesheets/print.css
index 4983945..a232d91 100644
--- a/static/gaute/stylesheets/print.css
+++ b/static/gaute/stylesheets/print.css
@@ -39,7 +39,7 @@ html {
 }
 
 a:focus {
-  outline: thin dotted;
+  outline: thin dotted #333;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
@@ -265,40 +265,40 @@ a:hover {
 .row-fluid > [class*="span"]:first-child {
   margin-left: 0;
 }
-.row-fluid .span1 {
+.row-fluid > .span1 {
   width: 6.383%;
 }
-.row-fluid .span2 {
+.row-fluid > .span2 {
   width: 14.894%;
 }
-.row-fluid .span3 {
+.row-fluid > .span3 {
   width: 23.404%;
 }
-.row-fluid .span4 {
+.row-fluid > .span4 {
   width: 31.915%;
 }
-.row-fluid .span5 {
+.row-fluid > .span5 {
   width: 40.426%;
 }
-.row-fluid .span6 {
+.row-fluid > .span6 {
   width: 48.936%;
 }
-.row-fluid .span7 {
+.row-fluid > .span7 {
   width: 57.447%;
 }
-.row-fluid .span8 {
+.row-fluid > .span8 {
   width: 65.957%;
 }
-.row-fluid .span9 {
+.row-fluid > .span9 {
   width: 74.468%;
 }
-.row-fluid .span10 {
+.row-fluid > .span10 {
   width: 82.979%;
 }
-.row-fluid .span11 {
+.row-fluid > .span11 {
   width: 91.489%;
 }
-.row-fluid .span12 {
+.row-fluid > .span12 {
   width: 100.0%;
 }
 
@@ -437,7 +437,8 @@ li {
   line-height: 18px;
 }
 
-ul.unstyled {
+ul.unstyled,
+ol.unstyled {
   margin-left: 0;
   list-style: none;
 }
@@ -462,7 +463,7 @@ dd {
 hr {
   margin: 18px 0;
   border: 0;
-  border-top: 1px solid #e5e5e5;
+  border-top: 1px solid #eeeeee;
   border-bottom: 1px solid white;
 }
 
@@ -577,13 +578,21 @@ pre {
   white-space: pre;
   white-space: pre-wrap;
   word-break: break-all;
+  word-wrap: break-word;
 }
 pre.prettyprint {
   margin-bottom: 18px;
 }
 pre code {
   padding: 0;
+  color: inherit;
   background-color: transparent;
+  border: 0;
+}
+
+.pre-scrollable {
+  max-height: 340px;
+  overflow-y: scroll;
 }
 
 form {
@@ -607,18 +616,28 @@ legend {
   border: 0;
   border-bottom: 1px solid #eee;
 }
+legend small {
+  font-size: 13.5px;
+  color: #999999;
+}
 
 label,
 input,
 button,
 select,
 textarea {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 13px;
   font-weight: normal;
   line-height: 18px;
 }
 
+input,
+button,
+select,
+textarea {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
 label {
   display: block;
   margin-bottom: 5px;
@@ -667,7 +686,6 @@ input[type="radio"] {
   *margin-top: 0;
   /* IE7 */
   line-height: normal;
-  border: 0;
   cursor: pointer;
   -moz-border-radius: 0;
   -webkit-border-radius: 0;
@@ -675,9 +693,16 @@ input[type="radio"] {
   -ms-border-radius: 0;
   -khtml-border-radius: 0;
   border-radius: 0;
+  border: 0 \9;
+  /* IE9 and down */
+}
+
+input[type="image"] {
+  border: 0;
 }
 
 input[type="file"] {
+  width: auto;
   padding: initial;
   line-height: initial;
   border: initial;
@@ -704,6 +729,10 @@ input[type="file"] {
   line-height: 28px;
 }
 
+input[type="file"] {
+  line-height: 18px \9;
+}
+
 select {
   width: 220px;
   background-color: white;
@@ -747,6 +776,7 @@ input[type="hidden"] {
 .radio.inline,
 .checkbox.inline {
   display: inline-block;
+  padding-top: 5px;
   margin-bottom: 0;
   vertical-align: middle;
 }
@@ -756,11 +786,6 @@ input[type="hidden"] {
   margin-left: 10px;
 }
 
-.controls > .radio.inline:first-child,
-.controls > .checkbox.inline:first-child {
-  padding-top: 0;
-}
-
 input,
 textarea {
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
@@ -781,16 +806,17 @@ textarea:focus {
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
   outline: 0;
   outline: thin dotted \9;
-  /* IE6-8 */
+  /* IE6-9 */
 }
 
 input[type="file"]:focus,
+input[type="radio"]:focus,
 input[type="checkbox"]:focus,
 select:focus {
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
   box-shadow: none;
-  outline: thin dotted;
+  outline: thin dotted #333;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
@@ -1005,6 +1031,7 @@ select:focus:required:invalid:focus {
 }
 
 .help-block {
+  display: block;
   margin-top: 5px;
   margin-bottom: 0;
   color: #999999;
@@ -1102,6 +1129,7 @@ select:focus:required:invalid:focus {
   border-radius: 3px 0 0 3px;
 }
 .input-append .uneditable-input {
+  border-left-color: #eee;
   border-right-color: #ccc;
 }
 .input-append .add-on {
@@ -1151,6 +1179,11 @@ select:focus:required:invalid:focus {
   display: inline-block;
   margin-bottom: 0;
 }
+.form-search .hide,
+.form-inline .hide,
+.form-horizontal .hide {
+  display: none;
+}
 
 .form-search label,
 .form-inline label,
@@ -1168,14 +1201,23 @@ select:focus:required:invalid:focus {
   vertical-align: middle;
 }
 
+.form-search .radio,
+.form-inline .radio,
+.form-search .checkbox,
+.form-inline .checkbox {
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+
 .control-group {
   margin-bottom: 9px;
 }
 
-.form-horizontal legend + .control-group {
+legend + .control-group {
   margin-top: 18px;
   -webkit-margin-top-collapse: separate;
 }
+
 .form-horizontal .control-group {
   margin-bottom: 18px;
   *zoom: 1;
@@ -1187,7 +1229,7 @@ select:focus:required:invalid:focus {
 .form-horizontal .control-group:after {
   clear: both;
 }
-.form-horizontal .control-group > label {
+.form-horizontal .control-label {
   float: left;
   width: 140px;
   padding-top: 5px;
@@ -1215,14 +1257,14 @@ table {
   padding: 8px;
   line-height: 18px;
   text-align: left;
+  vertical-align: top;
   border-top: 1px solid #ddd;
 }
 .table th {
   font-weight: bold;
-  vertical-align: bottom;
 }
-.table td {
-  vertical-align: top;
+.table thead th {
+  vertical-align: bottom;
 }
 .table thead:first-child tr th,
 .table thead:first-child tr td {
@@ -1301,6 +1343,11 @@ table {
   background-color: #f9f9f9;
 }
 
+.table tbody tr:hover td,
+.table tbody tr:hover th {
+  background-color: #f5f5f5;
+}
+
 table .span1 {
   float: none;
   width: 44px;
@@ -1362,22 +1409,25 @@ table .span12 {
   margin-left: 0;
 }
 
-[class^="icon-"] {
+[class^="icon-"],
+[class*=" icon-"] {
   display: inline-block;
   width: 14px;
   height: 14px;
+  line-height: 14px;
   vertical-align: text-top;
-  background-image: url(../img/glyphicons-halflings.png);
+  background-image: url('/img/glyphicons-halflings.png?1329865545');
   background-position: 14px 14px;
   background-repeat: no-repeat;
   *margin-right: .3em;
 }
-[class^="icon-"]:last-child {
+[class^="icon-"]:last-child,
+[class*=" icon-"]:last-child {
   *margin-left: 0;
 }
 
 .icon-white {
-  background-image: url(../img/glyphicons-halflings-white.png);
+  background-image: url('/img/glyphicons-halflings-white.png?1329865545');
 }
 
 .icon-glass {
@@ -1907,7 +1957,6 @@ table .span12 {
   float: left;
   display: none;
   min-width: 160px;
-  max-width: 220px;
   _width: 160px;
   padding: 4px 0;
   margin: 0;
@@ -2055,20 +2104,25 @@ table .span12 {
 .btn {
   display: inline-block;
   padding: 4px 10px 4px;
+  margin-bottom: 0;
   font-size: 13px;
   line-height: 18px;
   color: #333333;
   text-align: center;
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  vertical-align: middle;
   background-color: #e6e6e6;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(white), color-stop(25%, white), to(#e6e6e6));
-  background-image: -webkit-linear-gradient(white, white 25%, #e6e6e6);
-  background-image: -moz-linear-gradient(top, white, white 25%, #e6e6e6);
-  background-image: -ms-linear-gradient(white, white 25%, #e6e6e6);
-  background-image: -o-linear-gradient(white, white 25%, #e6e6e6);
-  background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  background-repeat: no-repeat;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(white), to(#e6e6e6));
+  background-image: -moz-linear-gradient(top, white, #e6e6e6);
+  background-image: -ms-linear-gradient(top, white, #e6e6e6);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #e6e6e6));
+  background-image: -webkit-linear-gradient(top, white, #e6e6e6);
+  background-image: -o-linear-gradient(top, white, #e6e6e6);
+  background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='white', endColorstr='#e6e6e6', GradientType=0);
+  border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
   border: 1px solid #ccc;
   border-bottom-color: #bbb;
   -moz-border-radius: 4px;
@@ -2081,8 +2135,15 @@ table .span12 {
   -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
   cursor: pointer;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
   *margin-left: .3em;
 }
+.btn:hover, .btn:active, .btn.active, .btn.disabled, .btn[disabled] {
+  background-color: #e6e6e6;
+}
+.btn:active, .btn.active {
+  background-color: #cccccc e("\9");
+}
 .btn:first-child {
   *margin-left: 0;
 }
@@ -2100,7 +2161,7 @@ table .span12 {
 }
 
 .btn:focus {
-  outline: thin dotted;
+  outline: thin dotted #333;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
@@ -2113,7 +2174,6 @@ table .span12 {
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
   background-color: #e6e6e6;
   background-color: #d9d9d9 e("\9");
-  color: rgba(0, 0, 0, 0.5);
   outline: 0;
 }
 
@@ -2141,7 +2201,7 @@ table .span12 {
   border-radius: 5px;
 }
 
-.btn-large .icon {
+.btn-large [class^="icon-"] {
   margin-top: 1px;
 }
 
@@ -2151,10 +2211,16 @@ table .span12 {
   line-height: 16px;
 }
 
-.btn-small .icon {
+.btn-small [class^="icon-"] {
   margin-top: -1px;
 }
 
+.btn-mini {
+  padding: 2px 6px;
+  font-size: 11px;
+  line-height: 14px;
+}
+
 .btn-primary,
 .btn-primary:hover,
 .btn-warning,
@@ -2164,7 +2230,9 @@ table .span12 {
 .btn-success,
 .btn-success:hover,
 .btn-info,
-.btn-info:hover {
+.btn-info:hover,
+.btn-inverse,
+.btn-inverse:hover {
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   color: white;
 }
@@ -2173,7 +2241,8 @@ table .span12 {
 .btn-warning.active,
 .btn-danger.active,
 .btn-success.active,
-.btn-info.active {
+.btn-info.active,
+.btn-dark.active {
   color: rgba(255, 255, 255, 0.75);
 }
 
@@ -2282,6 +2351,27 @@ table .span12 {
   background-color: #24748c e("\9");
 }
 
+.btn-inverse {
+  background-color: #262626;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#454545), to(#262626));
+  background-image: -moz-linear-gradient(top, #454545, #262626);
+  background-image: -ms-linear-gradient(top, #454545, #262626);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #454545), color-stop(100%, #262626));
+  background-image: -webkit-linear-gradient(top, #454545, #262626);
+  background-image: -o-linear-gradient(top, #454545, #262626);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#454545', endColorstr='#262626', GradientType=0);
+  border-color: #262626 #262626 black;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-inverse:hover, .btn-inverse:active, .btn-inverse.active, .btn-inverse.disabled, .btn-inverse[disabled] {
+  background-color: #262626;
+}
+.btn-inverse:active, .btn-inverse.active {
+  background-color: #0d0d0d e("\9");
+}
+
 button.btn,
 input[type="submit"].btn {
   *padding-top: 2px;
@@ -2442,7 +2532,8 @@ input[type="submit"].btn.small {
 .btn-primary .caret,
 .btn-danger .caret,
 .btn-info .caret,
-.btn-success .caret {
+.btn-success .caret,
+.btn-inverse .caret {
   border-top-color: white;
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=75);
   opacity: 0.75;
@@ -2540,6 +2631,21 @@ input[type="submit"].btn.small {
   background-color: #eeeeee;
 }
 
+.nav .nav-header {
+  display: block;
+  padding: 3px 15px;
+  font-size: 11px;
+  font-weight: bold;
+  line-height: 18px;
+  color: #999999;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  text-transform: uppercase;
+}
+
+.nav li + .nav-header {
+  margin-top: 9px;
+}
+
 .nav-list {
   padding-left: 14px;
   padding-right: 14px;
@@ -2548,23 +2654,13 @@ input[type="submit"].btn.small {
 
 .nav-list > li > a,
 .nav-list .nav-header {
-  display: block;
-  padding: 3px 15px;
   margin-left: -15px;
   margin-right: -15px;
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
 }
 
-.nav-list .nav-header {
-  font-size: 11px;
-  font-weight: bold;
-  line-height: 18px;
-  color: #999999;
-  text-transform: uppercase;
-}
-
-.nav-list > li + .nav-header {
-  margin-top: 9px;
+.nav-list > li > a {
+  padding: 3px 15px;
 }
 
 .nav-list .active > a,
@@ -2777,6 +2873,10 @@ input[type="submit"].btn.small {
   clear: both;
 }
 
+.tab-content {
+  overflow: hidden;
+}
+
 .tabs-below .nav-tabs,
 .tabs-right .nav-tabs,
 .tabs-left .nav-tabs {
@@ -3021,6 +3121,15 @@ input[type="submit"].btn.small {
 .navbar-form input[type="radio"] {
   margin-top: 3px;
 }
+.navbar-form .input-append,
+.navbar-form .input-prepend {
+  margin-top: 6px;
+  white-space: nowrap;
+}
+.navbar-form .input-append input,
+.navbar-form .input-prepend input {
+  margin-top: 0;
+}
 
 .navbar-search {
   position: relative;
@@ -3127,7 +3236,6 @@ input[type="submit"].btn.small {
   color: white;
   text-decoration: none;
   background-color: #222222;
-  background-color: rgba(0, 0, 0, 0.5);
 }
 
 .navbar .divider-vertical {
@@ -3232,7 +3340,7 @@ input[type="submit"].btn.small {
   box-shadow: inset 0 1px 0 white;
 }
 .breadcrumb li {
-  display: inline;
+  display: inline-block;
   text-shadow: 0 1px 0 white;
 }
 .breadcrumb .divider {
@@ -3451,6 +3559,10 @@ input[type="submit"].btn.small {
   padding: 15px;
 }
 
+.modal-body .modal-form {
+  margin-bottom: 0;
+}
+
 .modal-footer {
   padding: 14px 15px 15px;
   margin-bottom: 0;
@@ -3718,11 +3830,11 @@ a.thumbnail:hover {
 }
 
 .label {
-  padding: 1px 3px 2px;
-  font-size: 9.75px;
+  padding: 2px 4px 3px;
+  font-size: 11.05px;
   font-weight: bold;
   color: white;
-  text-transform: uppercase;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   background-color: #999999;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
@@ -3732,22 +3844,43 @@ a.thumbnail:hover {
   border-radius: 3px;
 }
 
+.label:hover {
+  color: white;
+  text-decoration: none;
+}
+
 .label-important {
   background-color: #b94a48;
 }
 
+.label-important:hover {
+  background-color: #953b39;
+}
+
 .label-warning {
   background-color: #f89406;
 }
 
+.label-warning:hover {
+  background-color: #c67605;
+}
+
 .label-success {
   background-color: #468847;
 }
 
+.label-success:hover {
+  background-color: #356635;
+}
+
 .label-info {
   background-color: #3a87ad;
 }
 
+.label-info:hover {
+  background-color: #2d6987;
+}
+
 @-webkit-keyframes progress-bar-stripes {
   from {
     background-position: 0 0;
diff --git a/static/gaute/stylesheets/screen.css b/static/gaute/stylesheets/screen.css
index 9103392..865ada6 100644
--- a/static/gaute/stylesheets/screen.css
+++ b/static/gaute/stylesheets/screen.css
@@ -39,7 +39,7 @@ html {
 }
 
 a:focus {
-  outline: thin dotted;
+  outline: thin dotted #333;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
@@ -265,40 +265,40 @@ a:hover {
 .row-fluid > [class*="span"]:first-child {
   margin-left: 0;
 }
-.row-fluid .span1 {
+.row-fluid > .span1 {
   width: 6.383%;
 }
-.row-fluid .span2 {
+.row-fluid > .span2 {
   width: 14.894%;
 }
-.row-fluid .span3 {
+.row-fluid > .span3 {
   width: 23.404%;
 }
-.row-fluid .span4 {
+.row-fluid > .span4 {
   width: 31.915%;
 }
-.row-fluid .span5 {
+.row-fluid > .span5 {
   width: 40.426%;
 }
-.row-fluid .span6 {
+.row-fluid > .span6 {
   width: 48.936%;
 }
-.row-fluid .span7 {
+.row-fluid > .span7 {
   width: 57.447%;
 }
-.row-fluid .span8 {
+.row-fluid > .span8 {
   width: 65.957%;
 }
-.row-fluid .span9 {
+.row-fluid > .span9 {
   width: 74.468%;
 }
-.row-fluid .span10 {
+.row-fluid > .span10 {
   width: 82.979%;
 }
-.row-fluid .span11 {
+.row-fluid > .span11 {
   width: 91.489%;
 }
-.row-fluid .span12 {
+.row-fluid > .span12 {
   width: 100.0%;
 }
 
@@ -437,7 +437,8 @@ li {
   line-height: 18px;
 }
 
-ul.unstyled {
+ul.unstyled,
+ol.unstyled {
   margin-left: 0;
   list-style: none;
 }
@@ -462,7 +463,7 @@ dd {
 hr {
   margin: 18px 0;
   border: 0;
-  border-top: 1px solid #e5e5e5;
+  border-top: 1px solid #eeeeee;
   border-bottom: 1px solid white;
 }
 
@@ -577,13 +578,21 @@ pre {
   white-space: pre;
   white-space: pre-wrap;
   word-break: break-all;
+  word-wrap: break-word;
 }
 pre.prettyprint {
   margin-bottom: 18px;
 }
 pre code {
   padding: 0;
+  color: inherit;
   background-color: transparent;
+  border: 0;
+}
+
+.pre-scrollable {
+  max-height: 340px;
+  overflow-y: scroll;
 }
 
 form {
@@ -607,18 +616,28 @@ legend {
   border: 0;
   border-bottom: 1px solid #eee;
 }
+legend small {
+  font-size: 13.5px;
+  color: #999999;
+}
 
 label,
 input,
 button,
 select,
 textarea {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 13px;
   font-weight: normal;
   line-height: 18px;
 }
 
+input,
+button,
+select,
+textarea {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
 label {
   display: block;
   margin-bottom: 5px;
@@ -667,7 +686,6 @@ input[type="radio"] {
   *margin-top: 0;
   /* IE7 */
   line-height: normal;
-  border: 0;
   cursor: pointer;
   -moz-border-radius: 0;
   -webkit-border-radius: 0;
@@ -675,9 +693,16 @@ input[type="radio"] {
   -ms-border-radius: 0;
   -khtml-border-radius: 0;
   border-radius: 0;
+  border: 0 \9;
+  /* IE9 and down */
+}
+
+input[type="image"] {
+  border: 0;
 }
 
 input[type="file"] {
+  width: auto;
   padding: initial;
   line-height: initial;
   border: initial;
@@ -704,6 +729,10 @@ input[type="file"] {
   line-height: 28px;
 }
 
+input[type="file"] {
+  line-height: 18px \9;
+}
+
 select {
   width: 220px;
   background-color: white;
@@ -747,6 +776,7 @@ input[type="hidden"] {
 .radio.inline,
 .checkbox.inline {
   display: inline-block;
+  padding-top: 5px;
   margin-bottom: 0;
   vertical-align: middle;
 }
@@ -756,11 +786,6 @@ input[type="hidden"] {
   margin-left: 10px;
 }
 
-.controls > .radio.inline:first-child,
-.controls > .checkbox.inline:first-child {
-  padding-top: 0;
-}
-
 input,
 textarea {
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
@@ -781,16 +806,17 @@ textarea:focus {
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
   outline: 0;
   outline: thin dotted \9;
-  /* IE6-8 */
+  /* IE6-9 */
 }
 
 input[type="file"]:focus,
+input[type="radio"]:focus,
 input[type="checkbox"]:focus,
 select:focus {
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
   box-shadow: none;
-  outline: thin dotted;
+  outline: thin dotted #333;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
@@ -1005,6 +1031,7 @@ select:focus:required:invalid:focus {
 }
 
 .help-block {
+  display: block;
   margin-top: 5px;
   margin-bottom: 0;
   color: #999999;
@@ -1102,6 +1129,7 @@ select:focus:required:invalid:focus {
   border-radius: 3px 0 0 3px;
 }
 .input-append .uneditable-input {
+  border-left-color: #eee;
   border-right-color: #ccc;
 }
 .input-append .add-on {
@@ -1151,6 +1179,11 @@ select:focus:required:invalid:focus {
   display: inline-block;
   margin-bottom: 0;
 }
+.form-search .hide,
+.form-inline .hide,
+.form-horizontal .hide {
+  display: none;
+}
 
 .form-search label,
 .form-inline label,
@@ -1168,14 +1201,23 @@ select:focus:required:invalid:focus {
   vertical-align: middle;
 }
 
+.form-search .radio,
+.form-inline .radio,
+.form-search .checkbox,
+.form-inline .checkbox {
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+
 .control-group {
   margin-bottom: 9px;
 }
 
-.form-horizontal legend + .control-group {
+legend + .control-group {
   margin-top: 18px;
   -webkit-margin-top-collapse: separate;
 }
+
 .form-horizontal .control-group {
   margin-bottom: 18px;
   *zoom: 1;
@@ -1187,7 +1229,7 @@ select:focus:required:invalid:focus {
 .form-horizontal .control-group:after {
   clear: both;
 }
-.form-horizontal .control-group > label {
+.form-horizontal .control-label {
   float: left;
   width: 140px;
   padding-top: 5px;
@@ -1215,14 +1257,14 @@ table {
   padding: 8px;
   line-height: 18px;
   text-align: left;
+  vertical-align: top;
   border-top: 1px solid #ddd;
 }
 .table th {
   font-weight: bold;
-  vertical-align: bottom;
 }
-.table td {
-  vertical-align: top;
+.table thead th {
+  vertical-align: bottom;
 }
 .table thead:first-child tr th,
 .table thead:first-child tr td {
@@ -1301,6 +1343,11 @@ table {
   background-color: #f9f9f9;
 }
 
+.table tbody tr:hover td,
+.table tbody tr:hover th {
+  background-color: #f5f5f5;
+}
+
 table .span1 {
   float: none;
   width: 44px;
@@ -1362,22 +1409,25 @@ table .span12 {
   margin-left: 0;
 }
 
-[class^="icon-"] {
+[class^="icon-"],
+[class*=" icon-"] {
   display: inline-block;
   width: 14px;
   height: 14px;
+  line-height: 14px;
   vertical-align: text-top;
-  background-image: url(../img/glyphicons-halflings.png);
+  background-image: url('/img/glyphicons-halflings.png?1329865545');
   background-position: 14px 14px;
   background-repeat: no-repeat;
   *margin-right: .3em;
 }
-[class^="icon-"]:last-child {
+[class^="icon-"]:last-child,
+[class*=" icon-"]:last-child {
   *margin-left: 0;
 }
 
 .icon-white {
-  background-image: url(../img/glyphicons-halflings-white.png);
+  background-image: url('/img/glyphicons-halflings-white.png?1329865545');
 }
 
 .icon-glass {
@@ -1907,7 +1957,6 @@ table .span12 {
   float: left;
   display: none;
   min-width: 160px;
-  max-width: 220px;
   _width: 160px;
   padding: 4px 0;
   margin: 0;
@@ -2055,20 +2104,25 @@ table .span12 {
 .btn {
   display: inline-block;
   padding: 4px 10px 4px;
+  margin-bottom: 0;
   font-size: 13px;
   line-height: 18px;
   color: #333333;
   text-align: center;
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  vertical-align: middle;
   background-color: #e6e6e6;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(white), color-stop(25%, white), to(#e6e6e6));
-  background-image: -webkit-linear-gradient(white, white 25%, #e6e6e6);
-  background-image: -moz-linear-gradient(top, white, white 25%, #e6e6e6);
-  background-image: -ms-linear-gradient(white, white 25%, #e6e6e6);
-  background-image: -o-linear-gradient(white, white 25%, #e6e6e6);
-  background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  background-repeat: no-repeat;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(white), to(#e6e6e6));
+  background-image: -moz-linear-gradient(top, white, #e6e6e6);
+  background-image: -ms-linear-gradient(top, white, #e6e6e6);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #e6e6e6));
+  background-image: -webkit-linear-gradient(top, white, #e6e6e6);
+  background-image: -o-linear-gradient(top, white, #e6e6e6);
+  background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='white', endColorstr='#e6e6e6', GradientType=0);
+  border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
   border: 1px solid #ccc;
   border-bottom-color: #bbb;
   -moz-border-radius: 4px;
@@ -2081,8 +2135,15 @@ table .span12 {
   -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
   cursor: pointer;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
   *margin-left: .3em;
 }
+.btn:hover, .btn:active, .btn.active, .btn.disabled, .btn[disabled] {
+  background-color: #e6e6e6;
+}
+.btn:active, .btn.active {
+  background-color: #cccccc e("\9");
+}
 .btn:first-child {
   *margin-left: 0;
 }
@@ -2100,7 +2161,7 @@ table .span12 {
 }
 
 .btn:focus {
-  outline: thin dotted;
+  outline: thin dotted #333;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
@@ -2113,7 +2174,6 @@ table .span12 {
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
   background-color: #e6e6e6;
   background-color: #d9d9d9 e("\9");
-  color: rgba(0, 0, 0, 0.5);
   outline: 0;
 }
 
@@ -2141,7 +2201,7 @@ table .span12 {
   border-radius: 5px;
 }
 
-.btn-large .icon {
+.btn-large [class^="icon-"] {
   margin-top: 1px;
 }
 
@@ -2151,10 +2211,16 @@ table .span12 {
   line-height: 16px;
 }
 
-.btn-small .icon {
+.btn-small [class^="icon-"] {
   margin-top: -1px;
 }
 
+.btn-mini {
+  padding: 2px 6px;
+  font-size: 11px;
+  line-height: 14px;
+}
+
 .btn-primary,
 .btn-primary:hover,
 .btn-warning,
@@ -2164,7 +2230,9 @@ table .span12 {
 .btn-success,
 .btn-success:hover,
 .btn-info,
-.btn-info:hover {
+.btn-info:hover,
+.btn-inverse,
+.btn-inverse:hover {
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   color: white;
 }
@@ -2173,7 +2241,8 @@ table .span12 {
 .btn-warning.active,
 .btn-danger.active,
 .btn-success.active,
-.btn-info.active {
+.btn-info.active,
+.btn-dark.active {
   color: rgba(255, 255, 255, 0.75);
 }
 
@@ -2282,6 +2351,27 @@ table .span12 {
   background-color: #24748c e("\9");
 }
 
+.btn-inverse {
+  background-color: #262626;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#454545), to(#262626));
+  background-image: -moz-linear-gradient(top, #454545, #262626);
+  background-image: -ms-linear-gradient(top, #454545, #262626);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #454545), color-stop(100%, #262626));
+  background-image: -webkit-linear-gradient(top, #454545, #262626);
+  background-image: -o-linear-gradient(top, #454545, #262626);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#454545', endColorstr='#262626', GradientType=0);
+  border-color: #262626 #262626 black;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-inverse:hover, .btn-inverse:active, .btn-inverse.active, .btn-inverse.disabled, .btn-inverse[disabled] {
+  background-color: #262626;
+}
+.btn-inverse:active, .btn-inverse.active {
+  background-color: #0d0d0d e("\9");
+}
+
 button.btn,
 input[type="submit"].btn {
   *padding-top: 2px;
@@ -2442,7 +2532,8 @@ input[type="submit"].btn.small {
 .btn-primary .caret,
 .btn-danger .caret,
 .btn-info .caret,
-.btn-success .caret {
+.btn-success .caret,
+.btn-inverse .caret {
   border-top-color: white;
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=75);
   opacity: 0.75;
@@ -2540,6 +2631,21 @@ input[type="submit"].btn.small {
   background-color: #eeeeee;
 }
 
+.nav .nav-header {
+  display: block;
+  padding: 3px 15px;
+  font-size: 11px;
+  font-weight: bold;
+  line-height: 18px;
+  color: #999999;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  text-transform: uppercase;
+}
+
+.nav li + .nav-header {
+  margin-top: 9px;
+}
+
 .nav-list {
   padding-left: 14px;
   padding-right: 14px;
@@ -2548,23 +2654,13 @@ input[type="submit"].btn.small {
 
 .nav-list > li > a,
 .nav-list .nav-header {
-  display: block;
-  padding: 3px 15px;
   margin-left: -15px;
   margin-right: -15px;
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
 }
 
-.nav-list .nav-header {
-  font-size: 11px;
-  font-weight: bold;
-  line-height: 18px;
-  color: #999999;
-  text-transform: uppercase;
-}
-
-.nav-list > li + .nav-header {
-  margin-top: 9px;
+.nav-list > li > a {
+  padding: 3px 15px;
 }
 
 .nav-list .active > a,
@@ -2777,6 +2873,10 @@ input[type="submit"].btn.small {
   clear: both;
 }
 
+.tab-content {
+  overflow: hidden;
+}
+
 .tabs-below .nav-tabs,
 .tabs-right .nav-tabs,
 .tabs-left .nav-tabs {
@@ -3021,6 +3121,15 @@ input[type="submit"].btn.small {
 .navbar-form input[type="radio"] {
   margin-top: 3px;
 }
+.navbar-form .input-append,
+.navbar-form .input-prepend {
+  margin-top: 6px;
+  white-space: nowrap;
+}
+.navbar-form .input-append input,
+.navbar-form .input-prepend input {
+  margin-top: 0;
+}
 
 .navbar-search {
   position: relative;
@@ -3127,7 +3236,6 @@ input[type="submit"].btn.small {
   color: white;
   text-decoration: none;
   background-color: #222222;
-  background-color: rgba(0, 0, 0, 0.5);
 }
 
 .navbar .divider-vertical {
@@ -3232,7 +3340,7 @@ input[type="submit"].btn.small {
   box-shadow: inset 0 1px 0 white;
 }
 .breadcrumb li {
-  display: inline;
+  display: inline-block;
   text-shadow: 0 1px 0 white;
 }
 .breadcrumb .divider {
@@ -3451,6 +3559,10 @@ input[type="submit"].btn.small {
   padding: 15px;
 }
 
+.modal-body .modal-form {
+  margin-bottom: 0;
+}
+
 .modal-footer {
   padding: 14px 15px 15px;
   margin-bottom: 0;
@@ -3718,11 +3830,11 @@ a.thumbnail:hover {
 }
 
 .label {
-  padding: 1px 3px 2px;
-  font-size: 9.75px;
+  padding: 2px 4px 3px;
+  font-size: 11.05px;
   font-weight: bold;
   color: white;
-  text-transform: uppercase;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   background-color: #999999;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
@@ -3732,22 +3844,43 @@ a.thumbnail:hover {
   border-radius: 3px;
 }
 
+.label:hover {
+  color: white;
+  text-decoration: none;
+}
+
 .label-important {
   background-color: #b94a48;
 }
 
+.label-important:hover {
+  background-color: #953b39;
+}
+
 .label-warning {
   background-color: #f89406;
 }
 
+.label-warning:hover {
+  background-color: #c67605;
+}
+
 .label-success {
   background-color: #468847;
 }
 
+.label-success:hover {
+  background-color: #356635;
+}
+
 .label-info {
   background-color: #3a87ad;
 }
 
+.label-info:hover {
+  background-color: #2d6987;
+}
+
 @-webkit-keyframes progress-bar-stripes {
   from {
     background-position: 0 0;
diff --git a/templates/register.html b/templates/register.html
index 0087b3e..dcfb646 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -10,7 +10,7 @@
     <section class="row-fluid">
         <div class="span4">
             {% for message in messages %}
-                <div {% if message.tags %} class="alert alert-{{ message.tags }}"{% endif %}>{{ message }}<a class="close" data-dismiss="alert">×</a></div>
+                <div {% if message.tags %}class="alert alert-{{ message.tags }}"{% endif %}>{{ message }}<a class="close" data-dismiss="alert">×</a></div>
             {% endfor %}
         </div>
     </section>