first impl. of RHS sidebar

Netdisco/public/css/netdisco.css

@@ -35,20 +35,6 @@ form .clearfix.success input {
   background-color: #A9DBA9;
 }
 
-/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-/* right hand side device label */
-
-.device_label_right {
-  float: right !important;
-  margin-bottom: -7px !important;
-  display: none;
-}
-
-/* take a block element and force it inline */
-.inline {
-  display: inline !important;
-}
-
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* results table links */
 
@@ -200,13 +186,28 @@ h3.device_label {
   color: #660033;
 }
 
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* right hand side device label */
+
+.device_label_right {
+  float: right !important;
+  margin-bottom: -7px !important;
+  display: none;
+}
+
+/* take a block element and force it inline */
+.inline {
+  display: inline !important;
+}
+
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 /* sidebar collapser */
 
 /* for placing the sidebar toggle icons */
 #sidebar_toggle_img_in {
-  margin-top: -10px;
-  margin-left: 164px;
+  float: right;
+  margin-top: -7px;
+  margin-right: -16px;
   cursor: pointer;
 }
 
@@ -214,7 +215,7 @@ h3.device_label {
 #sidebar_toggle_img_out {
   position: fixed;
   top: 60px;
-  left: 4px;
+  right: 7px;
   z-index: 1;
   cursor: pointer;
   display: none;
@@ -224,19 +225,25 @@ h3.device_label {
 /* sidebar placement and sizing */
 
 /* make the sidebar fixed on the screen */
-.sidebar {
-  position: fixed !important;
+.container-fluid > .sidebar {
+  position: fixed;
   margin-top: 50px;
-}
-
-/* make the sidebar less wide */
-.well {
-  margin-right: 15px;
+  right: 20px;
+  width: 200px;
+  left: auto;
 }
 
 /* make the content start more to the left now the sidebar is narrower */
-.nd_content {
-  margin-left: 225px !important;
+.container-fluid > .content {
+  margin-right: 220px;
+  margin-left: 0px;
+}
+
+/* nudge content in the sidebar closer to the left */
+.nd_sidesearchform {
+  padding-left: 0px;
+  margin-top: -7px;
+  margin-bottom: 0px;
 }
 
 /* nudge content closer to the header labels in the sidebar */
@@ -244,10 +251,4 @@ h3.device_label {
   padding-top: 4px !important;
 }
 
-/* nudge content in the sidebar closer to the left */
-.nd_sidesearchform {
-  padding-left: 0px;
-  margin-bottom: 0px;
-}
-
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */

Netdisco/public/javascripts/netdisco.js

@@ -120,7 +120,7 @@ $(document).ready(function() {
       $('.sidebar').toggle(
         function() {
           $('#sidebar_toggle_img_out').toggle();
-          $('.nd_content').animate({'margin-left': '5px !important'}, 100);
+          $('.content').animate({'margin-right': '10px !important'}, 100);
           $('.device_label_right').toggle();
         }
       );
@@ -129,7 +129,7 @@ $(document).ready(function() {
   $('#sidebar_toggle_img_out').click(
     function() {
       $('#sidebar_toggle_img_out').toggle();
-      $('.nd_content').animate({'margin-left': '225px !important'}, 200,
+      $('.content').animate({'margin-right': '220px !important'}, 200,
         function() {
           $('.device_label_right').toggle();
           $('.sidebar').toggle(200);