Merge branch 'release-0.3.6.3'

[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 ff56485..6a7eeac 100644 (file)
--- a/src/main/resources/static/css/sone.css
+++ b/src/main/resources/static/css/sone.css
@@ -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;
 }
@@ -287,15 +314,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;
@@ -333,10 +351,6 @@ textarea {
        background-color: #ffffa0;
 }
 
-#sone .sone .id {
-       display: none;
-}
-
 #sone .sone .profile-link {
        display: block;
 }
@@ -376,7 +390,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;
@@ -387,11 +401,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;
@@ -400,11 +410,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;
 }