Merge lp:~james-page/horizon/theme-refresh-perms-fix into lp:~ubuntu-server-dev/horizon/havana

[James Page]

Ubuntu Theme Refresh

Fixup for incorrectly set permissions on /var/lib/openstack-dashboard (charm issue - will be resolved there as well).

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-03 12:48:45 +0000
+++ debian/changelog	2013-10-04 13:48:05 +0000
@@ -1,3 +1,13 @@
+horizon (1:2013.2~rc1-0ubuntu2) saucy; urgency=low
+
+  * d/theme/css/ubuntu.css: Refresh Ubuntu theme against new Havana
+    stylesheets, fixing network and chart layouts (LP: #1235249).
+  * d/openstack-dashboard.postinst: Allow horizon user to read and
+    write data in /var/lib/openstack-dashboard inline with user and
+    group permissions set in Apache configuration.
+
+ -- James Page <[e-mail]>  Fri, 04 Oct 2013 14:17:43 +0100
+
 horizon (1:2013.2~rc1-0ubuntu1) saucy; urgency=low
 
   [ James Page ]
 
=== modified file 'debian/openstack-dashboard.postinst'
--- debian/openstack-dashboard.postinst	2013-10-02 09:46:14 +0000
+++ debian/openstack-dashboard.postinst	2013-10-04 13:48:05 +0000
@@ -52,11 +52,11 @@
   if [ -d /var/lib/openstack-dashboard ] ; then
     # Generated secret storage for single node use - see local_settings.py
     # for more details of SECRET_KEY
-    chown root:www-data /var/lib/openstack-dashboard
-    chmod 0770 /var/lib/openstack-dashboard
+    chmod 0700 /var/lib/openstack-dashboard
     if [ -f /etc/openstack-dashboard/secret_key ]; then
       mv /etc/openstack-dashboard/secret_key /var/lib/openstack-dashboard
     fi
+    chown -R horizon:horizon /var/lib/openstack-dashboard
   fi
 fi
 
 
=== modified file 'debian/theme/css/ubuntu.css'
--- debian/theme/css/ubuntu.css	2013-04-22 13:09:18 +0000
+++ debian/theme/css/ubuntu.css	2013-10-04 13:48:05 +0000
@@ -1,12 +1,3 @@
-/*!
- * Bootstrap v2.0.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
 article,
 aside,
 details,
@@ -19,9 +10,7 @@
 section {
   display: block;
 }
-audio,
-canvas,
-video {
+audio, canvas, video {
   display: inline-block;
   *display: inline;
   *zoom: 1;
@@ -35,16 +24,14 @@
   -ms-text-size-adjust: 100%;
 }
 a:focus {
-  outline: thin dotted #333;
+  outline: thin dotted #333333;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
-a:hover,
-a:active {
+a:hover, a:active {
   outline: 0;
 }
-sub,
-sup {
+sub, sup {
   position: relative;
   font-size: 75%;
   line-height: 0;
@@ -62,28 +49,20 @@
   border: 0;
   -ms-interpolation-mode: bicubic;
 }
-button,
-input,
-select,
-textarea {
+button, input, select, textarea {
   margin: 0;
   font-size: 100%;
   vertical-align: middle;
 }
-button,
-input {
+button, input {
   *overflow: visible;
   line-height: normal;
 }
-button::-moz-focus-inner,
-input::-moz-focus-inner {
+button::-moz-focus-inner, input::-moz-focus-inner {
   padding: 0;
   border: 0;
 }
-button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"] {
+button, input[type="button"], input[type="reset"], input[type="submit"] {
   cursor: pointer;
   -webkit-appearance: button;
 }
@@ -104,8 +83,7 @@
 .clearfix {
   *zoom: 1;
 }
-.clearfix:before,
-.clearfix:after {
+.clearfix:before, .clearfix:after {
   display: table;
   content: "";
 }
@@ -132,8 +110,7 @@
   margin-left: -20px;
   *zoom: 1;
 }
-.row:before,
-.row:after {
+.row:before, .row:after {
   display: table;
   content: "";
 }
@@ -177,8 +154,7 @@
 .span11 {
   width: 860px;
 }
-.span12,
-.container {
+.span12, .container {
   width: 940px;
 }
 .offset1 {
@@ -218,8 +194,7 @@
   width: 100%;
   *zoom: 1;
 }
-.row-fluid:before,
-.row-fluid:after {
+.row-fluid:before, .row-fluid:after {
   display: table;
   content: "";
 }
@@ -249,25 +224,25 @@
   width: 40.425531911%;
 }
 .row-fluid > .span6 {
-  width: 48.93617020799999%;
+  width: 48.936170208%;
 }
 .row-fluid > .span7 {
   width: 57.446808505%;
 }
 .row-fluid > .span8 {
-  width: 65.95744680199999%;
+  width: 65.957446802%;
 }
 .row-fluid > .span9 {
   width: 74.468085099%;
 }
 .row-fluid > .span10 {
-  width: 82.97872339599999%;
+  width: 82.978723396%;
 }
 .row-fluid > .span11 {
   width: 91.489361693%;
 }
 .row-fluid > .span12 {
-  width: 99.99999998999999%;
+  width: 99.99999999%;
 }
 .container {
   width: 940px;
@@ -275,8 +250,7 @@
   margin-right: auto;
   *zoom: 1;
 }
-.container:before,
-.container:after {
+.container:before, .container:after {
   display: table;
   content: "";
 }
@@ -288,8 +262,7 @@
   padding-right: 20px;
   *zoom: 1;
 }
-.container-fluid:before,
-.container-fluid:after {
+.container-fluid:before, .container-fluid:after {
   display: table;
   content: "";
 }
@@ -312,23 +285,13 @@
   font-weight: 200;
   line-height: 27px;
 }
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
+h1, h2, h3, h4, h5, h6 {
   margin: 0;
   font-weight: bold;
   color: #333333;
   text-rendering: optimizelegibility;
 }
-h1 small,
-h2 small,
-h3 small,
-h4 small,
-h5 small,
-h6 small {
+h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
   font-weight: normal;
   color: #999999;
 }
@@ -353,9 +316,7 @@
 h3 small {
   font-size: 14px;
 }
-h4,
-h5,
-h6 {
+h4, h5, h6 {
   line-height: 18px;
 }
 h4 {
@@ -380,15 +341,11 @@
 .page-header h1 {
   line-height: 1;
 }
-ul,
-ol {
+ul, ol {
   padding: 0;
   margin: 0 0 9px 25px;
 }
-ul ul,
-ul ol,
-ol ol,
-ol ul {
+ul ul, ul ol, ol ol, ol ul {
   margin-bottom: 0;
 }
 ul {
@@ -400,8 +357,7 @@
 li {
   line-height: 18px;
 }
-ul.unstyled,
-ol.unstyled {
+ul.unstyled, ol.unstyled {
   margin-left: 0;
   list-style: none;
 }
@@ -412,8 +368,7 @@
 dl {
   margin-bottom: 18px;
 }
-dt,
-dd {
+dt, dd {
   line-height: 18px;
 }
 dt {
@@ -440,7 +395,7 @@
 abbr {
   font-size: 90%;
   text-transform: uppercase;
-  border-bottom: 1px dotted #ddd;
+  border-bottom: 1px dotted #dddddd;
   cursor: help;
 }
 blockquote {
@@ -469,14 +424,10 @@
   border-left: 0;
   border-right: 5px solid #eeeeee;
 }
-blockquote.pull-right p,
-blockquote.pull-right small {
+blockquote.pull-right p, blockquote.pull-right small {
   text-align: right;
 }
-q:before,
-q:after,
-blockquote:before,
-blockquote:after {
+q:before, q:after, blockquote:before, blockquote:after {
   content: "";
 }
 address {
@@ -491,8 +442,7 @@
 cite {
   font-style: normal;
 }
-code,
-pre {
+code, pre {
   padding: 0 3px 2px;
   font-family: Menlo, Monaco, "Courier New", monospace;
   font-size: 12px;
@@ -503,7 +453,7 @@
 }
 code {
   padding: 3px 4px;
-  color: #d14;
+  color: #dd1144;
   background-color: #f7f7f9;
   border: 1px solid #e1e1e8;
 }
@@ -514,8 +464,8 @@
   font-size: 12px;
   line-height: 18px;
   background-color: #f5f5f5;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.15);
+  border: 1px solid #cccccc;
+  border: 1px solid rgba(0,0,0,.15);
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
@@ -554,25 +504,18 @@
   line-height: 36px;
   color: #333333;
   border: 0;
-  border-bottom: 1px solid #eee;
+  border-bottom: 1px solid #eeeeee;
 }
 legend small {
   font-size: 13.5px;
   color: #999999;
 }
-label,
-input,
-button,
-select,
-textarea {
+label, input, button, select, textarea {
   font-size: 13px;
   font-weight: normal;
   line-height: 18px;
 }
-input,
-button,
-select,
-textarea {
+input, button, select, textarea {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
 label {
@@ -580,10 +523,7 @@
   margin-bottom: 5px;
   color: #333333;
 }
-input,
-textarea,
-select,
-.uneditable-input {
+input, textarea, select, .uneditable-input {
   display: inline-block;
   width: 210px;
   height: 18px;
@@ -592,7 +532,7 @@
   font-size: 13px;
   line-height: 18px;
   color: #555555;
-  border: 1px solid #ccc;
+  border: 1px solid #cccccc;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
@@ -601,29 +541,21 @@
   width: auto;
   height: auto;
 }
-label input,
-label textarea,
-label select {
+label input, label textarea, label select {
   display: block;
 }
-input[type="image"],
-input[type="checkbox"],
-input[type="radio"] {
+input[type="image"], input[type="checkbox"], input[type="radio"] {
   width: auto;
   height: auto;
   padding: 0;
   margin: 3px 0;
   *margin-top: 0;
-  /* IE7 */
-
   line-height: normal;
   cursor: pointer;
   -webkit-border-radius: 0;
   -moz-border-radius: 0;
   border-radius: 0;
   border: 0 \9;
-  /* IE9 and down */
-
 }
 input[type="image"] {
   border: 0;
@@ -639,20 +571,13 @@
   -moz-box-shadow: none;
   box-shadow: none;
 }
