Merge pull request #4148 from tomhughes/avatar-image

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 779fbbe35d0fbe705c308258ce30b104dabe1cb4..5f89453c62634dac4ea172294abd75013c886e8e 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -460,6 +460,11 @@ body.small-nav {
       display: block;
       width: $sidebarWidth;
     }
       display: block;
       width: $sidebarWidth;
     }

+
+    button.btn-close {
+      background-color: rgba(255, 255, 255, 0.5);
+      opacity: 1.0;
+    }

   }
 
   #map {
   }
 
   #map {


@@ -1047,49 +1052,24 @@ tr.turn:hover {
   width: 100%;
 }
 
   width: 100%;
 }
 

-/* Rules for the diary list page */
-
-.diary_post {
-  position: relative;
-  padding-top: $lineheight;
-  padding-bottom: $lineheight/2;
-  border-top: 1px solid $grey;
-
-  &.deleted {
-    background-color: #fee;
-  }
-}
-

 /* Rules for the diary entry page */
 
 .diary_entries {
   #map {
     height: 400px;
     display: none;
 /* Rules for the diary entry page */
 
 .diary_entries {
   #map {
     height: 400px;
     display: none;

-    margin-bottom: $lineheight;

   }
   .comments {
     max-width: 740px;
   }
   .diary-comment {
     border-top: 1px dashed $grey;
   }
   .comments {
     max-width: 740px;
   }
   .diary-comment {
     border-top: 1px dashed $grey;

-    padding-top: $lineheight/2;
-    padding-bottom: $lineheight/2;

     &:first-child {
     &:first-child {

-      margin-top: $lineheight/2;
-      padding-top: $lineheight;

       border-top: 1px solid $grey;
     }
       border-top: 1px solid $grey;
     }

-    &.deleted {
-      background-color: #fee;
-    }

     p {
       margin-bottom: $lineheight/2;
     }
     p {
       margin-bottom: $lineheight/2;
     }

-    .comment-heading {
-      margin-bottom: 0;
-      margin-top: 0;
-    }

   }
 }
 
   }
 }
 


@@ -1132,11 +1112,6 @@ tr.turn:hover {
 /* Rules for messages pages */
 
 .messages {
 /* Rules for messages pages */
 
 .messages {

-  button[type="submit"] {
-    margin: auto;
-    white-space: nowrap;
-  }
-

   .inbox-row {
     background: $offwhite;
   }
   .inbox-row {
     background: $offwhite;
   }


@@ -1144,42 +1119,6 @@ tr.turn:hover {
   .inbox-row-unread {
     background: #CBEEA7;
   }
   .inbox-row-unread {
     background: #CBEEA7;
   }

-
-  .right {
-    float: right;
-  }
-}
-
-.inbox-row .inbox-mark-read {
-  display: none;
-}
-
-.info-line {
-  margin-bottom: $lineheight;
-  padding: $lineheight/4 0px 4px 0px;
-  border-bottom: 1px solid $grey;
-
-  form, form div {
-    display: inline;
-  }
-}
-
-.info-line .user_thumbnail_tiny {
-  vertical-align: middle;
-}
-
-.inbox-sent {
-  white-space: nowrap;
-}
-
-.inbox-mark-unread,
-.inbox-mark-read,
-.inbox-delete {
-  width: 1%;
-}
-
-.inbox-row-unread .inbox-mark-unread {
-  display: none;

 }
 
 .search_form {
 }
 
 .search_form {


@@ -1216,15 +1155,8 @@ img.user_thumbnail_tiny {
   max-height: 25px;
 }
 
   max-height: 25px;
 }
 

-/* Rules for geo microformats */
-
-abbr.geo {
-  border-bottom: none;
-}
-

 /* General styles for action lists / subnavs */
 
 /* General styles for action lists / subnavs */
 

-

 nav.secondary-actions {
   margin-left: -11px;
   overflow: hidden;
 nav.secondary-actions {
   margin-left: -11px;
   overflow: hidden;


@@ -1251,24 +1183,6 @@ div.secondary-actions {
   text-align: center;
 }
 
   text-align: center;
 }
 

-/* Create a single-line dl */
-
-dl.dl-inline {
-  dt, dd {
-    display: inline-block;
-  }
-  dd {
-    margin-right: 1em;
-  }
-}
-
-/* Rules for OpenID logo */
-
-.openid_logo {
-  vertical-align: text-bottom;
-  border: 0;
-}
-

 /* Rules for rich text */
 
 .richtext,
 /* Rules for rich text */
 
 .richtext,