Merge branch 'next' into edit-wot-trust

[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 c6b65ff..d1f85a2 100644 (file)
--- a/src/main/resources/static/css/sone.css
+++ b/src/main/resources/static/css/sone.css
@@ -1,7 +1,7 @@
 /* Sone Main CSS File */
 
 /* first, override some fproxy rules. */
-#sone .post .reply div,#sone .post .time,#sone .post .delete,#sone .post .show-reply-form, input[type=text], textarea {
+#sone div, #sone span, #sone .post .time,#sone .post .delete,#sone .post .show-reply-form, input[type=text], textarea {
        font: inherit;
 }
 
@@ -49,8 +49,32 @@ textarea {
        color: rgb(255, 172, 0);
 }
 
+#sone a.internet {
+       color: rgb(255, 0, 0);
+}
+
+#sone a.internet:before {
+       content: '⚠ ';
+}
+
+#sone a.freenet:before {
+       content: '» ';
+}
+
+#sone a.freenet-trusted {
+       color: rgb(0, 128, 0);
+}
+
+#sone a.freenet-trusted:before {
+       content: '★ ';
+}
+
+#sone a img {
+       border: none;
+}
+
 #sone #notification-area {
-       margin-bottom: 1em;
+       margin-top: 1em;
 }
 
 #sone #notification-area .notification {
@@ -58,10 +82,11 @@ textarea {
        border: solid 1px #ccc;
        background-color: #ffffa0;
        margin-bottom: 1ex;
+       min-height: 3.5ex;
 }
 
-#sone #notification-area .notification > div {
-       display: inline;
+#sone #notification-area .notification .dismiss {
+       float: right;
 }
 
 #sone #notification-area .notification .post-count {
@@ -76,6 +101,7 @@ textarea {
 
 #sone #profile {
        height: 80px;
+       margin-top: 1em;
        margin-bottom: 1ex;
 }
 
@@ -128,6 +154,7 @@ textarea {
 
 #sone #main {
        padding: 1em;
+       padding-top: 0px;
 }
 
 #sone #edit-profile #birth-day, #sone #edit-profile #birth-month, #sone #edit-profile #birth-year {
@@ -166,7 +193,7 @@ textarea {
        min-height: 48px;
 }
 
-#sone .post .author {
+#sone .post .author, #sone .post .recipient {
        display: inline;
        font-weight: bold;
 }
@@ -181,33 +208,52 @@ textarea {
        font-size: 85%;
 }
 
+#sone .separator {
+       font: inherit;
+       color: rgb(28, 131, 191);
+}
+
 #sone .post .time {
        display: inline;
        color: #666;
 }
 
-#sone .post .delete, #sone .post .likes, #sone .post .like, #sone .post .unlike {
+#sone .post .delete, #sone .post .likes, #sone .post .like, #sone .post .unlike, #sone .post .trust, #sone .post .distrust, #sone .post .untrust {
        display: inline;
        font: inherit;
+       margin: 0px;
 }
 
 #sone .post .likes.hidden {
        display: none;
 }
 
-#sone .post .like.hidden, #sone .post .unlike.hidden {
+#sone .post .like.hidden, #sone .post .unlike.hidden, #sone .post .trust.hidden, #sone .post .distrust.hidden, #sone .post .untrust.hidden {
        display: none;
 }
 
-#sone .post .delete button, #sone .post .like button, #sone .post .unlike button {
+#sone .post .delete button, #sone .post .like button, #sone .post .unlike button, #sone .post .trust button, #sone .post .distrust button, #sone .post .untrust button {
        border: 0px;
        background: none;
        padding: 0px;
        color: rgb(28, 131, 191);
        font: inherit;
+       margin: 0px;
 }
 
-#sone .post .delete button:hover, #sone .post .like button:hover, #sone .post .unlike button:hover {
+#sone .post .trust button {
+       color: rgb(0, 128, 0);
+}
+
+#sone .post .distrust button {
+       color: rgb(255, 0, 0);
+}
+
+#sone .post .untrust button {
+       color: rgb(64, 64, 64);
+}
+
+#sone .post .delete button:hover, #sone .post .like button:hover, #sone .post .unlike button:hover, #sone .post .trust button:hover, #sone .post .distrust button:hover, #sone .post .untrust button:hover {
        border: 0px;
        background: none;
        padding: 0px;
@@ -215,10 +261,6 @@ textarea {
        cursor: pointer;
 }
 
-#sone .post .delete:before, #sone .post .likes:before, #sone .post .like:before, #sone .post .unlike:before {
-       content: ' ‧ ';
-}
-
 #sone .post .likes span {
        font: inherit;
        color: green;
@@ -283,10 +325,6 @@ textarea {
        color: rgb(255, 172, 0);
 }
 
-#sone .post .show-reply-form:before {
-       content: ' ‧ ';
-}
-
 #sone .post .create-reply {
        clear: both;
        background-color: #f0f0ff;
@@ -324,10 +362,6 @@ textarea {
        background-color: #ffffa0;
 }
 
-#sone .sone .id {
-       display: none;
-}
-
 #sone .sone .profile-link {
        display: block;
 }
@@ -367,7 +401,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;
@@ -378,11 +412,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;
@@ -391,11 +421,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;
 }