Combine layouts

Web/Content/Site.css

@@ -1,15 +1,13 @@
 body {
-}
-
-#content {
-    padding: .5em 1em;
+  position: relative;
+  padding-top: 60px;
 }
 
 .brand
 {
-    background: url(images/Header.png) no-repeat left center;
-    height: 28px;
-    width: 266px;
+  background: url(images/Header.png) no-repeat left center;
+  height: 28px;
+  width: 266px;
 }
 
 .navbar .brand {
@@ -21,16 +19,168 @@ body {
     line-height: 29px;
 }
 
-@media (max-width: 767px) {
-    .input-mini {
-        width: 60px !important;
-    }
-    .input-small {
-        width: 90px !important;
+.nav > li button.btn-link {
+    display: block;
+}
+
+.navbar .nav > li button.btn-link {
+    float: none;
+    padding: 12px 15px 0;
+    color: #777;
+    text-decoration: none;
+}
+
+.navbar-inverse .nav > li button.btn-link {
+    color: #999;
+}
+
+.navbar-inverse .nav > li button.btn-link:hover {
+    color: white;
+}
+
+.navbar .nav > li form {
+    margin: 0;
+}
+
+footer {
+    background-color: #101010;
+    color: #666;
+    text-align: center;
+    padding: 4px;
+}
+
+.qtip-content dt {
+    line-height: 10px;
+    width: 110px;
+}
+
+.qtip-content dd {
+    line-height: 10px;
+    margin-left: 120px;
+}
+
+fieldset legend {
+    margin: 0;
+    border: 0;
+}
+
+.validation-summary-errors ul {
+    list-style-type: none;
+    margin: 0;
+}
+
+.report-calculation
+{
+    display: none;
+}
+
+#log-title {
+    background: url(images/glyphicons_026_road.png) no-repeat left center;
+    display: inline;
+    height: 24px;
+    width: 28px;
+    padding-left: 36px;
+}
+
+#vehicle-title {
+    background: url(images/glyphicons_005_car.png) no-repeat left center;
+    display: inline;
+    height: 24px;
+    width: 28px;
+    padding-left: 36px;
+}
+
+.icon-car {
+  background-image: url("images/glyphicons_005_car_half.png");
+  background-position: 0 0;
+}
+
+#users-online {
+    display: inline-block;
+    margin-top: 10px;
+    margin-left: 20px;
+    line-height: 30px;
+}
+
+.dropdown-menu > li > a:hover > .icon-car {
+    background-image: url("images/glyphicons_005_car_half_white.png");
+    background-position: 0 0;
+}
+
+dl.inline, dl.inline dt, dl.inline dd {
+    float: left;
+}
+
+dl.inline { 
+    margin-right: 30px;
+}
+
+@media print {
+    header,
+    footer,
+    .no-print
+    { display:none }
+}
+
+/* Responsive 
+------------------*/
+
+@media (min-width: 768px) and (max-width: 979px) {
+    body {
+        padding-top: 0;
     }
 }
 
-@media (max-width: 480px) { 
+@media (max-width: 767px) {
+
+    body {
+        padding: 0;
+    }
+
+    .container-fluid {
+        padding: 0 10px;
+    }
+
+    .input-mini {
+        width: 60px !important;
+    }
+
+    .input-small {
+        width: 90px !important;
+    }
+
+    .dl-horizontal dt {
+        float: left;
+        width: 110px;
+        text-align: right;
+    }
+
+    .dl-horizontal dd {
+        margin-left: 120px;
+    }
+}
+
+@media (max-width: 480px) {
+
+    body {
+        padding: 0;
+    }
+
+    .container-fluid {
+        padding: 0 10px;
+    }
+
+
+    .brand {
+        background: url(images/Header.mobile.png) no-repeat left center;
+        height: 28px;
+        width: 205px;
+    }
+
+    .navbar .brand {
+        margin-left: 5px;
+        padding: 10px 0;
+    }
 
     fieldset legend {
         margin-bottom: 0;
@@ -50,23 +200,11 @@ body {
         margin-bottom: 10px;
     }
 
-    .form-horizontal .control-group.endOdometer {
-        margin-bottom: 0;
-    }
+        .form-horizontal .control-group.endOdometer {
+            margin-bottom: 0;
+        }
 
     .employeeName input {
         width: 120px;
     }
 }
-
-@media (max-width: 767px) {
-    .dl-horizontal dt {
-        float: left;
-        width: 110px;
-        text-align: right;
-    }
-
-    .dl-horizontal dd {
-        margin-left: 120px;
-    }
-}