diff --git a/Netdisco/public/css/print.css b/Netdisco/public/css/nd_print.css
similarity index 100%
rename from Netdisco/public/css/print.css
rename to Netdisco/public/css/nd_print.css
diff --git a/Netdisco/public/css/style.css b/Netdisco/public/css/netdisco.css
similarity index 76%
rename from Netdisco/public/css/style.css
rename to Netdisco/public/css/netdisco.css
index b0e5d1a3..e0f98a54 100644
--- a/Netdisco/public/css/style.css
+++ b/Netdisco/public/css/netdisco.css
@@ -1,28 +1,13 @@
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
/* for the fixed navbar make sure content stops short of page top*/
+
body {
padding-top: 50px;
}
-/* the bootstrap style is only set for input so set for select too*/
-/* also make the green a little more visible */
-form .clearfix.success select {
- border-color: green;
-}
-form .clearfix.success input {
- border-color: green;
-}
-
-/* make the sidebar less wide */
-.well {
- margin-right: 15px;
-}
-
-/* make the content start more to the left now the sidebar is narrower */
-.nd_content {
- margin-left: 225px !important;
-}
-
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
/* various styles to adjust the hero box used for homepage + login */
+
.nd_loginalert {
margin-top: -40px;
}
@@ -40,17 +25,19 @@ form .clearfix.success input {
margin-bottom: 0px;
}
-/* nudge content closer to the header labels in the sidebar */
-.inputs-list:first-child {
- padding-top: 4px !important;
-}
-
-/* colour for device name and ip in sidebar */
-.device_label {
- color: #660033;
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* change highlighting for form fields which are being used in a search */
+
+form .clearfix.success select {
+ background-color: #A9DBA9;
+}
+form .clearfix.success input {
+ background-color: #A9DBA9;
}
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
/* right hand side device label */
+
.device_label_right {
float: right !important;
margin-bottom: -7px !important;
@@ -62,45 +49,9 @@ form .clearfix.success input {
display: inline !important;
}
-/* nudge content in the sidebar closer to the left */
-.nd_sidesearchform {
- padding-left: 0px;
- margin-bottom: 0px;
- /* margin-top: 8px; */
-}
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* results table links */
-/* fixups for prepended checkbox in sidebar */
-.nd_searchcheckbox {
- width: 120px;
- padding-left: 35px;
- cursor: pointer;
-}
-
-/* placement of the search/filter bookmark link icon */
-.nd_bookmark {
- vertical-align: top;
-}
-
-/* fixups for placing the Archived "A" inside the prepended checkbox */
-.nd_legendlabel {
- float: right;
- line-height: 1.2;
- margin-top: 2px;
- margin-right: 3px;
-}
-
-/* somewhere between span1 and span2 is desirable */
-.nd_days_select {
- width: 56px;
- margin-left: -2px !important;
-}
-
-/* search/filter button placement */
-.nd_search {
- margin-top: 15px;
-}
-
-/* results table links with no decoration */
.nd_stealthlink {
text-decoration: none !important;
color: #404040;
@@ -113,6 +64,9 @@ form .clearfix.success input {
height: 100%;
}
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* many styles for the collapsing lists */
+
/* mouse-over should be pointer to show JS collapser is clickable */
.nd_collapser {
cursor: pointer;
@@ -148,6 +102,11 @@ form .clearfix.success input {
border-top: 8px solid #F89406;
}
+/* for the tagged vlans total when hiding the full list */
+.vlan_total {
+ float: right;
+}
+
/* draw little up arrow to the right of a label for collapsed list */
.cell-arrow-up {
float: left;
@@ -168,21 +127,82 @@ form .clearfix.success input {
border-top: 8px solid #F89406;
}
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* for table to center cell content */
+
+.center_cell {
+ text-align: center;
+}
+
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* style customization for many items which appear in the sidebar */
+
+/* fixups for prepended checkbox in sidebar */
+.nd_searchcheckbox {
+ width: 120px;
+ padding-left: 35px;
+ cursor: pointer;
+}
+
+/* fixups for placing the Archived "A" inside the prepended checkbox */
+.nd_legendlabel {
+ float: right;
+ line-height: 1.2;
+ margin-top: 2px;
+ margin-right: 3px;
+}
+
+/* somewhere between span1 and span2 is desirable */
+.nd_days_select {
+ width: 56px;
+ margin-left: -2px !important;
+}
+
+/* search/filter button placement */
+.nd_search {
+ margin-top: 15px;
+}
+
+/* placement of the search/filter bookmark link icon */
+.nd_bookmark {
+ vertical-align: top;
+}
+
/* nudge the port name/vlan filter over a little */
.nd_port_query {
margin-left: -2px !important;
}
-/* for ports table to center cell content */
-.center_cell {
- text-align: center;
+/* little sweep brush inside of port filter input field */
+.field_clear_icon {
+ position: absolute;
+ margin-left: 132px;
+ z-index: 1;
}
-/* for the tagged vlans total when hiding the full list */
-.vlan_total {
- float: right;
+/* make the sweep icon fill the height of the input field
+so that its tooltip takes prescedence over the field tooltip */
+.field_clear_icon > img {
+ padding: 6px;
}
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* device and ip label in sidebar */
+
+/* pull the device label closer to the top of the sidebar
+to reduce the useless gap */
+h3.device_label {
+ margin-top: -12px;
+}
+
+/* colour for device name and ip in sidebar */
+.device_label {
+ color: #660033;
+}
+
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* sidebar collapser */
+
/* for placing the sidebar toggle icons */
#sidebar_toggle_img_in {
margin-top: -10px;
@@ -200,11 +220,8 @@ form .clearfix.success input {
display: none;
}
-/* pull the device label closer to the top of the sidebar
-to reduce the useless gap */
-h3.device_label {
- margin-top: -12px;
-}
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* sidebar placement and sizing */
/* make the sidebar fixed on the screen */
.sidebar {
@@ -212,15 +229,25 @@ h3.device_label {
margin-top: 50px;
}
-/* little sweep brush inside of port filter input field */
-.field_clear_icon {
- position: absolute;
- margin-left: 132px;
- z-index: 1;
+/* make the sidebar less wide */
+.well {
+ margin-right: 15px;
}
-/* make the sweep icon fill the height of the input field
-so that its tooltip takes prescedence over the field tooltip */
-.field_clear_icon > img {
- padding: 6px;
+/* make the content start more to the left now the sidebar is narrower */
+.nd_content {
+ margin-left: 225px !important;
}
+
+/* nudge content closer to the header labels in the sidebar */
+.inputs-list:first-child {
+ padding-top: 4px !important;
+}
+
+/* nudge content in the sidebar closer to the left */
+.nd_sidesearchform {
+ padding-left: 0px;
+ margin-bottom: 0px;
+}
+
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Netdisco/views/layouts/main.tt b/Netdisco/views/layouts/main.tt
index 02ff9ab1..3dc65f17 100644
--- a/Netdisco/views/layouts/main.tt
+++ b/Netdisco/views/layouts/main.tt
@@ -25,8 +25,8 @@
-
-
+
+