Merge commit '0.3.1-RC3' into message-recipient

[Sone.git] / src / main / resources / static / css / sone.css

diff --git a/src/main/resources/static/css/sone.css b/src/main/resources/static/css/sone.css
index 7682859..2861575 100644 (file)
--- a/src/main/resources/static/css/sone.css
+++ b/src/main/resources/static/css/sone.css
@@ -49,6 +49,34 @@ textarea {
        color: rgb(255, 172, 0);
 }
 
+#sone a img {
+       border: none;
+}
+
+#sone #notification-area {
+       margin-top: 1em;
+}
+
+#sone #notification-area .notification {
+       padding: 1ex;
+       border: solid 1px #ccc;
+       background-color: #ffffa0;
+       margin-bottom: 1ex;
+       min-height: 3.5ex;
+}
+
+#sone #notification-area .notification .dismiss {
+       float: right;
+}
+
+#sone #notification-area .notification > div {
+       display: inline;
+}
+
+#sone #notification-area .notification .post-count {
+       margin-left: 1ex;
+}
+
 #sone #plugin-warning {
        border: solid 0.5em red;
        padding: 0.5em;
@@ -57,6 +85,7 @@ textarea {
 
 #sone #profile {
        height: 80px;
+       margin-top: 1em;
        margin-bottom: 1ex;
 }
 
@@ -109,6 +138,7 @@ textarea {
 
 #sone #main {
        padding: 1em;
+       padding-top: 0px;
 }
 
 #sone #edit-profile #birth-day, #sone #edit-profile #birth-month, #sone #edit-profile #birth-year {
@@ -147,7 +177,7 @@ textarea {
        min-height: 48px;
 }
 
-#sone .post .author {
+#sone .post .author, #sone .post .recipient {
        display: inline;
        font-weight: bold;
 }
@@ -185,6 +215,7 @@ textarea {
        background: none;
        padding: 0px;
        color: rgb(28, 131, 191);
+       font: inherit;
 }
 
 #sone .post .delete button:hover, #sone .post .like button:hover, #sone .post .unlike button:hover {
@@ -216,6 +247,10 @@ textarea {
        cursor: pointer;
 }
 
+#sone .post .replies .click-to-show.new {
+       background-color: #ffffa0;
+}
+
 #sone .post .reply > .avatar {
        position: absolute;
 }
@@ -234,6 +269,10 @@ textarea {
        padding: 1ex;
 }
 
+#sone .post .reply.new {
+       background-color: #ffffa0;
+}
+
 #sone .post .reply .time {
        float: none;
        display: inline;
@@ -259,15 +298,6 @@ textarea {
        content: ' ‧ ';
 }
 
-#sone .post .reply .status-line .delete {
-       float: none;
-       display: inline;
-}
-
-#sone .post .reply .status-line .delete:before {
-       content: ' · ';
-}
-
 #sone .post .create-reply {
        clear: both;
        background-color: #f0f0ff;
@@ -276,12 +306,12 @@ textarea {
 
 #sone .post .create-reply input[type=text] {
        margin-left: 0.5ex;
-       width: 45em;
+       width: 44em;
 }
 
 #sone .post .create-reply textarea {
        margin-left: 0.5ex;
-       width: 45em;
+       width: 44em;
        height: 4em;
 }
 
@@ -348,7 +378,7 @@ textarea {
        font-weight: bold;
 }
 
-#sone .sone form {
+#sone .sone form.follow, #sone .sone form.unfollow, #sone .sone form.lock, #sone .sone form.unlock {
        display: inline;
        border: solid 1px #ccc;
        border-left: none;
@@ -359,11 +389,7 @@ textarea {
        bottom: -0.5ex
 }
 
-#sone .sone form.hidden {
-       display: none;
-}
-
-#sone .sone form.block button, #sone .sone form.unblock button, #sone .sone form.follow button, #sone .sone form.unfollow button, #sone .sone form.blacklist button, #sone .sone form.unblacklist button {
+#sone .sone form.follow button, #sone .sone form.unfollow button, #sone .sone form.lock button, #sone .sone form.unlock button {
        display: inline;
        color: rgb(28, 131, 191);
        background: none;
@@ -372,11 +398,19 @@ textarea {
        padding: 0px;
 }
 
-#sone .sone form.block button:hover, #sone .sone form.unblock button:hover, #sone .sone form.follow button:hover, #sone .sone form.unfollow button:hover, #sone .sone form.blacklist button:hover, #sone .sone form.unblacklist button:hover {
+#sone .sone form.follow button:hover, #sone .sone form.unfollow button:hover, #sone .sone form.lock button:hover, #sone .sone form.unlock button:hover {
        display: inline;
        color: rgb(255, 172, 0);
 }
 
+#sone .sone.locked form.lock, #sone .sone.unlocked form.unlock {
+       display: none;
+}
+
+#sone .sone form.hidden {
+       display: none;
+}
+
 #sone .sone .spacer {
        display: inline;
 }