5 files changed, 8 insertions, 72 deletions
diff --git a/web/cobrands/barnet/layout.scss b/web/cobrands/barnet/layout.scss
index a6332bbff..67b51ddcf 100644
--- a/web/cobrands/barnet/layout.scss
+++ b/web/cobrands/barnet/layout.scss
@@ -224,13 +224,8 @@ body.frontpage {
 }
 
 
-.general-sidebar-notes {
-    left: 25.5em;
-    width: 14em;
-    font-size: 1.2em;
-    p {
-        margin-bottom: 0 !important;
-    }
+.general-notes {
+    font-size: 1em;
 }
 
 #front-howto #front_stats div big,
diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss
index f5e6e9801..8343cd040 100644
--- a/web/cobrands/bromley/layout.scss
+++ b/web/cobrands/bromley/layout.scss
@@ -97,17 +97,6 @@ body.frontpage {
     right: -480px;
 }
 
-.general-sidebar-notes,
-#report-a-problem-sidebar {
-  position: static;
-  width: auto;
-  @include box-shadow(rgba(0, 0, 0, 0), 0, 0, 0);
-  .sidebar-tips,
-  .sidebar-notes {
-    font-size:1em;
-  }
-}
-
 .ie7 .big-green-banner {
     right: 0;
 }
diff --git a/web/cobrands/eastsussex/layout.scss b/web/cobrands/eastsussex/layout.scss
index 68ab3b3cb..6dd3eaad8 100644
--- a/web/cobrands/eastsussex/layout.scss
+++ b/web/cobrands/eastsussex/layout.scss
@@ -95,7 +95,7 @@ body.mappage {
     }
 }
 
-.general-sidebar-notes p, #report-a-problem-sidebar p, #report-a-problem-sidebar .sidebar-notes .plain-list li {
+.general-notes, #report-a-problem-sidebar p, #report-a-problem-sidebar .sidebar-notes .plain-list li {
     font-size: 13px;
     line-height: 14px;
 }
diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss
index c48568f1f..9b6308e09 100644
--- a/web/cobrands/oxfordshire/layout.scss
+++ b/web/cobrands/oxfordshire/layout.scss
@@ -82,18 +82,6 @@ body.twothirdswidthpage {
     }
 }
 
-// show the sidebar tips and notices in the document flow, i.e., in the
-// left-hand column, rather than in smaller text above the map
-.general-sidebar-notes {
-    position: static;
-    width: auto;
-    @include box-shadow(rgba(0, 0, 0, 0), 0, 0, 0);
-    .sidebar-tips,
-    .sidebar-notes {
-        font-size:1em;
-    }
-}
-
 // To prevent font size larger interfering with the fixed Oxfordshire layout
 .container { width: auto; }
 .full-width { width: 464px; }
@@ -137,15 +125,10 @@ body.mappage {
     .full-width { width: 377px; }
     .shadow-wrap { width: 377px; }
 
-    .general-sidebar-notes,
     #report-a-problem-sidebar {
         top: 1em;
         left: 23.5em;
     }
-
-    #forgotten-pw {
-        left: 21.6em;
-    }
 }
 
 .ie6, .ie7 {
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index 05b4b6d85..4f8b9597f 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -743,7 +743,7 @@ textarea.form-error {
   @include border-radius(0 0 0.25em 0.25em);
 }
 
-#report-a-problem-sidebar, .general-sidebar-notes {
+#report-a-problem-sidebar {
     position: absolute;
     left: 29em;
     width: 15em;
@@ -764,13 +764,12 @@ textarea.form-error {
   }
 }
 .ie6, .ie7 {
-  #report-a-problem-sidebar, .general-sidebar-notes {
+  #report-a-problem-sidebar {
     left: 28.5em; // 0.5em left margin gone on .content in IE6/7, so reduce this accordingly.
     z-index: 1;
   }
 }
 
-.no-js .general-sidebar-notes,
 .no-js #report-a-problem-sidebar {
   position: static;
   width: auto;
@@ -781,26 +780,9 @@ textarea.form-error {
   }
 }
 
-// More general sidebar notes
-.general-sidebar-notes {
-  p {
-    background:#eeeeee;
-    font-size:0.75em;
-    padding:0.75em;
-    margin:0;
-    &.dark {
-      background:#333333;
-      color:#ffffff;
-    }
-  }
-}
-
-/* Adjust the above so text flow can be different from display */
-#forgotten-pw {
-    position: relative;
-    left: 26.5em;
-    top: -7em;
-    margin-bottom: -7em; // So no gap in main flow
+// More general notes
+.general-notes {
+    font-size: 0.75em;
 }
 
 // Frontpage
@@ -1176,19 +1158,6 @@ $button_bg_col: #a1a1a1;  // also search bar (tables)
     width:auto;
   }
 
-  //put the RAP notes into the main copy area
-  // Note: Also used for the non-JS case.
-  #report-a-problem-sidebar,
-  .general-sidebar-notes {
-    position: static;
-    width: auto;
-    @include box-shadow(rgba(0, 0, 0, 0) 0 0 0);
-    .sidebar-tips,
-    .sidebar-notes {
-      font-size:1em;
-    }
-  }
-
   //Revert to mobile use of the .full-width class
   .full-width{
     width: auto;