Changed sidebar close button to Bootstrap

[rails.git] / app / assets / stylesheets / common.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 1562b3fcabc068518b0ce31114934f5a43802e35..5a03c49e1f54383c79f2747a4a66a30bd1f9ab13 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -62,17 +62,6 @@ small, aside {
 .icon.note.grey   { /* no-r2 */ background-position: -240px -20px; }
 .icon.query       { /* no-r2 */ background-position: -260px 0; }
 
 .icon.note.grey   { /* no-r2 */ background-position: -240px -20px; }
 .icon.query       { /* no-r2 */ background-position: -260px 0; }
 

-/* Rules for links */
-
-a {
-  color: #24d;
-  text-decoration: none;
-  outline: 0;
-  &:hover {
-    text-decoration: underline;
-  }
-}
-

 /* Utility for de-emphasizing content */
 
 .text-muted a {
 /* Utility for de-emphasizing content */
 
 .text-muted a {


@@ -202,7 +191,7 @@ nav.secondary {
 
   .login-menu {
     .btn-outline-secondary {
 
   .login-menu {
     .btn-outline-secondary {

-      @include button-outline-variant($darkgrey);
+      @include button-outline-variant($darkgrey, $white, null, null, $white);

     }
   }
 
     }
   }
 


@@ -644,11 +633,6 @@ body.compact-nav {
   padding: $lineheight/2 $lineheight;
   // background: $offwhite;
   // border-bottom: 1px solid $grey;
   padding: $lineheight/2 $lineheight;
   // background: $offwhite;
   // border-bottom: 1px solid $grey;

-  > .close {
-    float: right;
-    margin-top: 2px;
-    cursor: pointer;
-  }

 }
 
 #browse_status {
 }
 
 #browse_status {


@@ -686,6 +670,28 @@ form {
   }
 }
 
   }
 }
 

+/* Stop bootstrap 5 from floating legends when they don't need to be */
+legend {
+  float: none;
+}
+
+/* Override the text colour for primary and secondary buttons, to match our
+   bootstrap 4 colours. Note this has accessibility issues, which is why
+   bootstrap 5 calculates black as the appropriate colour, and we should
+   reconsider our colours at some point with that in mind. */
+
+.btn-primary {
+  @include button-variant($primary, $primary, $white, null, null, $white, null, null, $white, null, null, $white);
+}
+
+.btn-secondary {
+  @include button-variant($secondary, $secondary, $white, null, null, $white, null, null, $white, null, null, $white);
+}
+
+.btn-outline-secondary {
+  @include button-outline-variant($secondary, $white, null, null, $white);
+}
+

 /* Rules for the search and direction forms */
 
 header .search_forms,
 /* Rules for the search and direction forms */
 
 header .search_forms,


@@ -860,16 +866,6 @@ tr.turn:hover {
     }
   }
 
     }
   }
 

-  .comments-header {
-    float: left;
-  }
-
-  .subscribe-buttons {
-    float: left;
-    margin: 0 10px;
-    min-width: 80px;
-  }
-

   .subscribe-buttons input {
     font-size: 90%;
     line-height: 15px;
   .subscribe-buttons input {
     font-size: 90%;
     line-height: 15px;


@@ -1082,10 +1078,6 @@ tr.turn:hover {
   &.deleted {
     background-color: #fee;
   }
   &.deleted {
     background-color: #fee;
   }

-
-  img.user_thumbnail {
-    float: left;
-  }

 }
 
 /* Rules for the diary entry page */
 }
 
 /* Rules for the diary entry page */


@@ -1121,10 +1113,6 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

-.diary_entries-show img.user_thumbnail {
-  float: left;
-}
-

 /* Rules for the log in page */
 
 #login_auth_buttons {
 /* Rules for the log in page */
 
 #login_auth_buttons {


@@ -1200,8 +1188,9 @@ tr.turn:hover {
 /* Rules for messages pages */
 
 .messages {
 /* Rules for messages pages */
 
 .messages {

-  input[type="submit"] {
+  button[type="submit"] {

     margin: auto;
     margin: auto;

+    white-space: nowrap;

   }
 
   .inbox-row {
   }
 
   .inbox-row {


@@ -1252,8 +1241,6 @@ tr.turn:hover {
 /* Rules for "flash" notice boxes shown at the top of the content area */
 
 .flash {
 /* Rules for "flash" notice boxes shown at the top of the content area */
 
 .flash {

-  padding: $lineheight;
-

   &.error {
     background-color: #ff7070;
   }
   &.error {
     background-color: #ff7070;
   }


@@ -1455,13 +1442,6 @@ dl.dl-inline {
   }
 }
 
   }
 }
 

-/* Customise the background colour of striped tables */
-
-.table-striped > tbody > tr:nth-child(2n+1) > td,
-.table-striped > tbody > tr:nth-child(2n+1) > th {
-   background-color: $offwhite;
-}
-

 /* Rules for OpenID logo */
 
 .openid_logo {
 /* Rules for OpenID logo */
 
 .openid_logo {