-input[type="button"],
-input[type="reset"],
-input[type="submit"] {
+input[type="button"], input[type="reset"], input[type="submit"] {
   width: auto;
   height: auto;
 }
-select,
-input[type="file"] {
+select, input[type="file"] {
   height: 28px;
-  /* In IE7, the height of the select element cannot be changed by height, only font-size */
-
   *margin-top: 4px;
-  /* For IE7, add top margin to align select with labels */
-
   line-height: 28px;
 }
 input[type="file"] {
@@ -662,8 +587,7 @@
   width: 220px;
   background-color: #ffffff;
 }
-select[multiple],
-select[size] {
+select[multiple], select[size] {
   height: auto;
 }
 input[type="image"] {
@@ -677,51 +601,42 @@
 input[type="hidden"] {
   display: none;
 }
-.radio,
-.checkbox {
+.radio, .checkbox {
   padding-left: 18px;
 }
-.radio input[type="radio"],
-.checkbox input[type="checkbox"] {
+.radio input[type="radio"], .checkbox input[type="checkbox"] {
   float: left;
   margin-left: -18px;
 }
-.controls > .radio:first-child,
-.controls > .checkbox:first-child {
+.controls > .radio:first-child, .controls > .checkbox:first-child {
   padding-top: 5px;
 }
-.radio.inline,
-.checkbox.inline {
+.radio.inline, .checkbox.inline {
   display: inline-block;
   padding-top: 5px;
   margin-bottom: 0;
   vertical-align: middle;
 }
-.radio.inline + .radio.inline,
-.checkbox.inline + .checkbox.inline {
+.radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline {
   margin-left: 10px;
 }
-input,
-textarea {
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
-  -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
-  -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
-  -o-transition: border linear 0.2s, box-shadow linear 0.2s;
-  transition: border linear 0.2s, box-shadow linear 0.2s;
+input, textarea {
+  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
+  -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
+  box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
+  -webkit-transition: border linear .2s, box-shadow linear .2s;
+  -moz-transition: border linear .2s, box-shadow linear .2s;
+  -ms-transition: border linear .2s, box-shadow linear .2s;
+  -o-transition: border linear .2s, box-shadow linear .2s;
+  transition: border linear .2s, box-shadow linear .2s;
 }
-input:focus,
-textarea:focus {
-  border-color: rgba(82, 168, 236, 0.8);
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+input:focus, textarea:focus {
+  border-color: rgba(82,168,236,.8);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+  -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+  box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
   outline: 0;
   outline: thin dotted \9;
-  /* IE6-9 */
-
 }
 input[type="file"]:focus,
 input[type="radio"]:focus,
@@ -730,7 +645,7 @@
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
   box-shadow: none;
-  outline: thin dotted #333;
+  outline: thin dotted #333333;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
@@ -759,64 +674,40 @@
   float: none;
   margin-left: 0;
 }
-input.span1,
-textarea.span1,
-.uneditable-input.span1 {
+input.span1, textarea.span1, .uneditable-input.span1 {
   width: 50px;
 }
-input.span2,
-textarea.span2,
-.uneditable-input.span2 {
+input.span2, textarea.span2, .uneditable-input.span2 {
   width: 130px;
 }
-input.span3,
-textarea.span3,
-.uneditable-input.span3 {
+input.span3, textarea.span3, .uneditable-input.span3 {
   width: 210px;
 }
-input.span4,
-textarea.span4,
-.uneditable-input.span4 {
+input.span4, textarea.span4, .uneditable-input.span4 {
   width: 290px;
 }
-input.span5,
-textarea.span5,
-.uneditable-input.span5 {
+input.span5, textarea.span5, .uneditable-input.span5 {
   width: 370px;
 }
-input.span6,
-textarea.span6,
-.uneditable-input.span6 {
+input.span6, textarea.span6, .uneditable-input.span6 {
   width: 450px;
 }
-input.span7,
-textarea.span7,
-.uneditable-input.span7 {
+input.span7, textarea.span7, .uneditable-input.span7 {
   width: 530px;
 }
-input.span8,
-textarea.span8,
-.uneditable-input.span8 {
+input.span8, textarea.span8, .uneditable-input.span8 {
   width: 610px;
 }
-input.span9,
-textarea.span9,
-.uneditable-input.span9 {
+input.span9, textarea.span9, .uneditable-input.span9 {
   width: 690px;
 }
-input.span10,
-textarea.span10,
-.uneditable-input.span10 {
+input.span10, textarea.span10, .uneditable-input.span10 {
   width: 770px;
 }
-input.span11,
-textarea.span11,
-.uneditable-input.span11 {
+input.span11, textarea.span11, .uneditable-input.span11 {
   width: 850px;
 }
-input.span12,
-textarea.span12,
-.uneditable-input.span12 {
+input.span12, textarea.span12, .uneditable-input.span12 {
   width: 930px;
 }
 input[disabled],
@@ -826,18 +717,18 @@
 select[readonly],
 textarea[readonly] {
   background-color: #f5f5f5;
-  border-color: #ddd;
+  border-color: #dddddd;
   cursor: not-allowed;
 }
 .control-group.warning > label,
 .control-group.warning .help-block,
 .control-group.warning .help-inline {
-  color: #c09853;
+  color: #333333;
 }
 .control-group.warning input,
 .control-group.warning select,
 .control-group.warning textarea {
-  color: #c09853;
+  color: #333333;
   border-color: #c09853;
 }
 .control-group.warning input:focus,
@@ -850,19 +741,19 @@
 }
 .control-group.warning .input-prepend .add-on,
 .control-group.warning .input-append .add-on {
-  color: #c09853;
+  color: #333333;
   background-color: #fcf8e3;
-  border-color: #c09853;
+  border-color: #333333;
 }
 .control-group.error > label,
 .control-group.error .help-block,
 .control-group.error .help-inline {
-  color: #b94a48;
+  color: #333333;
 }
 .control-group.error input,
 .control-group.error select,
 .control-group.error textarea {
-  color: #b94a48;
+  color: #333333;
   border-color: #b94a48;
 }
 .control-group.error input:focus,
@@ -875,19 +766,19 @@
 }
 .control-group.error .input-prepend .add-on,
 .control-group.error .input-append .add-on {
-  color: #b94a48;
+  color: #333333;
   background-color: #f2dede;
-  border-color: #b94a48;
+  border-color: #333333;
 }
 .control-group.success > label,
 .control-group.success .help-block,
 .control-group.success .help-inline {
-  color: #468847;
+  color: #333333;
 }
 .control-group.success input,
 .control-group.success select,
 .control-group.success textarea {
-  color: #468847;
+  color: #333333;
   border-color: #468847;
 }
 .control-group.success input:focus,
@@ -900,9 +791,9 @@
 }
 .control-group.success .input-prepend .add-on,
 .control-group.success .input-append .add-on {
-  color: #468847;
+  color: #333333;
   background-color: #dff0d8;
-  border-color: #468847;
+  border-color: #333333;
 }
 input:focus:required:invalid,
 textarea:focus:required:invalid,
@@ -923,15 +814,15 @@
   margin-top: 18px;
   margin-bottom: 18px;
   background-color: #f5f5f5;
-  border-top: 1px solid #ddd;
+  border-top: 1px solid #dddddd;
 }
 .uneditable-input {
   display: block;
   background-color: #ffffff;
-  border-color: #eee;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+  border-color: #eeeeee;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.025);
+  -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.025);
+  box-shadow: inset 0 1px 2px rgba(0,0,0,.025);
   cursor: not-allowed;
 }
 :-moz-placeholder {
@@ -949,50 +840,44 @@
 .help-inline {
   display: inline-block;
   *display: inline;
-  /* IE7 inline-block hack */
-
   *zoom: 1;
   margin-bottom: 9px;
   vertical-align: middle;
   padding-left: 5px;
 }
-.input-prepend,
-.input-append {
+.input-prepend, .input-append {
   margin-bottom: 5px;
   *zoom: 1;
 }
 .input-prepend:before,
+.input-prepend:after,
 .input-append:before,
-.input-prepend:after,
 .input-append:after {
   display: table;
   content: "";
 }
-.input-prepend:after,
-.input-append:after {
+.input-prepend:after, .input-append:after {
   clear: both;
 }
 .input-prepend input,
+.input-prepend .uneditable-input,
 .input-append input,
-.input-prepend .uneditable-input,
 .input-append .uneditable-input {
   -webkit-border-radius: 0 3px 3px 0;
   -moz-border-radius: 0 3px 3px 0;
   border-radius: 0 3px 3px 0;
 }
 .input-prepend input:focus,
+.input-prepend .uneditable-input:focus,
 .input-append input:focus,
-.input-prepend .uneditable-input:focus,
 .input-append .uneditable-input:focus {
   position: relative;
   z-index: 2;
 }
-.input-prepend .uneditable-input,
-.input-append .uneditable-input {
-  border-left-color: #ccc;
+.input-prepend .uneditable-input, .input-append .uneditable-input {
+  border-left-color: #cccccc;
 }
-.input-prepend .add-on,
-.input-append .add-on {
+.input-prepend .add-on, .input-append .add-on {
   float: left;
   display: block;
   width: auto;
@@ -1006,31 +891,27 @@
   text-align: center;
   text-shadow: 0 1px 0 #ffffff;
   background-color: #f5f5f5;
-  border: 1px solid #ccc;
+  border: 1px solid #cccccc;
   -webkit-border-radius: 3px 0 0 3px;
   -moz-border-radius: 3px 0 0 3px;
   border-radius: 3px 0 0 3px;
 }
-.input-prepend .active,
-.input-append .active {
+.input-prepend .active, .input-append .active {
   background-color: #a9dba9;
   border-color: #46a546;
 }
 .input-prepend .add-on {
   *margin-top: 1px;
-  /* IE6-7 */
-
 }
-.input-append input,
-.input-append .uneditable-input {
+.input-append input, .input-append .uneditable-input {
   float: left;
   -webkit-border-radius: 3px 0 0 3px;
   -moz-border-radius: 3px 0 0 3px;
   border-radius: 3px 0 0 3px;
 }
 .input-append .uneditable-input {
-  border-left-color: #eee;
-  border-right-color: #ccc;
+  border-left-color: #eeeeee;
+  border-right-color: #cccccc;
 }
 .input-append .add-on {
   margin-right: 0;
@@ -1054,26 +935,24 @@
   border-radius: 14px;
 }
 .form-search input,
-.form-inline input,
-.form-horizontal input,
 .form-search textarea,
+.form-search select,
+.form-search .help-inline,
+.form-search .uneditable-input,
+.form-inline input,
 .form-inline textarea,
+.form-inline select,
+.form-inline .help-inline,
+.form-inline .uneditable-input,
+.form-horizontal input,
 .form-horizontal textarea,
-.form-search select,
-.form-inline select,
 .form-horizontal select,
-.form-search .help-inline,
-.form-inline .help-inline,
 .form-horizontal .help-inline,
-.form-search .uneditable-input,
-.form-inline .uneditable-input,
 .form-horizontal .uneditable-input {
   display: inline-block;
   margin-bottom: 0;
 }
-.form-search .hide,
-.form-inline .hide,
-.form-horizontal .hide {
+.form-search .hide, .form-inline .hide, .form-horizontal .hide {
   display: none;
 }
 .form-search label,
@@ -1108,8 +987,7 @@
   margin-bottom: 18px;
   *zoom: 1;
 }
-.form-horizontal .control-group:before,
-.form-horizontal .control-group:after {
+.form-horizontal .control-group:before, .form-horizontal .control-group:after {
   display: table;
   content: "";
 }
@@ -1137,13 +1015,12 @@
   width: 100%;
   margin-bottom: 18px;
 }
-.table th,
-.table td {
+.table th, .table td {
   padding: 8px;
   line-height: 18px;
   text-align: left;
   vertical-align: top;
-  border-top: 1px solid #ddd;
+  border-top: 1px solid #dddddd;
 }
 .table th {
   font-weight: bold;
@@ -1151,19 +1028,17 @@
 .table thead th {
   vertical-align: bottom;
 }
-.table thead:first-child tr th,
-.table thead:first-child tr td {
+.table thead:first-child tr th, .table thead:first-child tr td {
   border-top: 0;
 }
 .table tbody + tbody {
-  border-top: 2px solid #ddd;
+  border-top: 2px solid #dddddd;
 }
-.table-condensed th,
-.table-condensed td {
+.table-condensed th, .table-condensed td {
   padding: 4px 5px;
 }
 .table-bordered {
-  border: 1px solid #ddd;
+  border: 1px solid #dddddd;
   border-collapse: separate;
   *border-collapse: collapsed;
   -webkit-border-radius: 4px;
@@ -1174,7 +1049,7 @@
 .table-bordered td + td,
 .table-bordered th + td,
 .table-bordered td + th {
-  border-left: 1px solid #ddd;
+  border-left: 1px solid #dddddd;
 }
 .table-bordered thead:first-child tr:first-child th,
 .table-bordered tbody:first-child tr:first-child th,
@@ -1205,12 +1080,10 @@
   -moz-border-radius: 0 0 4px 0;
   border-radius: 0 0 4px 0;
 }
-.table-striped tbody tr:nth-child(odd) td,
-.table-striped tbody tr:nth-child(odd) th {
+.table-striped tbody tr:nth-child(odd)td, .table-striped tbody tr:nth-child(odd)th {
   background-color: #f9f9f9;
 }
-.table tbody tr:hover td,
-.table tbody tr:hover th {
+.table tbody tr:hover td, .table tbody tr:hover th {
   background-color: #f5f5f5;
 }
 table .span1 {
@@ -1273,27 +1146,25 @@
   width: 924px;
   margin-left: 0;
 }
-[class^="icon-"],
-[class*=" icon-"] {
+[class^="icon-"], [class*=" icon-"] {
   display: inline-block;
   width: 14px;
   height: 14px;
   line-height: 14px;
   vertical-align: text-top;
-  xbackground-image: url('/static/bootstrap/img/glyphicons-halflings.png?531d4b607365');
+  background-image: url('/static/bootstrap/img/glyphicons-halflings.png');
   background-position: 14px 14px;
   background-repeat: no-repeat;
   *margin-right: .3em;
 }
-[class^="icon-"]:last-child,
-[class*=" icon-"]:last-child {
+[class^="icon-"]:last-child, [class*=" icon-"]:last-child {
   *margin-left: 0;
 }
 .icon-white {
-  xbackground-image: url('/static/bootstrap/img/glyphicons-halflings-white.png?11118ae8db79');
+  background-image: url('/static/bootstrap/img/glyphicons-halflings-white.png');
 }
 .icon-glass {
-  background-position: 0      0;
+  background-position: 0 0;
 }
 .icon-music {
   background-position: -24px 0;
@@ -1658,8 +1529,7 @@
 .dropdown-toggle {
   *margin-bottom: -3px;
 }
-.dropdown-toggle:active,
-.open .dropdown-toggle {
+.dropdown-toggle:active, .open .dropdown-toggle {
   outline: 0;
 }
 .caret {
@@ -1680,8 +1550,7 @@
   margin-top: 8px;
   margin-left: 2px;
 }
-.dropdown:hover .caret,
-.open.dropdown .caret {
+.dropdown:hover .caret, .open.dropdown .caret {
   opacity: 1;
   filter: alpha(opacity=100);
 }
@@ -1698,16 +1567,16 @@
   margin: 0;
   list-style: none;
   background-color: #ffffff;
-  border-color: #ccc;
-  border-color: rgba(0, 0, 0, 0.2);
+  border-color: #cccccc;
+  border-color: rgba(0,0,0,.2);
   border-style: solid;
   border-width: 1px;
   -webkit-border-radius: 0 0 5px 5px;
   -moz-border-radius: 0 0 5px 5px;
   border-radius: 0 0 5px 5px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+  -moz-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+  box-shadow: 0 5px 10px rgba(0,0,0,.2);
   -webkit-background-clip: padding-box;
   -moz-background-clip: padding;
   background-clip: padding-box;
@@ -1735,7 +1604,7 @@
   font-weight: normal;
   line-height: 18px;
   color: #555555;
-  white-space: nowrap;
+  word-wrap: break-word;
 }
 .dropdown-menu li > a:hover,
 .dropdown-menu .active > a,
@@ -1749,8 +1618,8 @@
 }
 .dropdown.open .dropdown-toggle {
   color: #ffffff;
-  background: #ccc;
-  background: rgba(0, 0, 0, 0.3);
+  background: #cccccc;
+  background: rgba(0,0,0,.3);
 }
 .dropdown.open .dropdown-menu {
   display: block;
@@ -1766,36 +1635,36 @@
   padding: 19px;
   margin-bottom: 20px;
   background-color: #f5f5f5;
-  border: 1px solid #eee;
-  border: 1px solid rgba(0, 0, 0, 0.05);
+  border: 1px solid #eeeeee;
+  border: 1px solid rgba(0,0,0,.05);
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.05);
+  -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.05);
+  box-shadow: inset 0 1px 1px rgba(0,0,0,.05);
 }
 .well blockquote {
-  border-color: #ddd;
-  border-color: rgba(0, 0, 0, 0.15);
+  border-color: #dddddd;
+  border-color: rgba(0,0,0,.15);
 }
 .fade {
-  -webkit-transition: opacity 0.15s linear;
-  -moz-transition: opacity 0.15s linear;
-  -ms-transition: opacity 0.15s linear;
-  -o-transition: opacity 0.15s linear;
-  transition: opacity 0.15s linear;
+  -webkit-transition: opacity .15s linear;
+  -moz-transition: opacity .15s linear;
+  -ms-transition: opacity .15s linear;
+  -o-transition: opacity .15s linear;
+  transition: opacity .15s linear;
   opacity: 0;
 }
 .fade.in {
   opacity: 1;
 }
 .collapse {
-  -webkit-transition: height 0.35s ease;
-  -moz-transition: height 0.35s ease;
-  -ms-transition: height 0.35s ease;
-  -o-transition: height 0.35s ease;
-  transition: height 0.35s ease;
+  -webkit-transition: height .35s ease;
+  -moz-transition: height .35s ease;
+  -ms-transition: height .35s ease;
+  -o-transition: height .35s ease;
+  transition: height .35s ease;
   position: relative;
   overflow: hidden;
   height: 0;
@@ -1809,7 +1678,7 @@
   font-weight: bold;
   line-height: 18px;
   color: #000000;
-  text-shadow: 0 1px 0 #ffffff;
+  text-shadow: 0 1px 0 #ffffff01;
   opacity: 0.2;
   filter: alpha(opacity=20);
 }
@@ -1828,42 +1697,37 @@
   line-height: 18px;
   color: #333333;
   text-align: center;
-  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  text-shadow: 0 1px 1px rgba(255,255,255,.75);
   vertical-align: middle;
   background-color: #f5f5f5;
-  background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
-  background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: -moz-linear-gradient(top,#ffffff,#e6e6e6 );
+  background-image: -ms-linear-gradient(top,#ffffff,#e6e6e6 );
+  background-image: -webkit-gradient(linear,0 0,0 100%,from(#ffffff),to(#e6e6e6 ));
+  background-image: -webkit-linear-gradient(top,#ffffff,#e6e6e6 );
+  background-image: -o-linear-gradient(top,#ffffff,#e6e6e6 );
+  background-image: linear-gradient(top,#ffffff,#e6e6e6 );
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', 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(startColorstr='#ffffff', endColorstr='#e6e6e6 ', GradientType=0);
+  border-color: #e6e6e6  #e6e6e6  #c0c0c0;
+  border-color: rgba(0,0,0,.1)rgba(0,0,0,.1)fadein(rgba(0,0,0,.1),15%);
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  border: 1px solid #ccc;
-  border-bottom-color: #bbb;
+  border: 1px solid #cccccc;
+  border-bottom-color: #bbbbbb;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -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);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+  -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+  box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(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] {
+.btn:hover, .btn:active, .btn.active, .btn.disabled, .btn[disabled] {
   background-color: #e6e6e6;
 }
-.btn:active,
-.btn.active {
-  background-color: #cccccc \9;
+.btn:active, .btn.active {
+  background-color: #cdcdcd \9;
 }
 .btn:first-child {
   *margin-left: 0;
@@ -1873,29 +1737,27 @@
   text-decoration: none;
   background-color: #e6e6e6;
   background-position: 0 -15px;
-  -webkit-transition: background-position 0.1s linear;
-  -moz-transition: background-position 0.1s linear;
-  -ms-transition: background-position 0.1s linear;
-  -o-transition: background-position 0.1s linear;
-  transition: background-position 0.1s linear;
+  -webkit-transition: background-position .1s linear;
+  -moz-transition: background-position .1s linear;
+  -ms-transition: background-position .1s linear;
+  -o-transition: background-position .1s linear;
+  transition: background-position .1s linear;
 }
 .btn:focus {
-  outline: thin dotted #333;
+  outline: thin dotted #333333;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
-.btn.active,
-.btn:active {
+.btn.active, .btn:active {
   background-image: none;
-  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+  -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+  box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
   background-color: #e6e6e6;
   background-color: #d9d9d9 \9;
   outline: 0;
 }
-.btn.disabled,
-.btn[disabled] {
+.btn.disabled, .btn[disabled] {
   cursor: default;
   background-image: none;
   background-color: #e6e6e6;
@@ -1941,8 +1803,8 @@
 .btn-info:hover,
 .btn-inverse,
 .btn-inverse:hover {
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  color: #fff;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  color: #ffffff;
 }
 .btn-primary.active,
 .btn-warning.active,
@@ -1950,57 +1812,44 @@
 .btn-success.active,
 .btn-info.active,
 .btn-dark.active {
-  color: #fff,
-  background-color: #c44012;
-
+  color: rgba(255,255,255,.75);
 }
-
 .btn-primary {
-    color: #fff;
-    border: 1px solid #ab370f;
-    background-color: #DD4814;
-    background-image: linear-gradient(bottom, rgb(199,66,18) 0%, rgb(221,74,20) 100%);
-    background-image: -o-linear-gradient(bottom, rgb(199,66,18) 0%, rgb(221,74,20) 100%);
-    background-image: -moz-linear-gradient(bottom, rgb(199,66,18) 0%, rgb(221,74,20) 100%);
-    background-image: -webkit-linear-gradient(bottom, rgb(199,66,18) 0%, rgb(221,74,20) 100%);
-    background-image: -ms-linear-gradient(bottom, rgb(199,66,18) 0%, rgb(221,74,20) 100%);
-    -webkit-box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.2);
-    box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.2);
+  background-color: #006ccc;
+  background-image: -moz-linear-gradient(top,#dd4814,#dd4a14 );
+  background-image: -ms-linear-gradient(top,#dd4814,#dd4a14 );
+  background-image: -webkit-gradient(linear,0 0,0 100%,from(#dd4814),to(#dd4a14 ));
+  background-image: -webkit-linear-gradient(top,#dd4814,#dd4a14 );
+  background-image: -o-linear-gradient(top,#dd4814,#dd4a14 );
+  background-image: linear-gradient(top,#dd4814,#dd4a14 );
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dd4814', endColorstr='#dd4a14 ', GradientType=0);
+  border-color: #dd4a14  #dd4a14  #002a80;
+  border-color: rgba(0,0,0,.1)rgba(0,0,0,.1)fadein(rgba(0,0,0,.1),15%);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
 }
 .btn-primary:hover,
 .btn-primary:active,
 .btn-primary.active,
 .btn-primary.disabled,
 .btn-primary[disabled] {
-  background-color: #DD4814;
-}
-/*.btn-primary.active {
-  background-color: #c44012 \9;
-}*/
-$.btn-primary:active,
-.btn-primary:active {
-    background-color: #DD4814;
-    background-image: linear-gradient(bottom, rgb(199,66,18) 0%, rgb(236,94,43) 100%);
-    background-image: -o-linear-gradient(bottom, rgb(199,66,18) 0%, rgb(236,94,43) 100%);
-    background-image: -moz-linear-gradient(bottom, rgb(199,66,18) 0%, rgb(236,94,43) 100%);
-    background-image: -webkit-linear-gradient(bottom, rgb(199,66,18) 0%, rgb(236,94,43) 100%);
-    background-image: -ms-linear-gradient(bottom, rgb(199,66,18) 0%, rgb(236,94,43) 100%);
-    text-decoration: none;
-}
-
-
+  background-color: #dd4a14;
+}
+.btn-primary:active, .btn-primary.active {
+  background-color: #003399 \9;
+}
 .btn-warning {
-  background-color: #faa732;
-  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
-  background-image: -ms-linear-gradient(top, #fbb450, #f89406);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
-  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
-  background-image: -o-linear-gradient(top, #fbb450, #f89406);
-  background-image: linear-gradient(top, #fbb450, #f89406);
+  background-color: #f9a732;
+  background-image: -moz-linear-gradient(top,#fbb450 ,#f89406);
+  background-image: -ms-linear-gradient(top,#fbb450 ,#f89406);
+  background-image: -webkit-gradient(linear,0 0,0 100%,from(#fbb450 ),to(#f89406));
+  background-image: -webkit-linear-gradient(top,#fbb450 ,#f89406);
+  background-image: -o-linear-gradient(top,#fbb450 ,#f89406);
+  background-image: linear-gradient(top,#fbb450 ,#f89406);
   background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450 ', endColorstr='#f89406', GradientType=0);
   border-color: #f89406 #f89406 #ad6704;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  border-color: rgba(0,0,0,.1)rgba(0,0,0,.1)fadein(rgba(0,0,0,.1),15%);
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
 }
 .btn-warning:hover,
@@ -2010,22 +1859,21 @@
 .btn-warning[disabled] {
   background-color: #f89406;
 }
-.btn-warning:active,
-.btn-warning.active {
+.btn-warning:active, .btn-warning.active {
   background-color: #c67605 \9;
 }
 .btn-danger {
-  background-color: #da4f49;
-  background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
-  background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: linear-gradient(top, #ee5f5b, #bd362f);
+  background-color: #da4e49;
+  background-image: -moz-linear-gradient(top,#ee5f5b,#bd362f);
+  background-image: -ms-linear-gradient(top,#ee5f5b,#bd362f);
+  background-image: -webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));
+  background-image: -webkit-linear-gradient(top,#ee5f5b,#bd362f);
+  background-image: -o-linear-gradient(top,#ee5f5b,#bd362f);
+  background-image: linear-gradient(top,#ee5f5b,#bd362f);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);
   border-color: #bd362f #bd362f #802420;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  border-color: rgba(0,0,0,.1)rgba(0,0,0,.1)fadein(rgba(0,0,0,.1),15%);
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
 }
 .btn-danger:hover,
@@ -2035,22 +1883,21 @@
 .btn-danger[disabled] {
   background-color: #bd362f;
 }
-.btn-danger:active,
-.btn-danger.active {
+.btn-danger:active, .btn-danger.active {
   background-color: #942a25 \9;
 }
 .btn-success {
-  background-color: #5bb75b;
-  background-image: -moz-linear-gradient(top, #62c462, #51a351);
-  background-image: -ms-linear-gradient(top, #62c462, #51a351);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
-  background-image: -webkit-linear-gradient(top, #62c462, #51a351);
-  background-image: -o-linear-gradient(top, #62c462, #51a351);
-  background-image: linear-gradient(top, #62c462, #51a351);
+  background-color: #5bb65b;
+  background-image: -moz-linear-gradient(top,#62c462,#51a351);
+  background-image: -ms-linear-gradient(top,#62c462,#51a351);
+  background-image: -webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));
+  background-image: -webkit-linear-gradient(top,#62c462,#51a351);
+  background-image: -o-linear-gradient(top,#62c462,#51a351);
+  background-image: linear-gradient(top,#62c462,#51a351);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);
   border-color: #51a351 #51a351 #387038;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  border-color: rgba(0,0,0,.1)rgba(0,0,0,.1)fadein(rgba(0,0,0,.1),15%);
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
 }
 .btn-success:hover,
@@ -2060,22 +1907,21 @@
 .btn-success[disabled] {
   background-color: #51a351;
 }
-.btn-success:active,
-.btn-success.active {
+.btn-success:active, .btn-success.active {
   background-color: #408140 \9;
 }
 .btn-info {
   background-color: #49afcd;
-  background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
-  background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -moz-linear-gradient(top,#5bc0de,#2f96b4);
+  background-image: -ms-linear-gradient(top,#5bc0de,#2f96b4);
+  background-image: -webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));
+  background-image: -webkit-linear-gradient(top,#5bc0de,#2f96b4);
+  background-image: -o-linear-gradient(top,#5bc0de,#2f96b4);
+  background-image: linear-gradient(top,#5bc0de,#2f96b4);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);
   border-color: #2f96b4 #2f96b4 #1f6377;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  border-color: rgba(0,0,0,.1)rgba(0,0,0,.1)fadein(rgba(0,0,0,.1),15%);
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
 }
 .btn-info:hover,
@@ -2085,22 +1931,21 @@
 .btn-info[disabled] {
   background-color: #2f96b4;
 }
-.btn-info:active,
-.btn-info.active {
+.btn-info:active, .btn-info.active {
   background-color: #24748c \9;
 }
 .btn-inverse {
-  background-color: #393939;
-  background-image: -moz-linear-gradient(top, #454545, #262626);
-  background-image: -ms-linear-gradient(top, #454545, #262626);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#454545), to(#262626));
-  background-image: -webkit-linear-gradient(top, #454545, #262626);
-  background-image: -o-linear-gradient(top, #454545, #262626);
-  background-image: linear-gradient(top, #454545, #262626);
+  background-color: #383838;
+  background-image: -moz-linear-gradient(top,#454545,#262626);
+  background-image: -ms-linear-gradient(top,#454545,#262626);
+  background-image: -webkit-gradient(linear,0 0,0 100%,from(#454545),to(#262626));
+  background-image: -webkit-linear-gradient(top,#454545,#262626);
+  background-image: -o-linear-gradient(top,#454545,#262626);
+  background-image: linear-gradient(top,#454545,#262626);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#454545', endColorstr='#262626', GradientType=0);
   border-color: #262626 #262626 #000000;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  border-color: rgba(0,0,0,.1)rgba(0,0,0,.1)fadein(rgba(0,0,0,.1),15%);
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
 }
 .btn-inverse:hover,
@@ -2110,27 +1955,22 @@
 .btn-inverse[disabled] {
   background-color: #262626;
 }
-.btn-inverse:active,
-.btn-inverse.active {
+.btn-inverse:active, .btn-inverse.active {
   background-color: #0c0c0c \9;
 }
-button.btn,
-input[type="submit"].btn {
+button.btn, input[type="submit"].btn {
   *padding-top: 2px;
   *padding-bottom: 2px;
 }
-button.btn::-moz-focus-inner,
-input[type="submit"].btn::-moz-focus-inner {
+button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner {
   padding: 0;
   border: 0;
 }
-button.btn.large,
-input[type="submit"].btn.large {
+button.btn.large, input[type="submit"].btn.large {
   *padding-top: 7px;
   *padding-bottom: 7px;
 }
-button.btn.small,
-input[type="submit"].btn.small {
+button.btn.small, input[type="submit"].btn.small {
   *padding-top: 3px;
   *padding-bottom: 3px;
 }
@@ -2139,8 +1979,7 @@
   *zoom: 1;
   *margin-left: .3em;
 }
-.btn-group:before,
-.btn-group:after {
+.btn-group:before, .btn-group:after {
   display: table;
   content: "";
 }
@@ -2160,8 +1999,6 @@
 .btn-toolbar .btn-group {
   display: inline-block;
   *display: inline;
-  /* IE7 inline-block hack */
-
   *zoom: 1;
 }
 .btn-group .btn {
@@ -2181,8 +2018,7 @@
   -moz-border-radius-bottomleft: 4px;
   border-bottom-left-radius: 4px;
 }
-.btn-group .btn:last-child,
-.btn-group .dropdown-toggle {
+.btn-group .btn:last-child, .btn-group .dropdown-toggle {
   -webkit-border-top-right-radius: 4px;
   -moz-border-radius-topright: 4px;
   border-top-right-radius: 4px;
@@ -2199,8 +2035,7 @@
   -moz-border-radius-bottomleft: 6px;
   border-bottom-left-radius: 6px;
 }
-.btn-group .btn.large:last-child,
-.btn-group .large.dropdown-toggle {
+.btn-group .btn.large:last-child, .btn-group .large.dropdown-toggle {
   -webkit-border-top-right-radius: 6px;
   -moz-border-radius-topright: 6px;
   border-top-right-radius: 6px;
@@ -2214,16 +2049,15 @@
 .btn-group .btn.active {
   z-index: 2;
 }
-.btn-group .dropdown-toggle:active,
-.btn-group.open .dropdown-toggle {
+.btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle {
   outline: 0;
 }
 .btn-group .dropdown-toggle {
   padding-left: 8px;
   padding-right: 8px;
-  -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+  -moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+  box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
   *padding-top: 5px;
   *padding-bottom: 5px;
 }
@@ -2239,16 +2073,15 @@
 }
 .btn-group.open .dropdown-toggle {
   background-image: none;
-  -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -webkit-box-shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+  -moz-box-shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+  box-shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
 }
 .btn .caret {
   margin-top: 7px;
   margin-left: 0;
 }
-.btn:hover .caret,
-.open.btn-group .caret {
+.btn:hover .caret, .open.btn-group .caret {
   opacity: 1;
   filter: alpha(opacity=100);
 }
@@ -2267,15 +2100,14 @@
 .alert {
   padding: 8px 35px 8px 14px;
   margin-bottom: 18px;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  text-shadow: 0 1px 0 rgba(255,255,255,.5);
   background-color: #fcf8e3;
-  border: 1px solid #fbeed5;
+  border: 1px solid #fbefd5;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
 }
-.alert,
-.alert-heading {
+.alert, .alert-heading {
   color: #c09853;
 }
 .alert .close {
@@ -2288,12 +2120,10 @@
   background-color: #dff0d8;
   border-color: #d6e9c6;
 }
-.alert-success,
-.alert-success .alert-heading {
+.alert-success, .alert-success .alert-heading {
   color: #468847;
 }
-.alert-danger,
-.alert-error {
+.alert-danger, .alert-error {
   background-color: #f2dede;
   border-color: #eed3d7;
 }
@@ -2307,16 +2137,14 @@
   background-color: #d9edf7;
   border-color: #bce8f1;
 }
-.alert-info,
-.alert-info .alert-heading {
+.alert-info, .alert-info .alert-heading {
   color: #3a87ad;
 }
 .alert-block {
   padding-top: 14px;
   padding-bottom: 14px;
 }
-.alert-block > p,
-.alert-block > ul {
+.alert-block > p, .alert-block > ul {
   margin-bottom: 0;
 }
 .alert-block p + p {
@@ -2341,7 +2169,7 @@
   font-weight: bold;
   line-height: 18px;
   color: #999999;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  text-shadow: 0 1px 0 rgba(255,255,255,.5);
   text-transform: uppercase;
 }
 .nav li + .nav-header {
@@ -2352,52 +2180,43 @@
   padding-right: 14px;
   margin-bottom: 0;
 }
-.nav-list > li > a,
-.nav-list .nav-header {
+.nav-list > li > a, .nav-list .nav-header {
   margin-left: -15px;
   margin-right: -15px;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  text-shadow: 0 1px 0 rgba(255,255,255,.5);
 }
 .nav-list > li > a {
   padding: 3px 15px;
 }
-.nav-list .active > a,
-.nav-list .active > a:hover {
+.nav-list .active > a, .nav-list .active > a:hover {
   color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
-  background-color: #0088cc;
+  text-shadow: 0 -1px 0 rgba(0,0,0,.2);
+  background-color: #dd4814;
 }
 .nav-list [class^="icon-"] {
   margin-right: 2px;
 }
-.nav-tabs,
-.nav-pills {
+.nav-tabs, .nav-pills {
   *zoom: 1;
 }
-.nav-tabs:before,
-.nav-pills:before,
-.nav-tabs:after,
-.nav-pills:after {
+.nav-tabs:before, .nav-tabs:after, .nav-pills:before, .nav-pills:after {
   display: table;
   content: "";
 }
-.nav-tabs:after,
-.nav-pills:after {
+.nav-tabs:after, .nav-pills:after {
   clear: both;
 }
-.nav-tabs > li,
-.nav-pills > li {
+.nav-tabs > li, .nav-pills > li {
   float: left;
 }
-.nav-tabs > li > a,
-.nav-pills > li > a {
+.nav-tabs > li > a, .nav-pills > li > a {
   padding-right: 12px;
   padding-left: 12px;
   margin-right: 2px;
   line-height: 14px;
 }
 .nav-tabs {
-  border-bottom: 1px solid #ddd;
+  border-bottom: 1px solid #dddddd;
 }
 .nav-tabs > li {
   margin-bottom: -1px;
@@ -2413,11 +2232,10 @@
 .nav-tabs > li > a:hover {
   border-color: #eeeeee #eeeeee #dddddd;
 }
-.nav-tabs > .active > a,
-.nav-tabs > .active > a:hover {
+.nav-tabs > .active > a, .nav-tabs > .active > a:hover {
   color: #555555;
   background-color: #ffffff;
-  border: 1px solid #ddd;
+  border: 1px solid #dddddd;
   border-bottom-color: transparent;
   cursor: default;
 }
@@ -2430,10 +2248,9 @@
   -moz-border-radius: 5px;
   border-radius: 5px;
 }
-.nav-pills .active > a,
-.nav-pills .active > a:hover {
+.nav-pills .active > a, .nav-pills .active > a:hover {
   color: #ffffff;
-  background-color: #0088cc;
+  background-color: #dd4814;
 }
 .nav-stacked > li {
   float: none;
@@ -2445,7 +2262,7 @@
   border-bottom: 0;
 }
 .nav-tabs.nav-stacked > li > a {
-  border: 1px solid #ddd;
+  border: 1px solid #dddddd;
   -webkit-border-radius: 0;
   -moz-border-radius: 0;
   border-radius: 0;
@@ -2461,7 +2278,7 @@
   border-radius: 0 0 4px 4px;
 }
 .nav-tabs.nav-stacked > li > a:hover {
-  border-color: #ddd;
+  border-color: #dddddd;
   z-index: 2;
 }
 .nav-pills.nav-stacked > li > a {
@@ -2470,8 +2287,7 @@
 .nav-pills.nav-stacked > li:last-child > a {
   margin-bottom: 1px;
 }
-.nav-tabs .dropdown-menu,
-.nav-pills .dropdown-menu {
+.nav-tabs .dropdown-menu, .nav-pills .dropdown-menu {
   margin-top: 1px;
   border-width: 1px;
 }
@@ -2480,14 +2296,12 @@
   -moz-border-radius: 4px;
   border-radius: 4px;
 }
-.nav-tabs .dropdown-toggle .caret,
-.nav-pills .dropdown-toggle .caret {
-  border-top-color: #0088cc;
+.nav-tabs .dropdown-toggle .caret, .nav-pills .dropdown-toggle .caret {
+  border-top-color: #dd4814;
   margin-top: 6px;
 }
-.nav-tabs .dropdown-toggle:hover .caret,
-.nav-pills .dropdown-toggle:hover .caret {
-  border-top-color: #005580;
+.nav-tabs .dropdown-toggle:hover .caret, .nav-pills .dropdown-toggle:hover .caret {
+  border-top-color: #dd4814;
 }
 .nav-tabs .active .dropdown-toggle .caret,
 .nav-pills .active .dropdown-toggle .caret {
@@ -2504,9 +2318,7 @@
   background-color: #999999;
   border-color: #999999;
 }
-.nav .open .caret,
-.nav .open.active .caret,
-.nav .open a:hover .caret {
+.nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret {
   border-top-color: #ffffff;
   opacity: 1;
   filter: alpha(opacity=100);
@@ -2517,8 +2329,7 @@
 .tabbable {
   *zoom: 1;
 }
-.tabbable:before,
-.tabbable:after {
+.tabbable:before, .tabbable:after {
   display: table;
   content: "";
 }
@@ -2528,21 +2339,17 @@
 .tab-content {
   overflow: hidden;
 }
-.tabs-below .nav-tabs,
-.tabs-right .nav-tabs,
-.tabs-left .nav-tabs {
+.tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs {
   border-bottom: 0;
 }
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
+.tab-content > .tab-pane, .pill-content > .pill-pane {
   display: none;
 }
-.tab-content > .active,
-.pill-content > .active {
+.tab-content > .active, .pill-content > .active {
   display: block;
 }
 .tabs-below .nav-tabs {
-  border-top: 1px solid #ddd;
+  border-top: 1px solid #dddddd;
 }
 .tabs-below .nav-tabs > li {
   margin-top: -1px;
@@ -2555,18 +2362,15 @@
 }
 .tabs-below .nav-tabs > li > a:hover {
   border-bottom-color: transparent;
-  border-top-color: #ddd;
-}
-.tabs-below .nav-tabs .active > a,
-.tabs-below .nav-tabs .active > a:hover {
-  border-color: transparent #ddd #ddd #ddd;
-}
-.tabs-left .nav-tabs > li,
-.tabs-right .nav-tabs > li {
+  border-top-color: #dddddd;
+}
+.tabs-below .nav-tabs .active > a, .tabs-below .nav-tabs .active > a:hover {
+  border-color: transparent #dddddd #dddddd #dddddd;
+}
+.tabs-left .nav-tabs > li, .tabs-right .nav-tabs > li {
   float: none;
 }
-.tabs-left .nav-tabs > li > a,
-.tabs-right .nav-tabs > li > a {
+.tabs-left .nav-tabs > li > a, .tabs-right .nav-tabs > li > a {
   min-width: 74px;
   margin-right: 0;
   margin-bottom: 3px;
@@ -2574,7 +2378,7 @@
 .tabs-left .nav-tabs {
   float: left;
   margin-right: 19px;
-  border-right: 1px solid #ddd;
+  border-right: 1px solid #dddddd;
 }
 .tabs-left .nav-tabs > li > a {
   margin-right: -1px;
@@ -2585,15 +2389,14 @@
 .tabs-left .nav-tabs > li > a:hover {
   border-color: #eeeeee #dddddd #eeeeee #eeeeee;
 }
-.tabs-left .nav-tabs .active > a,
-.tabs-left .nav-tabs .active > a:hover {
-  border-color: #ddd transparent #ddd #ddd;
+.tabs-left .nav-tabs .active > a, .tabs-left .nav-tabs .active > a:hover {
+  border-color: #dddddd transparent #dddddd #dddddd;
   *border-right-color: #ffffff;
 }
 .tabs-right .nav-tabs {
   float: right;
   margin-left: 19px;
-  border-left: 1px solid #ddd;
+  border-left: 1px solid #dddddd;
 }
 .tabs-right .nav-tabs > li > a {
   margin-left: -1px;
@@ -2604,9 +2407,8 @@
 .tabs-right .nav-tabs > li > a:hover {
   border-color: #eeeeee #eeeeee #eeeeee #dddddd;
 }
-.tabs-right .nav-tabs .active > a,
-.tabs-right .nav-tabs .active > a:hover {
-  border-color: #ddd #ddd #ddd transparent;
+.tabs-right .nav-tabs .active > a, .tabs-right .nav-tabs .active > a:hover {
+  border-color: #dddddd #dddddd #dddddd transparent;
   *border-left-color: #ffffff;
 }
 .navbar {
@@ -2617,20 +2419,20 @@
   padding-left: 20px;
   padding-right: 20px;
   background-color: #2c2c2c;
-  background-image: -moz-linear-gradient(top, #333333, #222222);
-  background-image: -ms-linear-gradient(top, #333333, #222222);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
-  background-image: -webkit-linear-gradient(top, #333333, #222222);
-  background-image: -o-linear-gradient(top, #333333, #222222);
-  background-image: linear-gradient(top, #333333, #222222);
+  background-image: -moz-linear-gradient(top,#333333,#222222);
+  background-image: -ms-linear-gradient(top,#333333,#222222);
+  background-image: -webkit-gradient(linear,0 0,0 100%,from(#333333),to(#222222));
+  background-image: -webkit-linear-gradient(top,#333333,#222222);
+  background-image: -o-linear-gradient(top,#333333,#222222);
+  background-image: linear-gradient(top,#333333,#222222);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+  -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
+  -moz-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
+  box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
 }
 .btn-navbar {
   display: none;
@@ -2639,20 +2441,20 @@
   margin-left: 5px;
   margin-right: 5px;
   background-color: #2c2c2c;
-  background-image: -moz-linear-gradient(top, #333333, #222222);
-  background-image: -ms-linear-gradient(top, #333333, #222222);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
-  background-image: -webkit-linear-gradient(top, #333333, #222222);
-  background-image: -o-linear-gradient(top, #333333, #222222);
-  background-image: linear-gradient(top, #333333, #222222);
+  background-image: -moz-linear-gradient(top,#333333,#222222);
+  background-image: -ms-linear-gradient(top,#333333,#222222);
+  background-image: -webkit-gradient(linear,0 0,0 100%,from(#333333),to(#222222));
+  background-image: -webkit-linear-gradient(top,#333333,#222222);
+  background-image: -o-linear-gradient(top,#333333,#222222);
+  background-image: linear-gradient(top,#333333,#222222);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
   border-color: #222222 #222222 #000000;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  border-color: rgba(0,0,0,.1)rgba(0,0,0,.1)fadein(rgba(0,0,0,.1),15%);
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+  -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+  box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
 }
 .btn-navbar:hover,
 .btn-navbar:active,
@@ -2661,8 +2463,7 @@
 .btn-navbar[disabled] {
   background-color: #222222;
 }
-.btn-navbar:active,
-.btn-navbar.active {
+.btn-navbar:active, .btn-navbar.active {
   background-color: #080808 \9;
 }
 .btn-navbar .icon-bar {
@@ -2673,9 +2474,9 @@
   -webkit-border-radius: 1px;
   -moz-border-radius: 1px;
   border-radius: 1px;
-  -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
-  -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
-  box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+  -webkit-box-shadow: 0 1px 0 rgba(0,0,0,.25);
+  -moz-box-shadow: 0 1px 0 rgba(0,0,0,.25);
+  box-shadow: 0 1px 0 rgba(0,0,0,.25);
 }
 .btn-navbar .icon-bar + .icon-bar {
   margin-top: 3px;
@@ -2705,8 +2506,7 @@
   color: #ffffff;
   background-color: transparent;
 }
-.navbar .btn,
-.navbar .btn-group {
+.navbar .btn, .navbar .btn-group {
   margin-top: 5px;
 }
 .navbar .btn-group .btn {
@@ -2716,22 +2516,19 @@
   margin-bottom: 0;
   *zoom: 1;
 }
-.navbar-form:before,
-.navbar-form:after {
+.navbar-form:before, .navbar-form:after {
   display: table;
   content: "";
 }
 .navbar-form:after {
   clear: both;
 }
-.navbar-form input,
-.navbar-form select {
+.navbar-form input, .navbar-form select {
   display: inline-block;
   margin-top: 5px;
   margin-bottom: 0;
 }
-.navbar-form .radio,
-.navbar-form .checkbox {
+.navbar-form .radio, .navbar-form .checkbox {
   margin-top: 5px;
 }
 .navbar-form input[type="image"],
@@ -2739,13 +2536,11 @@
 .navbar-form input[type="radio"] {
   margin-top: 3px;
 }
-.navbar-form .input-append,
-.navbar-form .input-prepend {
+.navbar-form .input-append, .navbar-form .input-prepend {
   margin-top: 6px;
   white-space: nowrap;
 }
-.navbar-form .input-append input,
-.navbar-form .input-prepend input {
+.navbar-form .input-append input, .navbar-form .input-prepend input {
   margin-top: 0;
 }
 .navbar-search {
@@ -2761,13 +2556,13 @@
   font-weight: normal;
   line-height: 1;
   color: #ffffff;
-  color: rgba(255, 255, 255, 0.75);
-  background: #666;
-  background: rgba(255, 255, 255, 0.3);
-  border: 1px solid #111;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
-  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
+  color: rgba(255,255,255,.75);
+  background: #666666;
+  background: rgba(255,255,255,.3);
+  border: 1px solid #111111;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
+  -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
+  box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
   -webkit-transition: none;
   -moz-transition: none;
   -ms-transition: none;
@@ -2783,18 +2578,17 @@
 .navbar-search .search-query:hover {
   color: #ffffff;
   background-color: #999999;
-  background-color: rgba(255, 255, 255, 0.5);
+  background-color: rgba(255,255,255,.5);
 }
-.navbar-search .search-query:focus,
-.navbar-search .search-query.focused {
+.navbar-search .search-query:focus, .navbar-search .search-query.focused {
   padding: 5px 10px;
   color: #333333;
   text-shadow: 0 1px 0 #ffffff;
   background-color: #ffffff;
   border: 0;
-  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-  -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-  box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  -webkit-box-shadow: 0 0 3px rgba(0,0,0,.15);
+  -moz-box-shadow: 0 0 3px rgba(0,0,0,.15);
+  box-shadow: 0 0 3px rgba(0,0,0,.15);
   outline: 0;
 }
 .navbar-fixed-top {
@@ -2831,15 +2625,14 @@
   line-height: 19px;
   color: #999999;
   text-decoration: none;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
 }
 .navbar .nav > li > a:hover {
   background-color: transparent;
   color: #ffffff;
   text-decoration: none;
 }
-.navbar .nav .active > a,
-.navbar .nav .active > a:hover {
+.navbar .nav .active > a, .navbar .nav .active > a:hover {
   color: #ffffff;
   text-decoration: none;
   background-color: #222222;
@@ -2867,8 +2660,8 @@
   display: inline-block;
   border-left: 7px solid transparent;
   border-right: 7px solid transparent;
-  border-bottom: 7px solid #ccc;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
+  border-bottom: 7px solid #cccccc;
+  border-bottom-color: rgba(0,0,0,.2);
   position: absolute;
   top: -7px;
   left: 9px;
@@ -2883,8 +2676,7 @@
   top: -6px;
   left: 10px;
 }
-.navbar .nav .dropdown-toggle .caret,
-.navbar .nav .open.dropdown .caret {
+.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret {
   border-top-color: #ffffff;
 }
 .navbar .nav .active .caret {
@@ -2915,15 +2707,15 @@
   padding: 7px 14px;
   margin: 0 0 18px;
   background-color: #fbfbfb;
-  background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
-  background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));
-  background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5);
-  background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
-  background-image: linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -moz-linear-gradient(top,#ffffff,#f5f5f5);
+  background-image: -ms-linear-gradient(top,#ffffff,#f5f5f5);
+  background-image: -webkit-gradient(linear,0 0,0 100%,from(#ffffff),to(#f5f5f5));
+  background-image: -webkit-linear-gradient(top,#ffffff,#f5f5f5);
+  background-image: -o-linear-gradient(top,#ffffff,#f5f5f5);
+  background-image: linear-gradient(top,#ffffff,#f5f5f5);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);
-  border: 1px solid #ddd;
+  border: 1px solid #dddddd;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
@@ -2949,17 +2741,15 @@
 .pagination ul {
   display: inline-block;
   *display: inline;
-  /* IE7 inline-block hack */
-
   *zoom: 1;
   margin-left: 0;
   margin-bottom: 0;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+  -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05);
+  -moz-box-shadow: 0 1px 2px rgba(0,0,0,.05);
+  box-shadow: 0 1px 2px rgba(0,0,0,.05);
 }
 .pagination li {
   display: inline;
@@ -2969,19 +2759,17 @@
   padding: 0 14px;
   line-height: 34px;
   text-decoration: none;
-  border: 1px solid #ddd;
+  border: 1px solid #dddddd;
   border-left-width: 0;
 }
-.pagination a:hover,
-.pagination .active a {
+.pagination a:hover, .pagination .active a {
   background-color: #f5f5f5;
 }
 .pagination .active a {
   color: #999999;
   cursor: default;
 }
-.pagination .disabled a,
-.pagination .disabled a:hover {
+.pagination .disabled a, .pagination .disabled a:hover {
   color: #999999;
   background-color: transparent;
   cursor: default;
@@ -3010,8 +2798,7 @@
   text-align: center;
   *zoom: 1;
 }
-.pager:before,
-.pager:after {
+.pager:before, .pager:after {
   display: table;
   content: "";
 }
@@ -3024,8 +2811,8 @@
 .pager a {
   display: inline-block;
   padding: 5px 14px;
-  background-color: #fff;
-  border: 1px solid #ddd;
+  background-color: #ffffff;
+  border: 1px solid #dddddd;
   -webkit-border-radius: 15px;
   -moz-border-radius: 15px;
   border-radius: 15px;
@@ -3064,8 +2851,7 @@
 .modal-backdrop.fade {
   opacity: 0;
 }
-.modal-backdrop,
-.modal-backdrop.fade.in {
+.modal-backdrop, .modal-backdrop.fade.in {
   opacity: 0.8;
   filter: alpha(opacity=80);
 }
@@ -3079,17 +2865,15 @@
   width: 560px;
   margin: -250px 0 0 -280px;
   background-color: #ffffff;
-  border: 1px solid #999;
-  border: 1px solid rgba(0, 0, 0, 0.3);
-  *border: 1px solid #999;
-  /* IE6-7 */
-
+  border: 1px solid #999999;
+  border: 1px solid rgba(0,0,0,.3);
+  *border: 1px solid #999999;
   -webkit-border-radius: 6px;
   -moz-border-radius: 6px;
   border-radius: 6px;
-  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  -webkit-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+  -moz-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+  box-shadow: 0 3px 7px rgba(0,0,0,0.3);
   -webkit-background-clip: padding-box;
   -moz-background-clip: padding-box;
   background-clip: padding-box;
@@ -3107,7 +2891,7 @@
 }
 .modal-header {
   padding: 9px 15px;
-  border-bottom: 1px solid #eee;
+  border-bottom: 1px solid #eeeeee;
 }
 .modal-header .close {
   margin-top: 2px;
@@ -3122,7 +2906,7 @@
   padding: 14px 15px 15px;
   margin-bottom: 0;
   background-color: #f5f5f5;
-  border-top: 1px solid #ddd;
+  border-top: 1px solid #dddddd;
   -webkit-border-radius: 0 0 6px 6px;
   -moz-border-radius: 0 0 6px 6px;
   border-radius: 0 0 6px 6px;
@@ -3131,8 +2915,7 @@
   box-shadow: inset 0 1px 0 #ffffff;
   *zoom: 1;
 }
-.modal-footer:before,
-.modal-footer:after {
+.modal-footer:before, .modal-footer:after {
   display: table;
   content: "";
 }
@@ -3280,19 +3063,19 @@
   width: 280px;
   overflow: hidden;
   background: #000000;
-  background: rgba(0, 0, 0, 0.8);
+  background: rgba(0,0,0,.8);
   -webkit-border-radius: 6px;
   -moz-border-radius: 6px;
   border-radius: 6px;
-  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  -webkit-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+  -moz-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+  box-shadow: 0 3px 7px rgba(0,0,0,0.3);
 }
 .popover-title {
   padding: 9px 15px;
   line-height: 1;
   background-color: #f5f5f5;
-  border-bottom: 1px solid #eee;
+  border-bottom: 1px solid #eeeeee;
   -webkit-border-radius: 3px 3px 0 0;
   -moz-border-radius: 3px 3px 0 0;
   border-radius: 3px 3px 0 0;
@@ -3307,9 +3090,7 @@
   -moz-background-clip: padding-box;
   background-clip: padding-box;
 }
-.popover-content p,
-.popover-content ul,
-.popover-content ol {
+.popover-content p, .popover-content ul, .popover-content ol {
   margin-bottom: 0;
 }
 .thumbnails {
@@ -3317,8 +3098,7 @@
   list-style: none;
   *zoom: 1;
 }
-.thumbnails:before,
-.thumbnails:after {
+.thumbnails:before, .thumbnails:after {
   display: table;
   content: "";
 }
@@ -3333,19 +3113,19 @@
   display: block;
   padding: 4px;
   line-height: 1;
-  border: 1px solid #ddd;
+  border: 1px solid #dddddd;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
-  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
-  -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
+  -webkit-box-shadow: 0 1px 1px rgba(0,0,0,.075);
+  -moz-box-shadow: 0 1px 1px rgba(0,0,0,.075);
+  box-shadow: 0 1px 1px rgba(0,0,0,.075);
 }
 a.thumbnail:hover {
-  border-color: #0088cc;
-  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-  -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-  box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+  border-color: #dd4814;
+  -webkit-box-shadow: 0 1px 4px rgba(0,105,214,.25);
+  -moz-box-shadow: 0 1px 4px rgba(0,105,214,.25);
+  box-shadow: 0 1px 4px rgba(0,105,214,.25);
 }
 .thumbnail > img {
   display: block;
@@ -3358,10 +3138,10 @@
 }
 .label {
   padding: 2px 4px 3px;
-  font-size: 11.049999999999999px;
+  font-size: 11.05px;
   font-weight: bold;
   color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
   background-color: #999999;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
@@ -3423,18 +3203,18 @@
   overflow: hidden;
   height: 18px;
   margin-bottom: 18px;
-  background-color: #f7f7f7;
-  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
-  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-color: #f6f6f6;
+  background-image: -moz-linear-gradient(top,#f5f5f5,#f9f9f9);
+  background-image: -ms-linear-gradient(top,#f5f5f5,#f9f9f9);
+  background-image: -webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));
+  background-image: -webkit-linear-gradient(top,#f5f5f5,#f9f9f9);
+  background-image: -o-linear-gradient(top,#f5f5f5,#f9f9f9);
+  background-image: linear-gradient(top,#f5f5f5,#f9f9f9);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1);
+  -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1);
+  box-shadow: inset 0 1px 2px rgba(0,0,0,.1);
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
@@ -3445,36 +3225,36 @@
   color: #ffffff;
   font-size: 12px;
   text-align: center;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #0e90d2;
-  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
-  background-image: -ms-linear-gradient(top, #149bdf, #0480be);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
-  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
-  background-image: -o-linear-gradient(top, #149bdf, #0480be);
-  background-image: linear-gradient(top, #149bdf, #0480be);
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  background-color: #0d90d1;
+  background-image: -moz-linear-gradient(top,#149bdf,#0480be);
+  background-image: -ms-linear-gradient(top,#149bdf,#0480be);
+  background-image: -webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));
+  background-image: -webkit-linear-gradient(top,#149bdf,#0480be);
+  background-image: -o-linear-gradient(top,#149bdf,#0480be);
+  background-image: linear-gradient(top,#149bdf,#0480be);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
+  -moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
+  box-shadow: inset 0 -1px 0 rgba(0,0,0,.15);
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
-  -webkit-transition: width 0.6s ease;
-  -moz-transition: width 0.6s ease;
-  -ms-transition: width 0.6s ease;
-  -o-transition: width 0.6s ease;
-  transition: width 0.6s ease;
+  -webkit-transition: width .6s ease;
+  -moz-transition: width .6s ease;
+  -ms-transition: width .6s ease;
+  -o-transition: width .6s ease;
+  transition: width .6s ease;
 }
 .progress-striped .bar {
   background-color: #62c462;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,.15)),color-stop(.75,rgba(255,255,255,.15)),color-stop(.75,transparent),to(transparent));
+  background-image: -webkit-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
+  background-image: -moz-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
+  background-image: -ms-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
+  background-image: -o-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
+  background-image: linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
   -webkit-background-size: 40px 40px;
   -moz-background-size: 40px 40px;
   -o-background-size: 40px 40px;
@@ -3486,64 +3266,64 @@
   animation: progress-bar-stripes 2s linear infinite;
 }
 .progress-danger .bar {
-  background-color: #dd514c;
-  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
-  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: linear-gradient(top, #ee5f5b, #c43c35);
+  background-color: #dd514b;
+  background-image: -moz-linear-gradient(top,#ee5f5b,#c43c35);
+  background-image: -ms-linear-gradient(top,#ee5f5b,#c43c35);
+  background-image: -webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));
+  background-image: -webkit-linear-gradient(top,#ee5f5b,#c43c35);
+  background-image: -o-linear-gradient(top,#ee5f5b,#c43c35);
+  background-image: linear-gradient(top,#ee5f5b,#c43c35);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
 }
 .progress-danger.progress-striped .bar {
   background-color: #ee5f5b;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,.15)),color-stop(.75,rgba(255,255,255,.15)),color-stop(.75,transparent),to(transparent));
+  background-image: -webkit-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
+  background-image: -moz-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
+  background-image: -ms-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
+  background-image: -o-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
+  background-image: linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
 }
 .progress-success .bar {
-  background-color: #5eb95e;
-  background-image: -moz-linear-gradient(top, #62c462, #57a957);
-  background-image: -ms-linear-gradient(top, #62c462, #57a957);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
-  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
-  background-image: -o-linear-gradient(top, #62c462, #57a957);
-  background-image: linear-gradient(top, #62c462, #57a957);
+  background-color: #5db95d;
+  background-image: -moz-linear-gradient(top,#62c462,#57a957);
+  background-image: -ms-linear-gradient(top,#62c462,#57a957);
+  background-image: -webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));
+  background-image: -webkit-linear-gradient(top,#62c462,#57a957);
+  background-image: -o-linear-gradient(top,#62c462,#57a957);
+  background-image: linear-gradient(top,#62c462,#57a957);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
 }
 .progress-success.progress-striped .bar {
   background-color: #62c462;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,.15)),color-stop(.75,rgba(255,255,255,.15)),color-stop(.75,transparent),to(transparent));
+  background-image: -webkit-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
+  background-image: -moz-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
+  background-image: -ms-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
+  background-image: -o-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
+  background-image: linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
 }
 .progress-info .bar {
   background-color: #4bb1cf;
-  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
-  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -moz-linear-gradient(top,#5bc0de,#339bb9);
+  background-image: -ms-linear-gradient(top,#5bc0de,#339bb9);
+  background-image: -webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));
+  background-image: -webkit-linear-gradient(top,#5bc0de,#339bb9);
+  background-image: -o-linear-gradient(top,#5bc0de,#339bb9);
+  background-image: linear-gradient(top,#5bc0de,#339bb9);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);
 }
 .progress-info.progress-striped .bar {
   background-color: #5bc0de;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -webkit-gradient(linear,0 100%,100% 0,color-stop(.25,rgba(255,255,255,.15)),color-stop(.25,transparent),color-stop(.5,transparent),color-stop(.5,rgba(255,255,255,.15)),color-stop(.75,rgba(255,255,255,.15)),color-stop(.75,transparent),to(transparent));
+  background-image: -webkit-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
+  background-image: -moz-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
+  background-image: -ms-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
+  background-image: -o-linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
+  background-image: linear-gradient(-45deg,rgba(255,255,255,.15)25%,transparent 25%,transparent 50%,rgba(255,255,255,.15)50%,rgba(255,255,255,.15)75%,transparent 75%,transparent);
 }
 .accordion {
   margin-bottom: 18px;
@@ -3579,26 +3359,23 @@
 .carousel .item {
   display: none;
   position: relative;
-  -webkit-transition: 0.6s ease-in-out left;
-  -moz-transition: 0.6s ease-in-out left;
-  -ms-transition: 0.6s ease-in-out left;
-  -o-transition: 0.6s ease-in-out left;
-  transition: 0.6s ease-in-out left;
+  -webkit-transition: .6s ease-in-out left;
+  -moz-transition: .6s ease-in-out left;
+  -ms-transition: .6s ease-in-out left;
+  -o-transition: .6s ease-in-out left;
+  transition: .6s ease-in-out left;
 }
 .carousel .item > img {
   display: block;
   line-height: 1;
 }
-.carousel .active,
-.carousel .next,
-.carousel .prev {
+.carousel .active, .carousel .next, .carousel .prev {
   display: block;
 }
 .carousel .active {
   left: 0;
 }
-.carousel .next,
-.carousel .prev {
+.carousel .next, .carousel .prev {
   position: absolute;
   top: 0;
   width: 100%;
@@ -3609,8 +3386,7 @@
 .carousel .prev {
   left: -100%;
 }
-.carousel .next.left,
-.carousel .prev.right {
+.carousel .next.left, .carousel .prev.right {
   left: 0;
 }
 .carousel .active.left {
@@ -3656,10 +3432,9 @@
   bottom: 0;
   padding: 10px 15px 5px;
   background: #333333;
-  background: rgba(0, 0, 0, 0.75);
+  background: rgba(0,0,0,.75);
 }
-.carousel-caption h4,
-.carousel-caption p {
+.carousel-caption h4, .carousel-caption p {
   color: #ffffff;
 }
 .hero-unit {
@@ -3696,7 +3471,166 @@
 .invisible {
   visibility: hidden;
 }
-/* new clearfix */
+.datepicker {
+  top: 0;
+  left: 0;
+  padding: 4px;
+  margin-top: 1px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.datepicker:before {
+  content: '';
+  display: inline-block;
+  border-left: 7px solid transparent;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #cccccc;
+  border-bottom-color: rgba(0,0,0,0.2);
+  position: absolute;
+  top: -7px;
+  left: 6px;
+}
+.datepicker:after {
+  content: '';
+  display: inline-block;
+  border-left: 6px solid transparent;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #ffffff;
+  position: absolute;
+  top: -6px;
+  left: 7px;
+}
+.datepicker > div {
+  display: none;
+}
+.datepicker table {
+  width: 100%;
+  margin: 0;
+}
+.datepicker td, .datepicker th {
+  text-align: center;
+  width: 20px;
+  height: 20px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.datepicker td.day:hover {
+  background: #eeeeee;
+  cursor: pointer;
+}
+.datepicker td.day.disabled {
+  color: #eeeeee;
+}
+.datepicker td.old, .datepicker td.new {
+  color: #999999;
+}
+.datepicker td.active, .datepicker td.active:hover {
+  color: #ffffff;
+  background-color: #006dcc;
+  background-image: -moz-linear-gradient(top,#dd4814,#dd4a14);
+  background-image: -webkit-gradient(linear,0 0,0 100%,from(#dd4814),to(#dd4a14));
+  background-image: -webkit-linear-gradient(top,#dd4814,#dd4a14);
+  background-image: -o-linear-gradient(top,#dd4814,#dd4a14);
+  background-image: linear-gradient(to bottom,#dd4814,#dd4a14);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdd4814', endColorstr='#ffdd4a14', GradientType=0);
+  border-color: #dd4a14 #dd4a14 #002a80;
+  border-color: rgba(0,0,0,0.1)rgba(0,0,0,0.1)rgba(0,0,0,0.25);
+  *background-color: #dd4a14;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+}
+.datepicker td.active:hover,
+.datepicker td.active:hover:hover,
+.datepicker td.active:focus,
+.datepicker td.active:hover:focus,
+.datepicker td.active:active,
+.datepicker td.active:hover:active,
+.datepicker td.active.active,
+.datepicker td.active:hover.active,
+.datepicker td.active.disabled,
+.datepicker td.active:hover.disabled,
+.datepicker td.active[disabled],
+.datepicker td.active:hover[disabled] {
+  color: #ffffff;
+  background-color: #dd4a14;
+  *background-color: #003bb3;
+}
+.datepicker td.active:active,
+.datepicker td.active:hover:active,
+.datepicker td.active.active,
+.datepicker td.active:hover.active {
+  background-color: #003399 \9;
+}
+.datepicker td span {
+  display: block;
+  width: 47px;
+  height: 54px;
+  line-height: 54px;
+  float: left;
+  margin: 2px;
+  cursor: pointer;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.datepicker td span:hover {
+  background: #eeeeee;
+}
+.datepicker td span.active {
+  color: #ffffff;
+  background-color: #006dcc;
+  background-image: -moz-linear-gradient(top,#dd4814,#dd4a14);
+  background-image: -webkit-gradient(linear,0 0,0 100%,from(#dd4814),to(#dd4a14));
+  background-image: -webkit-linear-gradient(top,#dd4814,#dd4a14);
+  background-image: -o-linear-gradient(top,#dd4814,#dd4a14);
+  background-image: linear-gradient(to bottom,#dd4814,#dd4a14);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdd4814', endColorstr='#ffdd4a14', GradientType=0);
+  border-color: #dd4a14 #dd4a14 #002a80;
+  border-color: rgba(0,0,0,0.1)rgba(0,0,0,0.1)rgba(0,0,0,0.25);
+  *background-color: #dd4a14;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0,0,0,0.25);
+}
+.datepicker td span.active:hover,
+.datepicker td span.active:focus,
+.datepicker td span.active:active,
+.datepicker td span.active.active,
+.datepicker td span.active.disabled,
+.datepicker td span.active[disabled] {
+  color: #ffffff;
+  background-color: #dd4a14;
+  *background-color: #003bb3;
+}
+.datepicker td span.active:active, .datepicker td span.active.active {
+  background-color: #003399 \9;
+}
+.datepicker td span.old {
+  color: #999999;
+}
+.datepicker th.switch {
+  width: 145px;
+}
+.datepicker th.next, .datepicker th.prev {
+  font-size: 21px;
+}
+.datepicker thead tr:first-child th {
+  cursor: pointer;
+}
+.datepicker thead tr:first-child th:hover {
+  background: #eeeeee;
+}
+.input-append.date .add-on i, .input-prepend.date .add-on i {
+  display: block;
+  cursor: pointer;
+  width: 16px;
+  height: 16px;
+}
 .clearfix:after {
   visibility: hidden;
   display: block;
@@ -3708,18 +3642,10 @@
 * html .clearfix {
   zoom: 1;
 }
-/* IE6 */
-*:first-child + html .clearfix {
+* :first-child + html .clearfix {
   zoom: 1;
 }
-/* IE7 */
-@font-face {
-  font-family: 'anivers';
-  src: url('/static/dashboard/fonts/Anivers_Regular-webfont.eot?5f61443eb372');
-  src: url('/static/dashboard/fonts/Anivers_Regular-webfont.eot?iefix') format('eot'), url('/static/dashboard/fonts/Anivers_Regular-webfont.woff?2c3db88030ec') format('woff'), url('/static/dashboard/fonts/Anivers_Regular-webfont.ttf?6a7822aa21cf') format('truetype'), url('/static/dashboard/fonts/Anivers_Regular-webfont.svg#webfont3JLVF59W') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
+
 a {
   color: #dd4814;
 }
@@ -3753,9 +3679,9 @@
   font-size: 11px;
   margin-left: 20px;
   padding: 0;
-  background-image: url('../../dashboard/img/drop_arrow.png?2ec1100baed3');
-  border: 1px solid #c0d9e4;
-  background-color: #e9f5fa;
+  background-image: url('/static/dashboard/img/drop_arrow.png');
+  border: 1px solid #77216f;
+  background-color: #eddbea;
   background-repeat: no-repeat;
 }
 .topbar .switcher_bar a {
@@ -3767,18 +3693,18 @@
   width: 130px;
 }
 #user_info {
-  color: #888;
+  color: #ffffff;
   margin: auto 0;
 }
 #user_info > a {
   margin-left: 25px;
-  font-size: 11px;
+  font-size: 11px !important;
+  color: #ffffff;
 }
 .page-header {
   margin: 0;
   padding: 0;
   border: 0;
-  font-family: anivers;
 }
 h2 {
   color: #6a6a6a;
@@ -3786,15 +3712,14 @@
   font-weight: normal;
 }
 body {
-  background-color: #fff;
+  background-color: #ffffff;
   min-width: 890px;
 }
-
-
-
-/* Login Splash Page */
+#splash {
+  background: #fafafa url(../img/dots.png) repeat center top;
+}
 #splash .login {
-  background: #DD4814 url(../img/ubuntu.png) no-repeat center 35px;
+  background: #dd4814 url('../img/ubuntu.png') no-repeat center 35px;
   position: absolute;
   top: 80px;
   left: 50%;
@@ -3806,9 +3731,9 @@
   -webkit-border-radius: 6px;
   -moz-border-radius: 6px;
   border-radius: 6px;
-  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  -webkit-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+  -moz-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+  box-shadow: 0 3px 7px rgba(0,0,0,0.3);
   -webkit-background-clip: padding-box;
   -moz-background-clip: padding-box;
   background-clip: padding-box;
@@ -3816,13 +3741,20 @@
 
 #splash .login form,
 #splash .login .modal-header {
-    background-color: #fff;
-}
-
-#splash .login input {
+  background-color: #ffffff;
+}
+
+#splash .login .modal-header {
+  border-top: 1px solid #c44012;
+}
+
+#splash .login form .error {
+  width: 100%;
+}
+#splash .login form input {
   width: 350px;
 }
-#splash .login select {
+#splash .login form select {
   width: 360px;
 }
 #splash .help-block {
@@ -3832,27 +3764,27 @@
   margin-top: 190px;
 }
 .nav li a {
-  color: #8EACB7;
+  color: #8eacb7;
   text-shadow: none;
 }
 .container-fluid {
   padding-left: 0;
 }
 .sidebar {
-  background: #edf9ff;
+  background: #f2f2f2;
   border-right: 5px solid #e5e5e5;
   border-bottom: 5px solid #e5e5e5;
   float: left;
 }
 .sidebar h4 {
   margin-left: 14px;
-  color: #999;
+  color: #999999;
 }
 .sidebar .nav-tabs {
-  margin-top: -34px;
+  margin-top: 10px;
 }
 .sidebar .nav-tabs li.active a {
-  background-color: #edf9ff;
+  background-color: #f2f2f2;
 }
 h1.brand {
   width: 100%;
@@ -3861,7 +3793,7 @@
   padding-bottom: 40px;
 }
 h1.brand a {
-  background: url(../img/ubuntu.png) top left no-repeat;
+  background: url('../img/logo.png') top left no-repeat;
   display: block;
   float: left;
   width: 116px;
@@ -3871,7 +3803,6 @@
   margin-top: 15px;
   margin-bottom: 25px;
 }
-/* Tenant Dropdown */
 a.current_item {
   width: 163px;
   float: left;
@@ -3879,11 +3810,12 @@
 a.current_item:hover {
   text-decoration: none;
 }
-a.current_item:hover h3,
-a.current_item:hover h4 {
+a.current_item:hover h3, a.current_item:hover h4 {
   color: #39738c;
 }
 .sidebar .switcher_bar {
+  background-color: #eddbea;
+  border: 1px solid #77216f;
   width: 190px;
   height: 38px;
   padding: 5px 0;
@@ -3893,39 +3825,49 @@
 .sidebar .switcher_bar a.dropdown-toggle {
   display: block;
   padding: 5px 0;
-  background-image: url('../../dashboard/img/drop_arrow.png');
-  border: 1px solid #c0d9e4;
-  background-color: #e9f5fa;
+  background-image: url('/static/dashboard/img/drop_arrow.png');
+  border: 1px solid #77216f;
+  background-color: #eddbea;
   background-repeat: no-repeat;
   background-position: 167px 23px;
 }
 .sidebar .switcher_bar a.dropdown-toggle:hover {
   text-decoration: none;
-  background-color: #cde8f4;
+  background-color: #dbb6d4;
 }
 .sidebar .switcher_bar:focus {
   outline: none;
 }
 .sidebar .switcher_bar h3 {
-  color: #4790ae;
+  color: #2c001e;
   font-size: 16px;
   margin: -6px 0 0 14px;
   padding: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.sidebar .switcher_bar h3:hover {
+  white-space: normal;
+  overflow: visible;
+  text-overflow: none;
+  padding-right: 1em;
+  word-wrap: break-word;
 }
 .sidebar .switcher_bar h4 {
-  color: #6fabc4;
+  color: #5e2750;
   font-size: 10px;
   text-transform: uppercase;
   font-weight: normal;
   padding: 0;
 }
 .sidebar .switcher_bar ul {
-  border: 1px solid #c0d9e4;
+  border: 1px solid #77216f;
   margin-left: -1px;
   width: 190px;
 }
 .sidebar .switcher_bar li a:hover {
-  background: #92d6f1;
+  background: #77216f;
 }
 #usage {
   margin-bottom: 25px;
@@ -3986,43 +3928,40 @@
   border: none;
 }
 .table-bordered tr.table_caption + tr th {
-  border-top: 1px solid #ddd;
+  border-top: 1px solid #dddddd;
 }
 .table-bordered tr.table_caption + tr th:first-child,
 .table-bordered tr.table_caption + tr th.hide + th {
   -moz-border-radius-topleft: 4px;
   -webkit-border-top-left-radius: 4px;
   border-top-left-radius: 4px;
-  border-left: 1px solid #ddd;
+  border-left: 1px solid #dddddd;
 }
 .table-bordered tr.table_caption + tr th:last-child {
   -moz-border-radius-topright: 4px;
   -webkit-border-top-right-radius: 4px;
   border-top-right-radius: 4px;
-  border-right: 1px solid #ddd;
-}
-.table-bordered tbody tr td:first-child,
-.table-bordered tfoot tr td:first-child {
-  border-left: 1px solid #ddd;
-}
-.table-bordered tbody tr td:last-child,
-.table-bordered tfoot tr td:last-child {
-  border-right: 1px solid #ddd;
-}
-.table-bordered tfoot tr td:first-child {
-  border-bottom: 1px solid #ddd;
+  border-right: 1px solid #dddddd;
+}
+.table-bordered tbody tr td:first-child, .table-bordered tfoot tr td:first-child {
+  border-left: 1px solid #dddddd;
+}
+.table-bordered tbody tr td:last-child, .table-bordered tfoot tr td:last-child {
+  border-right: 1px solid #dddddd;
+}
+.table-bordered tfoot tr td:first-child {
+  border-bottom: 1px solid #dddddd;
   -moz-border-radius-bottomleft: 4px;
   -webkit-border-bottom-left-radius: 4px;
   border-bottom-left-radius: 4px;
 }
 .table-bordered tfoot tr td:last-child {
-  border-bottom: 1px solid #ddd;
+  border-bottom: 1px solid #dddddd;
   -moz-border-radius-bottomright: 4px;
   -webkit-border-bottom-right-radius: 4px;
   border-bottom-right-radius: 4px;
 }
-.table_title h3,
-.table_header h3 {
+.table_title h3, .table_header h3 {
   font-family: anivers;
   font-weight: normal;
   font-size: 24px;
@@ -4034,6 +3973,7 @@
 }
 .table th.header:hover {
   background-color: #e8e8e8;
+  text-decoration: underline;
 }
 .table tbody td.anchor a {
   display: block;
@@ -4043,29 +3983,26 @@
   background-color: transparent;
   cursor: default;
 }
-.table th.headerSortUp:hover,
-.table th.headerSortDown:hover {
+.table th.headerSortUp:hover, .table th.headerSortDown:hover {
   background-color: #dfdfdf;
 }
-.table th.headerSortUp,
-.table th.headerSortDown {
+.table th.headerSortUp, .table th.headerSortDown {
   background-color: #dfdfdf;
   background-repeat: no-repeat;
   background-position: 98% center;
 }
 .table th.headerSortDown {
-  background-image: url('../../dashboard/img/drop_arrow.png?2ec1100baed3');
+  background-image: url('/static/dashboard/img/drop_arrow.png');
 }
 .table th.headerSortUp {
-  background-image: url('../../dashboard/img/up_arrow.png?4293b62aa222');
+  background-image: url('/static/dashboard/img/up_arrow.png');
 }
-.table tr.summation td:first-child,
-.table tr.summation td:last-child {
+.table tr.summation td:first-child, .table tr.summation td:last-child {
   border-radius: 0;
   border-bottom: 0 none;
 }
 th {
-  background: #F7F2F6;
+  background: #f7f2f6;
 }
 td.anchor {
   padding: 0;
@@ -4080,17 +4017,18 @@
   margin: 10px 0 20px 0;
 }
 .main_nav a {
-  color: #999;
+  color: #999999;
   width: 185px;
   padding: 10px;
   display: block;
   margin-left: 20px;
 }
 .main_nav a.active {
-  background: #fff;
+  background: #ffffff;
   border: 2px solid #d8d8d8;
   border-right: 0;
-  border-bottom-color: #ccc;
+  border-bottom-color: #cccccc;
+  color: #5e2750;
 }
 table form {
   margin-bottom: 0;
@@ -4104,9 +4042,9 @@
   width: 300px;
 }
 .messages .alert-block {
-  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  -webkit-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+  -moz-box-shadow: 0 3px 7px rgba(0,0,0,0.3);
+  box-shadow: 0 3px 7px rgba(0,0,0,0.3);
 }
 .messages .alert-block.alert-error {
   border: 1px solid #9d261d;
@@ -4118,9 +4056,7 @@
   margin-top: -23px;
   margin-right: -23px;
 }
-.modal > form,
-.login > form,
-.alert-actions > form {
+.modal > form, .login > form, .alert-actions > form {
   margin-bottom: 0;
 }
 .alert-block p {
@@ -4155,8 +4091,8 @@
   text-align: center;
 }
 .table tfoot tr td {
-  border-top: 1px solid #DDD;
-  background-color: #F1F1F1;
+  border-top: 1px solid #dddddd;
+  background-color: #f1f1f1;
   font-size: 11px;
   line-height: 14px;
 }
@@ -4164,30 +4100,113 @@
   float: right;
   min-width: 400px;
 }
-.table_actions .table_search {
+.table_actions .table_search, .table_actions .table_filter {
   display: inline-block;
 }
 .table_search input {
-  background: url('../../dashboard/img/search.png?781fb162b111') no-repeat 195px 5px;
+  background: url('/static/dashboard/img/search.png') no-repeat 195px 5px;
   display: inline-block;
   margin-bottom: 0;
 }
-.table_actions a,
-.table_actions button {
+.table_actions a, .table_actions button {
   float: right;
   margin-left: 10px;
 }
 .table_actions button.filter {
   margin-left: 0;
 }
+.table_actions a.btn-create, .table_actions a.btn-launch {
+  padding-left: 23px;
+  position: relative;
+}
+.table_actions a.btn-create:before, .table_actions a.btn-launch:before {
+  display: inline-block;
+  content: "";
+  width: 18px;
+  height: 20px;
+  margin-top: 1px;
+  *margin-right: .3em;
+  line-height: 14px;
+  background-image: url('/static/bootstrap/img/glyphicons-halflings.png');
+  background-position: -403px -92px;
+  background-repeat: no-repeat;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+}
+.table_actions a.btn-download {
+  padding-left: 23px;
+  position: relative;
+}
+.table_actions a.btn-download:before {
+  display: inline-block;
+  content: "";
+  width: 18px;
+  height: 20px;
+  margin-top: 1px;
+  *margin-right: .3em;
+  line-height: 14px;
+  background-image: url('/static/bootstrap/img/glyphicons-halflings.png');
+  background-position: -91px -19px;
+  background-repeat: no-repeat;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+}
+.table_actions a.btn-upload {
+  padding-left: 23px;
+  position: relative;
+}
+.table_actions a.btn-upload:before {
+  display: inline-block;
+  content: "";
+  width: 18px;
+  height: 20px;
+  margin-top: 1px;
+  *margin-right: .3em;
+  line-height: 14px;
+  background-image: url('/static/bootstrap/img/glyphicons-halflings.png');
+  background-position: -283px -92px;
+  background-repeat: no-repeat;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+}
+.table_actions button.btn-delete, .table_actions button.btn-terminate {
+  padding-left: 23px;
+  position: relative;
+}
+.table_actions button.btn-delete:before, .table_actions button.btn-terminate:before {
+  display: inline-block;
+  content: "";
+  width: 18px;
+  height: 20px;
+  margin-top: 1px;
+  *margin-right: .3em;
+  line-height: 14px;
+  background-image: url('/static/bootstrap/img/glyphicons-halflings-white.png');
+  background-position: -451px 5px;
+  background-repeat: no-repeat;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+}
 .table_header .table_actions {
   min-width: 0;
 }
 .table_header .table_actions a,
-.table_header .table_actions button {
+.table_header .table_actions > button,
+.table_header .table_actions .table_search button {
   display: inline-block;
   float: none;
 }
+.table_header .table_filter {
+  vertical-align: bottom;
+  margin-right: 20px;
+}
+.table_header .table_filter i {
+  vertical-align: middle;
+}
 .table_actions form {
   float: right;
   margin-left: 10px;
@@ -4195,10 +4214,21 @@
 .hidden {
   display: none;
 }
-.table-striped tbody tr.status_unknown:nth-child(odd) td {
+.table-striped.datatable tbody tr.odd td {
+  background-color: #f9f9f9;
+}
+.table-striped.datatable tbody tr.even td {
+  background-color: inherit;
+}
+.table-striped.datatable tbody tr.odd:hover td,
+.table-striped.datatable tbody tr.even:hover td,
+.table-striped.datatable tbody tr:hover th {
+  background-color: #f5f5f5;
+}
+.table-striped tbody tr.status_unknown:nth-child(odd)td {
   background-color: #ffffb5;
 }
-.table-striped tbody tr.status_unknown:nth-child(even) td {
+.table-striped tbody tr.status_unknown:nth-child(even)td {
   background-color: #ffffc6;
 }
 .nowrap-col {
@@ -4222,24 +4252,20 @@
   float: left;
   line-height: 18px;
 }
-#external_links,
-#external_links li {
+#external_links, #external_links li {
   float: left;
 }
 #external_links li {
   margin: 0 0 0 15px;
 }
-/* Forms */
 form label {
   text-align: left;
-  color: #555;
+  color: #555555;
   font-weight: bold;
 }
 .modal {
   width: 700px;
   max-height: none;
-  /* Prevents large modals from scrolling unnecessarily */
-
   top: 80px;
   margin-top: 0;
   position: absolute;
@@ -4256,23 +4282,27 @@
   bottom: 0;
   width: 150px;
 }
+.datepicker {
+  margin-top: 10px;
+}
+.datepicker input {
+  width: 65px;
+  margin-right: 10px;
+}
+.datepicker .btn {
+  margin-right: 10px;
+}
 form.horizontal .form-field {
   float: left;
 }
 form.horizontal.split_half .form-field {
   width: 334px;
-  /* Fits 2 fields to a row */
-
 }
 form.horizontal.split_quarter .form-field {
   width: 167px;
-  /* Fits 4 fields to a row */
-
 }
 form.horizontal.split_five .form-field {
   width: 133px;
-  /* Fits 5 fields to a row */
-
 }
 form.horizontal fieldset {
   width: 100%;
@@ -4290,8 +4320,8 @@
 .static_page {
   float: left;
   width: 700px;
-  background-color: #FFF;
-  border: 1px solid #DDD;
+  background-color: #ffffff;
+  border: 1px solid #dddddd;
 }
 .static_page > form {
   margin-bottom: 0;
@@ -4320,7 +4350,7 @@
   vertical-align: top;
   width: 340px;
   padding-left: 10px;
-  border-left: 1px solid #DDD;
+  border-left: 1px solid #dddddd;
 }
 .workflow fieldset > table {
   margin-bottom: 0;
@@ -4339,8 +4369,7 @@
 .modal-body fieldset ul {
   width: 90%;
 }
-.modal-body fieldset .form-field input,
-.modal-body fieldset .form-field textarea {
+.modal-body fieldset .form-field input, .modal-body fieldset .form-field textarea {
   width: 298px;
 }
 .modal-body fieldset .form-field select {
@@ -4361,7 +4390,7 @@
   margin-top: 0;
   margin-right: 5px;
   font-size: 12px;
-  color: #666;
+  color: #666666;
   font-weight: normal;
   filter: alpha(opacity=100);
   -khtml-opacity: 1;
@@ -4369,7 +4398,7 @@
   opacity: 1;
 }
 .modal-footer a.close:hover {
-  color: #333;
+  color: #333333;
   text-decoration: underline;
 }
 .modal-body .help-block {
@@ -4396,28 +4425,26 @@
 #images #actions {
   width: 100px;
 }
-/*New List Patches*/
 .details-modal .modal-body {
   padding-bottom: 20px;
 }
 .form-inline {
   display: inline;
 }
-.form-inline input,
-.form-inline button,
-.form-inline a.btn {
+.form-inline input, .form-inline button, .form-inline a.btn {
   margin-left: 5px;
 }
 td.select {
   width: 10px;
 }
-/* Actions dropdown */
 td.actions_column {
-  width: 150px;
+  white-space: nowrap;
   padding: 10px;
   position: relative;
-  min-width: 140px;
-  min-height: 20px;
+  width: 200px;
+}
+td.actions_column .btn-group {
+  display: inline-block;
 }
 td.actions_column .row_actions a,
 td.actions_column .row_actions input,
@@ -4437,9 +4464,13 @@
 td.actions_column .row_actions .hide {
   display: none;
 }
-/* Makes size consistent across browsers when mixing "btn-group" and "small" */
-.btn.hide,
-.btn-group .hide {
+td.actions_column .btn-action-required {
+  font-weight: bold;
+}
+.tab-content {
+  overflow: visible;
+}
+.btn.hide, .btn-group .hide {
   display: none;
 }
 .btn-group .dropdown-toggle:focus {
@@ -4447,8 +4478,6 @@
 }
 .dropdown-menu button {
   line-height: 18px;
-  /* Matches rule for ".dropdown-menu a" in bootstrap */
-
   width: 100%;
 }
 .btn-group .dropdown-menu .btn {
@@ -4461,26 +4490,23 @@
 .dropdown-menu .btn.btn-info,
 .dropdown-menu .btn.btn-info:hover {
   text-shadow: none;
-  /* remove default bootstrap shadowing from button text. */
-
 }
 .dropdown-menu li:hover {
   background: none;
 }
 .dropdown-menu li.divider:hover {
-  background-color: #E5E5E5;
+  background-color: #e5e5e5;
 }
 td.actions_column .dropdown-menu a:hover,
 td.actions_column .dropdown-menu button:hover {
-  background-color: #CDCDCD;
+  background-color: #cdcdcd;
 }
 .dropdown-menu .btn.btn-danger {
-  color: #C43C35;
+  color: #c43c35;
 }
 .dropdown-menu .btn.btn-danger:hover {
   background-color: #f6e0df;
 }
-/* Overrides for single-action rows (no dropdown) */
 tr td.actions_column ul.row_actions.single,
 tr:hover td.actions_column ul.row_actions.single,
 td.actions_column ul.row_actions.single,
@@ -4503,12 +4529,10 @@
 td.actions_column ul.row_actions.single button:hover {
   color: black;
 }
-th.multi_select_column,
-td.multi_select_column {
+th.multi_select_column, td.multi_select_column {
   width: 25px;
 }
-th.multi_select_column,
-td.multi_select_column {
+th.multi_select_column, td.multi_select_column {
   text-align: center;
 }
 .table-fixed {
@@ -4546,7 +4570,7 @@
   border-bottom: none;
 }
 #instance_tabs li.active a {
-  background: #fff;
+  background: #ffffff;
   padding-bottom: 8px;
   margin-bottom: -5px;
 }
@@ -4554,7 +4578,7 @@
   margin-bottom: 0;
 }
 #main_content .tab-content {
-  border: 1px solid #ddd;
+  border: 1px solid #dddddd;
   border-top: 0 none;
   padding: 10px;
 }
@@ -4570,23 +4594,22 @@
 .tab_wrapper {
   padding-top: 50px;
 }
-/* Fix tooltip z-index to show above modals. Bootstrap bug 582*/
 .tooltip {
   z-index: 12000;
 }
 .volume_boot_disclosure {
   font-weight: bold;
-  color: #555;
+  color: #555555;
   cursor: pointer;
-  background-image: url('../../dashboard/img/right_droparrow.png?b14134630332');
+  background-image: url('/static/dashboard/img/right_droparrow.png');
   background-repeat: no-repeat;
   background-position: 130px center;
 }
 .volume_boot_disclosure.on {
   width: 334px;
   margin-bottom: 10px;
-  border-bottom: solid 1px #E1E1E1;
-  background-image: url('../../dashboard/img/drop_arrow.png?2ec1100baed3');
+  border-bottom: solid 1px #e1e1e1;
+  background-image: url('/static/dashboard/img/drop_arrow.png');
 }
 form div.clearfix.error {
   width: 308px;
@@ -4595,12 +4618,18 @@
   cursor: pointer;
 }
 .nav-tabs li.error a {
-  color: #B94A48;
+  color: #b94a48;
 }
 .nav-tabs li.error a:after {
   content: "*";
 }
-/* Region selector in header */
+.nav-tabs li.required a:after, form .form-field.required > label:after {
+  content: "*";
+  font-weight: bold;
+  line-height: 0;
+  padding-left: 4px;
+  color: #3290c0;
+}
 #region_selector {
   position: absolute;
   z-index: 9999;
@@ -4622,11 +4651,11 @@
 #region_selector li a {
   padding: 3px 3px 3px 5px;
   display: none;
-  background: #E1E1E1;
+  background: #e1e1e1;
   margin-top: -10px;
 }
 #region_selector li:first-child p {
-  background: #ededed url('../../dashboard/img/drop_arrow.png?2ec1100baed3') no-repeat 106px 9px !important;
+  background: #ededed url('/static/dashboard/img/drop_arrow.png') no-repeat 106px 9px !important;
   display: block;
   border: 1px solid #e1e1e1;
   padding: 5px;
@@ -4635,7 +4664,7 @@
   border: none;
 }
 .item_detail ul li label {
-  color: #000;
+  color: #000000;
   font-weight: bold;
   display: block;
   margin-top: 5px;
@@ -4643,31 +4672,41 @@
 .progress_bar {
   height: 100%;
   width: 100%;
-  border: 1px solid #CCC;
-  background-color: #CCC;
+  border: 1px solid #cccccc;
+  background-color: #cccccc;
 }
-.progress_bar_fill,
-.progress_bar_selected {
+.progress_bar_fill, .progress_bar_selected {
   height: 100%;
   float: left;
 }
 .progress_bar_fill {
-  background-color: #666;
+  background-color: #666666;
 }
 .progress_bar_selected {
-  background-color: #4790AE;
+  background-color: #2c001e;
   width: 0;
 }
 .progress_bar_over {
   background-color: red;
 }
+.d3_quota_bar {
+  width: 20%;
+  margin-bottom: 8px;
+  margin-top: 10px;
+  float: left;
+  text-align: center;
+}
+.quota-dynamic {
+  overflow: hidden;
+  margin-bottom: 8px;
+}
 .quota_title {
-  color: #999;
+  color: #999999;
   padding-bottom: 0;
   margin-bottom: 8px;
 }
 .quota_title strong {
-  color: #000;
+  color: #000000;
 }
 .quota_title strong span {
   font-weight: normal;
@@ -4681,7 +4720,7 @@
   margin: -8px 0 8px;
 }
 div .flavor_table {
-  border: 1px solid #AAA;
+  border: 1px solid #aaaaaa;
   width: 100%;
   margin-bottom: 14px;
 }
@@ -4706,48 +4745,52 @@
   float: left;
   margin-right: 50px;
 }
-.error .help-inline {
+.error .help-inline, .dynamic-error {
   background: #efdfdf;
   border: 1px solid #ead5d8;
   padding: 10px;
   display: block;
 }
+.dynamic-error {
+  color: #b94a48;
+  margin-bottom: 0.5em;
+}
 label.log-length {
   line-height: 28px;
   margin-right: 10px;
 }
 .progress-success.bar {
   background-color: #5eb95e;
-  background-image: -moz-linear-gradient(top, #62c462, #57a957);
-  background-image: -ms-linear-gradient(top, #62c462, #57a957);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
-  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
-  background-image: -o-linear-gradient(top, #62c462, #57a957);
-  background-image: linear-gradient(top, #62c462, #57a957);
+  background-image: -moz-linear-gradient(top,#62c462,#57a957);
+  background-image: -ms-linear-gradient(top,#62c462,#57a957);
+  background-image: -webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));
+  background-image: -webkit-linear-gradient(top,#62c462,#57a957);
+  background-image: -o-linear-gradient(top,#62c462,#57a957);
+  background-image: linear-gradient(top,#62c462,#57a957);
   background-repeat: repeat-x;
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
 }
 .progress_bar_fill.progress-warning.bar {
   background-color: #898989;
-  background-image: -moz-linear-gradient(top, #999999, #333333);
-  background-image: -ms-linear-gradient(top, #999999, #333333);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#999999), to(#333333));
-  background-image: -webkit-linear-gradient(top, #999999, #333333);
-  background-image: -o-linear-gradient(top, #999999, #333333);
-  background-image: linear-gradient(top, #999999, #333333);
+  background-image: -moz-linear-gradient(top,#999999,#333333);
+  background-image: -ms-linear-gradient(top,#999999,#333333);
+  background-image: -webkit-gradient(linear,0 0,0 100%,from(#999999),to(#333333));
+  background-image: -webkit-linear-gradient(top,#999999,#333333);
+  background-image: -o-linear-gradient(top,#999999,#333333);
+  background-image: linear-gradient(top,#999999,#333333);
   background-repeat: repeat-x;
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#999999', endColorstr='#333333', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#999999', endColorstr='#333333', GradientType=0);
 }
 .progress_bar_over.bar {
   background-color: #dd514c;
-  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
-  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -moz-linear-gradient(top,#ee5f5b,#c43c35);
+  background-image: -ms-linear-gradient(top,#ee5f5b,#c43c35);
+  background-image: -webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));
+  background-image: -webkit-linear-gradient(top,#ee5f5b,#c43c35);
+  background-image: -o-linear-gradient(top,#ee5f5b,#c43c35);
+  background-image: linear-gradient(top,#ee5f5b,#c43c35);
   background-repeat: repeat-x;
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
 }
 .split_five div.control-group input[type="text"],
 .split_five div.control-group select {
@@ -4761,8 +4804,7 @@
 .warning .warning-text {
   text-align: center;
 }
-.warning .warning-text h3,
-.warning .warning-text a {
+.warning .warning-text h3, .warning .warning-text a {
   display: inline-block;
 }
 .warning .warning-text h3 {
@@ -4776,107 +4818,93 @@
 .no_split {
   margin-top: -60px;
 }
-/* Project Membership UI */
-.project_membership {
+.membership {
   min-height: 200px;
-  /* Buttons */
-
-  /* Header */
-
-  /* 'Fake table' body */
-
-  /* User lists */
-
-  /* List filtering */
-
-  /* Role dropdown menus */
-
 }
-.project_membership .btn-group {
+.membership .btn-group {
   margin-left: 0px;
   padding: 2px 10px 0 0;
   margin-bottom: 0px;
-  border: 1px solid #DDD;
+  border: 1px solid #dddddd;
   border-bottom: none;
 }
-.project_membership .btn-group .active {
+.membership .btn-group .active {
   float: right;
 }
-.project_membership a.btn-primary:hover {
-  background-color: #04C;
+.membership a.btn-primary:hover {
+  background-color: #dd4a14;
 }
-.project_membership .help_text {
+.membership .help_text {
   margin-left: 15px;
   margin-bottom: 15px;
 }
-.project_membership .users_title {
-  color: #555;
+.membership .members_title {
+  color: #555555;
   font-weight: bold;
   padding-left: 10px;
   float: left;
 }
-.project_membership input {
-  background: url('../../dashboard/img/search.png?781fb162b111') no-repeat 105px 5px whiteSmoke;
+.membership input {
+  background: url('/static/dashboard/img/search.png') no-repeat 105px 5px whiteSmoke;
 }
-.project_membership .fake_table_header {
-  background-color: #F1F1F1;
+.membership .fake_table_header {
+  background-color: #f1f1f1;
   width: 306px;
   height: 38px;
   padding-top: 15px;
-  border: 1px solid #DDD;
+  border: 1px solid #dddddd;
   border-bottom: none;
 }
-.project_membership .fake_table {
+.membership .fake_table {
   margin-left: 5px;
   width: 315px;
 }
-.project_membership .fake_table ul.no_results {
+.membership .fake_table ul.no_results {
   width: 298px;
 }
-.project_membership .fake_table ul.btn-group:hover {
-  background-color: #DDD;
+.membership .fake_table ul.btn-group:hover {
+  background-color: #dddddd;
 }
-.project_membership .left .fake_table_header {
+.membership .left .fake_table_header {
   width: 318px;
 }
-.project_membership .right .fake_table_header {
+.membership .right .fake_table_header {
   width: 318px;
   margin-left: -15px;
 }
-.project_membership .right .fake_table ul.no_results {
+.membership .right .fake_table ul.no_results {
   margin-left: -20px;
 }
-.project_membership .member {
+.membership .member {
   padding: 10px;
   text-align: left;
 }
-.project_membership .project_members {
+.membership .members {
   margin-left: -20px;
 }
-.project_membership .project_members ul.btn-group,
-.project_membership .available_users ul.btn-group {
+.membership .members ul.btn-group, .membership .available_members ul.btn-group {
   width: 308px;
 }
-.project_membership .dark_stripe {
-  background-color: #F9F9F9;
+.membership .dark_stripe {
+  background-color: #f9f9f9;
 }
-.project_membership .light_stripe {
+.membership .light_stripe {
   background-color: white;
 }
-.project_membership .last_stripe {
-  border-bottom: 1px solid #DDD;
+.membership .last_stripe {
+  border-bottom: 1px solid #dddddd;
 }
-.project_membership .filter {
+.membership .filter {
   width: 120px;
   margin: -5px 13px 15px 0px;
   float: right;
 }
-.project_membership .no_results {
-  border: 1px solid #DDD;
+.membership .no_results {
+  border: 1px solid #dddddd;
   padding: 10px;
-  color: #08C;
+  opacity: 0.5;
 }
-.project_membership .role_dropdown li {
+.membership .role_dropdown li {
   cursor: pointer;
   background: none;
   float: none;
@@ -4891,30 +4919,37 @@
   box-shadow: none;
   z-index: 99999;
 }
-.project_membership .role_dropdown li:hover {
-  background-color: #CDCDCD;
-}
-.project_membership .nav .role_options {
+.membership .role_dropdown li i {
+  opacity: 0;
+}
+.membership .role_dropdown li:hover {
+  background-color: #cdcdcd;
+}
+.membership .role_dropdown li.selected i {
+  opacity: 1;
+}
+.membership .dropdown-menu.role_dropdown {
+  right: 0;
+  left: auto;
+}
+.membership .nav .role_options {
   float: right;
   padding-right: 5px;
 }
-/* Inline user creation */
-.add_user_btn {
+.add_member_btn {
   display: inline;
 }
-#add_user {
+#add_member {
   clear: both;
 }
-.add_user {
+.add_member {
   float: right;
   margin-top: 10px;
   margin-right: 15px;
 }
-/* Fixes overflow on dropdowns in modal */
 .dropdown_fix {
   overflow: visible;
 }
-/* Replaces CPU hungry spin.js with animated gif */
 .loading_gif {
   width: 35px;
   height: 13px;
@@ -4922,7 +4957,13 @@
   padding-right: 5px;
   float: left;
 }
-/* ResourceBrowser style */
+.action_required_img {
+  width: 35px;
+  height: 13px;
+  padding-top: 2px;
+  padding-right: 5px;
+  float: left;
+}
 #browser_wrapper {
   width: 100%;
   min-width: 1000px;
@@ -4936,7 +4977,7 @@
   clear: both;
   padding: 8px;
   border-top: 1px solid #dddddd;
-  background-color: #F1F1F1;
+  background-color: #f1f1f1;
   font-size: 11px;
   line-height: 14px;
 }
@@ -4946,12 +4987,10 @@
 #browser_wrapper .tfoot span.navigation_table_count {
   width: 30%;
 }
-#browser_wrapper form,
-#browser_wrapper table {
+#browser_wrapper form, #browser_wrapper table {
   margin-bottom: 0;
 }
-#browser_wrapper .navigation_wrapper,
-#browser_wrapper .content_wrapper {
+#browser_wrapper .navigation_wrapper, #browser_wrapper .content_wrapper {
   position: relative;
   float: left;
 }
@@ -4972,7 +5011,7 @@
   max-width: 200px;
 }
 #browser_wrapper div.navigation_wrapper tr.current_selected td {
-  background-color: #E9F5FA;
+  background-color: #eddbea;
 }
 #browser_wrapper div.navigation_wrapper tfoot td {
   border-right: 0 none;
@@ -4991,12 +5030,6 @@
 }
 #browser_wrapper div.content_wrapper {
   width: 70%;
-  /* FIXME(Ke Wu): for now there are two breadcrumb tr in both table
-    * and this one in the content table is hidden. This hack is made to
-    * fix the alignment of two table, needs a better solution in the
-    * future.
-    */
-
 }
 #browser_wrapper div.content_wrapper div.table_wrapper,
 #browser_wrapper div.content_wrapper thead th.table_header {
@@ -5033,7 +5066,7 @@
   background-color: #eeeeee;
 }
 #browser_wrapper table tbody tr:last-child td {
-  border-bottom: 1px solid #ddd;
+  border-bottom: 1px solid #dddddd;
   border-radius: 0;
 }
 #browser_wrapper table tbody tr.empty td {
@@ -5047,7 +5080,6 @@
   padding: 6px;
   margin: 0 0 1px 0;
 }
-/* Styling for inline object creation buttons */
 .btn-inline {
   margin-bottom: 9px;
 }
@@ -5055,15 +5087,13 @@
   width: 275px;
   margin-right: 2px;
 }
-
-/* Styling for draged network object */
 #networkListSortContainer {
   display: none;
 }
 .networklist {
   padding: 6px;
-  background: #eee;
-  border: 1px solid #ccc;
+  background: #eeeeee;
+  border: 1px solid #cccccc;
   min-height: 2em;
   width: auto !important;
   -webkit-box-sizing: border-box;
@@ -5075,18 +5105,18 @@
   list-style-type: none;
   margin: 6px auto;
   padding: 3px;
-  background: #fff;
-  border: 1px solid #aaa;
+  background: #ffffff;
+  border: 1px solid #aaaaaa;
   line-height: 18px;
   border-radius: 3px;
   cursor: move;
   padding-left: 23px;
-  background: #ffffff url(/static/dashboard/img/drag.png) no-repeat 11px 50%;
+  background: white url('/static/dashboard/img/drag.png') no-repeat 11px 50%;
 }
 .networklist li em {
   font-size: 0.5em;
   line-height: 1em;
-  color: #999;
+  color: #999999;
   font-style: normal;
   margin-left: 0.8em;
 }
@@ -5112,10 +5142,10 @@
   content: "+";
 }
 .networklist li.ui-sortable-helper {
-  background-color: #def;
+  background-color: #ddeeff;
 }
 .networklist li.ui-state-highlight {
-  border: 1px dotted #ccc;
+  border: 1px dotted #cccccc;
   background: #efefef;
   height: 0.5em;
 }
@@ -5131,7 +5161,7 @@
   margin-bottom: 1.5em;
   counter-reset: v1 0;
   background: #edf9ff;
-  border: 1px solid #c0d9e4;
+  border: 1px solid #77216f;
 }
 #selected_network li {
   position: relative;
@@ -5140,12 +5170,12 @@
   content: "-";
 }
 #selected_network li:before {
-  content: "nic:" counter(v1);
+  content: "nic:"counter(v1);
   counter-increment: v1;
   display: inline-block;
   margin-right: 5px;
-  background: #666;
-  color: #fff;
+  background: #666666;
+  color: #ffffff;
   font-size: 90%;
   padding: 0px 4px;
   vertical-align: middle;
@@ -5155,353 +5185,822 @@
 }
 #selected_network.dragging li:before {
   content: "nic:";
-  background-color: rgba(102, 102, 102, 0.5);
+  background-color: rgba(102,102,102,0.5);
   padding-right: 10px;
 }
 #selected_network.dragging li.ui-state-highlight:before {
   content: "";
   background: transparent;
 }
-/* Styling for network topology */
-@-webkit-keyframes progress-bar-stripes {
-  from {
-    background-position: 20px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-@-moz-keyframes progress-bar-stripes {
-  from {
-    background-position: 20px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-@-ms-keyframes progress-bar-stripes {
-  from {
-    background-position: 20px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-@-o-keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
-  }
-  to {
-    background-position: 20px 0;
-  }
-}
-@keyframes progress-bar-stripes {
-  from {
-    background-position: 20px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-#topologyCanvas {
+#topologyCanvasContainer {
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  -o-box-sizing: border-box;
   box-sizing: border-box;
   width: 100%;
-  height: 500px;
+  height: auto;
   padding: 25px;
   padding-left: 50px;
   background: #efefef;
+  min-height: 400px;
 }
-#topologyCanvas div.nodata {
+#topologyCanvasContainer div.nodata {
   font-size: 150%;
-  font-weight: bold;
   text-align: center;
-  padding-top: 200px;
-  display: none;
-}
-div.networks {
-  height: 100%;
-}
-div.network {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  -o-box-sizing: border-box;
-  box-sizing: border-box;
+  padding-top: 150px;
+  display: none;
+}
+#topologyCanvasContainer.noinfo div.nodata {
+  display: block;
+}
+#topologyCanvasContainer.noinfo #topology_canvas {
+  display: none;
+}
+.topologyNavi {
+  overflow: hidden;
+  margin: 10px 0 20px;
+}
+.topologyNavi i {
+  margin-right: 3px;
+}
+.topologyNavi .toggleView {
   float: left;
-  width: 270px;
-  height: 100%;
-  position: relative;
-}
-div.network .nicname {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  -o-box-sizing: border-box;
-  box-sizing: border-box;
-  height: 100%;
-  width: 17px;
-  border-radius: 17px;
-  z-index: 200;
-  color: #fff;
-  position: absolute;
+}
+.topologyNavi .launchButtons {
+  float: right;
+  text-align: right;
+}
+.topologyNavi .launchButtons a.btn {
+  margin-left: 10px;
+}
+.topologyBalloon {
+  display: none;
+  background: #ffffff;
+  position: absolute;
+  left: 100px;
+  top: 20px;
+  z-index: 600;
+  border-radius: 5px;
+  color: #333333;
+  min-width: 200px;
+  line-height: 1.2;
+  font-size: 11px;
+  -webkit-box-shadow: 0px 1px 6px #777777;
+  -moz-box-shadow: 0px 1px 6px #777777;
+  box-shadow: 0px 1px 6px #777777;
+}
+.topologyBalloon.on {
+  display: block;
+}
+.topologyBalloon .vnc_window {
+  margin-left: 10px;
+}
+.topologyBalloon .closeTopologyBalloon {
+  font-size: 16px;
+  line-height: 1;
+  display: block;
+  position: absolute;
+  font-weight: bold;
+  right: 6px;
+  top: 0px;
+  cursor: pointer;
+  padding: 3px;
+  color: #aaaaaa;
+}
+.topologyBalloon .closeTopologyBalloon:hover {
+  color: #777777;
+  text-decoration: none;
+}
+.topologyBalloon .contentBody {
+  padding: 8px 8px 0;
+}
+.topologyBalloon span.active:before, .topologyBalloon span.down:before {
+  content: "";
+  width: 9px;
+  height: 9px;
+  display: inline-block;
+  background: #0d925b;
+  margin-right: 3px;
+  border-radius: 10px;
+  vertical-align: middle;
+}
+.topologyBalloon span.down:before {
+  background: #e64b41;
+}
+.topologyBalloon .footer {
+  background: #efefef;
+  border-top: 1px solid #d9d9d9;
+  padding: 8px;
+  border-radius: 0px 0px 7px 7px;
+}
+.topologyBalloon .footer .footerInner {
+  display: table;
+  width: 100%;
+}
+.topologyBalloon .footer .cell {
+  display: table-cell;
+  padding-right: 10px;
+}
+.topologyBalloon .footer .link {
+  font-size: 12px;
+}
+.topologyBalloon .footer .delete {
+  padding-right: 0;
+  text-align: right;
+}
+.topologyBalloon .footer .delete .btn:before {
+  content: "Delete ";
+}
+.topologyBalloon .footer .delete .btn.deleting:before {
+  content: "Deleting ";
+}
+.topologyBalloon .footer .delete .btn.instance:before {
+  content: "Terminate ";
+}
+.topologyBalloon .footer .delete .btn.instance.deleting:before {
+  content: "Terminating ";
+}
+.topologyBalloon table.detaiInfoTable {
+  margin-bottom: 5px;
+}
+.topologyBalloon table.detaiInfoTable caption {
+  text-align: left;
+  font-size: 12px;
+  font-weight: bold;
+  margin-bottom: 0px;
+}
+.topologyBalloon table.detaiInfoTable th, .topologyBalloon table.detaiInfoTable td {
+  text-align: left;
+  vertical-align: middle;
+  padding-bottom: 3px;
+  background: transparent;
+}
+.topologyBalloon table.detaiInfoTable th {
+  color: #999999;
+  padding-right: 8px;
+  width: 80px;
+}
+.topologyBalloon table.detaiInfoTable th span {
+  vertical-align: middle;
+  width: 80px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: inline-block;
+}
+.topologyBalloon table.detaiInfoTable th.device {
+  text-align: right;
+}
+.topologyBalloon table.detaiInfoTable td {
+  padding-right: 5px;
+  white-space: nowrap;
+}
+.topologyBalloon table.detaiInfoTable td.delete {
+  padding-right: 0;
+  text-align: right;
+}
+.topologyBalloon table.detaiInfoTable .btn {
+  line-height: 1.4;
+}
+.topologyBalloon table.detaiInfoTable .btn:before {
+  content: "Delete ";
+}
+.topologyBalloon table.detaiInfoTable .btn.deleting:before {
+  content: "Deleting ";
+}
+.topologyBalloon:before {
+  border-top: 7px solid transparent;
+  border-bottom: 7px solid transparent;
+  border-right: 9px solid #bbbbbb;
+  display: block;
+  position: absolute;
+  top: 30px;
+  left: -9px;
+  width: 0;
+  height: 0;
+  content: "";
+}
+.topologyBalloon:after {
+  border-top: 6px solid transparent;
+  border-bottom: 6px solid transparent;
+  border-right: 8px solid #ffffff;
+  display: block;
+  position: absolute;
+  top: 31px;
   left: -8px;
-  top: 0px;
-  cursor: pointer;
-}
-div.network .nicname:hover {
-  background-image: -webkit-linear-gradient(rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0.15));
-  background-image: -moz-linear-gradient(rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0.15));
-  background-image: -ms-linear-gradient(rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0.15));
-  background-image: -o-linear-gradient(rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0.15));
-  background-image: linear-gradient(rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0.15));
-  background-size: 10px 10px;
-}
-div.network .nicname.nourl {
-  cursor: auto;
-}
-div.network .nicname.nourl:hover {
-  background-image: none;
-}
-div.network .nicname h3 {
-  font-size: 12px;
-  line-height: 1;
-  position: relative;
-  font-weight: normal;
-  top: 55%;
-  color: #fff;
-  left: -1px;
-  letter-spacing: 0.2em;
-  -webkit-transform: rotate(-90deg);
-  -moz-transform: rotate(-90deg);
-  -ms-transform: rotate(-90deg);
-  -o-transform: rotate(-90deg);
-  transform: rotate(-90deg);
-  white-space: nowrap;
-  text-shadow: 0px 0px 5px #000;
-}
-div.network .nicname span.ip {
-  position: absolute;
-  bottom: -10px;
-  left: 20px;
-  color: #000;
-  display: block;
-  font-weight: normal;
-  font-size: 90%;
-  letter-spacing: 0.2em;
-  -webkit-transform: rotate(-90deg);
-  -moz-transform: rotate(-90deg);
-  -ms-transform: rotate(-90deg);
-  -o-transform: rotate(-90deg);
-  transform: rotate(-90deg);
-  -webkit-transform-origin: 0% 0%;
-  -moz-transform-origin: 0% 0%;
-  -ms-transform-origin: 0% 0%;
-  -o-transform-origin: 0% 0%;
-  transform-origin: 0% 0%;
-  white-space: nowrap;
-  text-shadow: 0px 0px 2px #fff,0px 0px 2px #fff;
-}
-div.network .router,
-div.network .server,
-div.network .device {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  -o-box-sizing: border-box;
-  box-sizing: border-box;
-  cursor: pointer;
-  width: 90px;
-  border: 3px solid #444;
-  position: absolute;
+  width: 0;
+  height: 0;
+  content: "";
+}
+.topologyBalloon.leftPosition:before {
+  border-right: none;
+  border-left: 9px solid #bbbbbb;
+  right: -9px;
   top: 30px;
-  left: 90px;
-  color: #fff;
-  padding: 0 3px;
-  background: #666;
-  margin-bottom: 20px;
-  border-radius: 8px;
-}
-div.network .router:before,
-div.network .server:before,
-div.network .device:before {
-  content: "";
-  width: 20px;
-  height: 20px;
-  border: 2px solid #444;
-  line-height: 1.2;
-  position: absolute;
-  border-radius: 20px;
-  top: -10px;
-  left: -10px;
-  background: #ffffff url(/static/dashboard/img/router.png) no-repeat center center;
-  background-size: 16px 16px;
-}
-div.network .router:after,
-div.network .server:after,
-div.network .device:after {
-  content: "";
-  width: 100%;
-  line-height: 1.2;
-  position: absolute;
-  text-align: center;
-  border-radius: 0;
-  background: #444;
-  color: #fff;
+  left: auto;
+}
+.topologyBalloon.leftPosition:after {
+  border-right: none;
+  border-left: 8px solid #ffffff;
+  right: -8px;
+  top: 31px;
+  left: auto;
+}
+#topologyMessages {
+  width: 1px;
+  height: 1px;
+  visibility: hidden;
+  position: absolute;
+  top: -100px;
+}
+.link {
+  stroke: #999999;
+  stroke-width: 1.5px;
+}
+.node {
+  cursor: pointer;
+}
+.node text {
+  font: 12px sans-serif;
+}
+#resource_container {
+  position: relative;
+}
+#stack_box {
+  position: absolute;
+  width: 300px;
+  top: 10px;
+  left: 10px;
+}
+#stack_box h3 {
+  font-size: 11pt;
+  line-height: 20px;
+}
+#stack_box p {
+  margin: 0;
+  font-size: 9pt;
+  line-height: 14px;
+}
+#stack_box a {
+  margin: 0;
+  font-size: 9pt;
+  line-height: 14px;
+}
+#stack_box img {
+  float: left;
+}
+#stack_box #stack_info {
+  float: left;
+  white-space: normal;
+  width: 200px;
+}
+#info_box {
+  position: absolute;
+  width: 300px;
+  top: 100px;
+  left: 10px;
+}
+#info_box h3 {
+  font-size: 9pt;
+  line-height: 20px;
+}
+#info_box p {
+  margin: 0;
+  font-size: 9pt;
+  line-height: 14px;
+}
+#info_box a {
+  margin: 0;
+  font-size: 9pt;
+  line-height: 14px;
+}
+#info_box .error {
+  color: darkred;
+}
+#ceilometer-stats .form-horizontal .control-label {
+  width: auto;
+}
+#ceilometer-stats .form-horizontal .controls {
+  float: left;
+  margin-left: 0;
+}
+#ceilometer-stats .form-horizontal .control-group {
+  float: left;
+  margin-right: 20px;
+}
+#ceilometer-stats .form-horizontal .btn {
+  float: left;
+  margin-right: 20px;
+  margin-bottom: 18px;
+}
+#ruleListSortContainer {
+  display: none;
+}
+.rulelist {
+  padding: 6px;
+  background: #eeeeee;
+  border: 1px solid #cccccc;
+  min-height: 2em;
+  width: auto !important;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
+.rulelist li {
+  width: 226px;
+  list-style-type: none;
+  margin: 6px auto;
+  padding: 3px;
+  background: #ffffff;
+  border: 1px solid #aaaaaa;
+  line-height: 18px;
+  border-radius: 3px;
+  cursor: move;
+  padding-left: 23px;
+  background: white url('/static/dashboard/img/drag.png') no-repeat 11px 50%;
+}
+.rulelist li em {
+  font-size: 0.5em;
+  line-height: 1em;
+  color: #999999;
+  font-style: normal;
+  margin-left: 0.8em;
+}
+.rulelist li i {
+  margin-right: 5px;
+  vertical-align: middle;
+}
+.rulelist li a.btn {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
   font-size: 11px;
-  height: 1.5em;
-  bottom: 0px;
-  left: 0px;
-}
-div.network .router span.devicename,
-div.network .server span.devicename,
-div.network .device span.devicename {
-  position: absolute;
-  color: #fff;
-  bottom: 0px;
-  font-size: 12px;
-  line-height: 14px;
-  width: 100%;
+  line-height: 12px;
+  padding: 2px 5px 3px;
+  margin-right: 1px;
+  width: 18px;
   text-align: center;
-  z-index: 300;
-  left: -2px;
-}
-div.network .router span.name,
-div.network .server span.name,
-div.network .device span.name {
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
+  right: 5px;
+  vertical-align: middle;
+  float: right;
+}
+.rulelist li a.btn:before {
+  content: "+";
+}
+.rulelist li.ui-sortable-helper {
+  background-color: #ddeeff;
+}
+.rulelist li.ui-state-highlight {
+  border: 1px dotted #cccccc;
+  background: #efefef;
+  height: 0.5em;
+}
+.rulelist li:after {
+  visibility: hidden;
   display: block;
-  font-size: 12px;
-  position: relative;
-  z-index: 10;
-  text-align: center;
-  top: 4px;
-  padding: 0 3px;
-}
-div.network .router div.port,
-div.network .server div.port,
-div.network .device div.port {
-  text-align: right;
-  min-width: 90px;
-  height: 10px;
-  font: 0px/0px sans-serif;
-  position: absolute;
-  left: -91px;
-  top: 8px;
-  background-color: #37a9e3;
-  background-image: none;
-  -webkit-background-size: 20px 20px;
-  -moz-background-size: 20px 20px;
-  -o-background-size: 20px 20px;
-  background-size: 20px 20px;
-  z-index: 100;
-}
-div.network .router div.port span.ip,
-div.network .server div.port span.ip,
-div.network .device div.port span.ip {
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  -o-box-sizing: border-box;
-  box-sizing: border-box;
-  color: #333;
-  font-size: 9px;
-  line-height: 1;
-  text-shadow: 0px -1px #ffffff;
-  position: relative;
-  top: -1em;
-  width: 90px;
+  font-size: 0;
+  content: " ";
+  clear: both;
+  height: 0;
+}
+#selected_rule {
+  margin-bottom: 1.5em;
+  counter-reset: v1 0;
+  background: #edf9ff;
+  border: 1px solid #77216f;
+}
+#selected_rule li {
+  position: relative;
+}
+#selected_rule li a.btn:before {
+  content: "-";
+}
+#selected_rule li:before {
+  content: "rule:"counter(v1);
+  counter-increment: v1;
   display: inline-block;
-  padding-right: 8px;
-  padding-left: 8px;
-  word-wrap: break-word;
-  word-break: break-all;
-}
-div.network .router div.port.right,
-div.network .server div.port.right,
-div.network .device div.port.right {
-  left: auto;
-  right: -92px;
-  width: 92px;
-  text-align: left;
-}
-div.network .router:hover,
-div.network .server:hover,
-div.network .device:hover {
-  border-color: #222;
-}
-div.network .router:hover div.port,
-div.network .server:hover div.port,
-div.network .device:hover div.port {
-  cursor: pointer;
-  background-color: #2688c0;
-  -webkit-animation: progress-bar-stripes 1s linear infinite;
-  -moz-animation: progress-bar-stripes 1s linear infinite;
-  -ms-animation: progress-bar-stripes 1s linear infinite;
-  -o-animation: progress-bar-stripes 1s linear infinite;
-  animation: progress-bar-stripes 1s linear infinite;
-}
-div.network .router:hover div.port:hover,
-div.network .server:hover div.port:hover,
-div.network .device:hover div.port:hover {
-  -webkit-animation: progress-bar-stripes 0.3s linear infinite;
-  -moz-animation: progress-bar-stripes 0.3s linear infinite;
-  -ms-animation: progress-bar-stripes 0.3s linear infinite;
-  -o-animation: progress-bar-stripes 0.3s linear infinite;
-  animation: progress-bar-stripes 0.3s linear infinite;
-}
-div.network .router:hover div.port.nourl,
-div.network .server:hover div.port.nourl,
-div.network .device:hover div.port.nourl {
-  cursor: auto;
-  background-image: none;
-}
-div.network .router:hover div.port.nourl:hover,
-div.network .server:hover div.port.nourl:hover,
-div.network .device:hover div.port.nourl:hover {
-  background-image: none;
-}
-div.network .router:hover:after,
-div.network .server:hover:after,
-div.network .device:hover:after {
-  background-color: #222;
-  border-color: #222;
-}
-div.network .device {
-  border: none;
+  margin-right: 5px;
+  background: #666666;
+  color: #ffffff;
+  font-size: 90%;
+  padding: 0px 4px;
+  vertical-align: middle;
+  border-radius: 2px;
+  position: absolute;
+  left: -2em;
+}
+#selected_rule.dragging li:before {
+  content: "rule:";
+  background-color: rgba(102,102,102,0.5);
+  padding-right: 10px;
+}
+#selected_rule.dragging li.ui-state-highlight:before {
+  content: "";
   background: transparent;
 }
-div.network .server {
-  background: #fff;
-  color: #333;
-}
-div.network .server:before {
-  background: #ffffff url(/static/dashboard/img/server.png) no-repeat center center;
-  background-size: 14px 14px;
-}
-.launchButtons {
-  text-align: right;
-  margin: 10px 0px 15px 10px;
-}
-.launchButtons a.btn {
-  margin-left: 10px;
-}
-
+
+.rickshaw_graph .detail {
+    pointer-events: none;
+    position: absolute;
+    top: 0;
+    z-index: 2;
+    background: rgba(0, 0, 0, 0.1);
+    bottom: 0;
+    width: 1px;
+    transition: opacity 0.25s linear;
+    -moz-transition: opacity 0.25s linear;
+    -o-transition: opacity 0.25s linear;
+    -webkit-transition: opacity 0.25s linear;
+}
+.rickshaw_graph .detail.inactive {
+    opacity: 0;
+}
+.rickshaw_graph .detail .item.active {
+    opacity: 1;
+}
+.rickshaw_graph .detail .x_label {
+    font-family: Arial, sans-serif;
+    border-radius: 3px;
+    padding: 6px;
+    opacity: 0.5;
+    border: 1px solid #e0e0e0;
+    font-size: 12px;
+    position: absolute;
+    background: white;
+    white-space: nowrap;
+}
+.rickshaw_graph .detail .item {
+    position: absolute;
+    z-index: 2;
+    border-radius: 3px;
+    padding: 0.25em;
+    font-size: 12px;
+    font-family: Arial, sans-serif;
+    opacity: 0;
+    background: rgba(0, 0, 0, 0.4);
+    color: white;
+    border: 1px solid rgba(0, 0, 0, 0.4);
+    margin-left: 1em;
+    margin-top: -1em;
+    white-space: nowrap;
+}
+.rickshaw_graph .detail .item.active {
+    opacity: 1;
+    background: rgba(0, 0, 0, 0.8);
+}
+.rickshaw_graph .detail .item:before {
+    content: "\25c2";
+    position: absolute;
+    left: -0.5em;
+    color: rgba(0, 0, 0, 0.7);
+    width: 0;
+}
+.rickshaw_graph .detail .dot {
+    width: 4px;
+    height: 4px;
+    margin-left: -4px;
+    margin-top: -3px;
+    border-radius: 5px;
+    position: absolute;
+    box-shadow: 0 0 2px rgba(0, 0, 0, 0.6);
+    background: white;
+    border-width: 2px;
+    border-style: solid;
+    display: none;
+    background-clip: padding-box;
+}
+.rickshaw_graph .detail .dot.active {
+    display: block;
+}
+/* graph */
+
+.rickshaw_graph {
+    position: relative;
+}
+.rickshaw_graph svg {
+    display: block;
+    overflow: hidden;
+}
+
+/* ticks */
+
+.rickshaw_graph .x_tick {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    width: 0px;
+    border-left: 1px dotted rgba(0, 0, 0, 0.2);
+    pointer-events: none;
+}
+.rickshaw_graph .x_tick .title {
+    position: absolute;
+    font-size: 12px;
+    font-family: Arial, sans-serif;
+    opacity: 0.5;
+    white-space: nowrap;
+    margin-left: 3px;
+    bottom: 1px;
+}
+
+/* annotations */
+
+.rickshaw_annotation_timeline {
+    height: 1px;
+    border-top: 1px solid #e0e0e0;
+    margin-top: 10px;
+    position: relative;
+}
+.rickshaw_annotation_timeline .annotation {
+    position: absolute;
+    height: 6px;
+    width: 6px;
+    margin-left: -2px;
+    top: -3px;
+    border-radius: 5px;
+    background-color: rgba(0, 0, 0, 0.25);
+}
+.rickshaw_graph .annotation_line {
+    position: absolute;
+    top: 0;
+    bottom: -6px;
+    width: 0px;
+    border-left: 2px solid rgba(0, 0, 0, 0.3);
+    display: none;
+}
+.rickshaw_graph .annotation_line.active {
+    display: block;
+}
+
+.rickshaw_graph .annotation_range {
+        background: rgba(0, 0, 0, 0.1);
+        display: none;
+        position: absolute;
+        top: 0;
+        bottom: -6px;
+}
+.rickshaw_graph .annotation_range.active {
+        display: block;
+}
+.rickshaw_graph .annotation_range.active.offscreen {
+        display: none;
+}
+
+.rickshaw_annotation_timeline .annotation .content {
+    background: white;
+    color: black;
+    opacity: 0.9;
+    padding: 5px 5px;
+    box-shadow: 0 0 2px rgba(0, 0, 0, 0.8);
+    border-radius: 3px;
+    position: relative;
+    z-index: 20;
+    font-size: 12px;
+    padding: 6px 8px 8px;
+    top: 18px;
+    left: -11px;
+    width: 160px;
+    display: none;
+    cursor: pointer;
+}
+.rickshaw_annotation_timeline .annotation .content:before {
+    content: "\25b2";
+    position: absolute;
+    top: -11px;
+    color: white;
+    text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.8);
+}
+.rickshaw_annotation_timeline .annotation.active,
+.rickshaw_annotation_timeline .annotation:hover {
+    background-color: rgba(0, 0, 0, 0.8);
+    cursor: none;
+}
+.rickshaw_annotation_timeline .annotation .content:hover {
+    z-index: 50;
+}
+.rickshaw_annotation_timeline .annotation.active .content {
+    display: block;
+}
+.rickshaw_annotation_timeline .annotation:hover .content {
+    display: block;
+    z-index: 50;
+}
+.rickshaw_graph .y_axis,
+.rickshaw_graph  .x_axis_d3 {
+    fill: none;
+}
+.rickshaw_graph .y_ticks .tick,
+.rickshaw_graph .x_ticks_d3 .tick {
+    stroke: rgba(0, 0, 0, 0.16);
+    stroke-width: 2px;
+    shape-rendering: crisp-edges;
+    pointer-events: none;
+}
+.rickshaw_graph .y_grid .tick,
+.rickshaw_graph .x_grid_d3 .tick {
+    z-index: -1;
+    stroke: rgba(0, 0, 0, 0.20);
+    stroke-width: 1px;
+    stroke-dasharray: 1 1;
+}
+.rickshaw_graph .y_grid path,
+.rickshaw_graph .x_grid_d3 path  {
+    fill: none;
+    stroke: none;
+}
+.rickshaw_graph .y_ticks path,
+.rickshaw_graph .x_ticks_d3 path {
+    fill: none;
+    stroke: #808080;
+}
+.rickshaw_graph .y_ticks text,
+.rickshaw_graph .x_ticks_d3 text {
+    opacity: 0.5;
+    font-size: 12px;
+    pointer-events: none;
+}
+.rickshaw_graph .x_tick.glow .title,
+.rickshaw_graph .y_ticks.glow text {
+    fill: black;
+    color: black;
+    text-shadow:
+        -1px 1px 0 rgba(255, 255, 255, 0.1),
+        1px -1px 0 rgba(255, 255, 255, 0.1),
+        1px 1px 0 rgba(255, 255, 255, 0.1),
+        0px 1px 0 rgba(255, 255, 255, 0.1),
+        0px -1px 0 rgba(255, 255, 255, 0.1),
+        1px 0px 0 rgba(255, 255, 255, 0.1),
+        -1px 0px 0 rgba(255, 255, 255, 0.1),
+        -1px -1px 0 rgba(255, 255, 255, 0.1);
+}