projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
5f3e938
..
c978bac
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);
}
color: rgb(255, 172, 0);
}
+#sone a.internet {
+ color: rgb(255, 0, 0);
+}
+
+#sone a img {
+ border: none;
+}
+
#sone #notification-area {
#sone #notification-area {
- margin-bottom: 1em;
+ 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 .post-count {
+ margin-left: 1ex;
}
#sone #plugin-warning {
}
#sone #plugin-warning {
@@
-61,6
+85,7
@@
textarea {
#sone #profile {
height: 80px;
#sone #profile {
height: 80px;
+ margin-top: 1em;
margin-bottom: 1ex;
}
margin-bottom: 1ex;
}
@@
-113,6
+138,7
@@
textarea {
#sone #main {
padding: 1em;
#sone #main {
padding: 1em;
+ padding-top: 0px;
}
#sone #edit-profile #birth-day, #sone #edit-profile #birth-month, #sone #edit-profile #birth-year {
}
#sone #edit-profile #birth-day, #sone #edit-profile #birth-month, #sone #edit-profile #birth-year {
@@
-151,7
+177,20
@@
textarea {
min-height: 48px;
}
min-height: 48px;
}
-#sone .post .author {
+#sone .trust {
+ font-size: 85%;
+ text-align: center;
+}
+
+#sone .trust .explicit {
+ color: rgb(0, 128, 0);
+}
+
+#sone .trust .implicit {
+ color: rgb(128, 128, 128);
+}
+
+#sone .post .author, #sone .post .recipient {
display: inline;
font-weight: bold;
}
display: inline;
font-weight: bold;
}
@@
-171,9
+210,10
@@
textarea {
color: #666;
}
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 .increase-trust, #sone .post .decrease-trust
{
display: inline;
font: inherit;
display: inline;
font: inherit;
+ margin: 0px;
}
#sone .post .likes.hidden {
}
#sone .post .likes.hidden {
@@
-184,14
+224,16
@@
textarea {
display: none;
}
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 .increase-trust button, #sone .post .decrease-trust button
{
border: 0px;
background: none;
padding: 0px;
color: rgb(28, 131, 191);
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 .delete button:hover, #sone .post .like button:hover, #sone .post .unlike button:hover
, #sone .post .increase-trust button:hover, #sone .post .decrease-trust button:hover
{
border: 0px;
background: none;
padding: 0px;
border: 0px;
background: none;
padding: 0px;
@@
-208,6
+250,19
@@
textarea {
color: green;
}
color: green;
}
+#sone .post .trust {
+ display: inline;
+}
+
+#sone .post .trust:before {
+ content: ' · ';
+}
+
+#sone .trust .explicit, #sone .trust .implicit {
+ font: inherit;
+ display: inline;
+}
+
#sone .post .replies {
clear: both;
padding-top: 0.2ex;
#sone .post .replies {
clear: both;
padding-top: 0.2ex;
@@
-271,15
+326,6
@@
textarea {
content: ' ‧ ';
}
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;
#sone .post .create-reply {
clear: both;
background-color: #f0f0ff;
@@
-317,10
+363,6
@@
textarea {
background-color: #ffffa0;
}
background-color: #ffffa0;
}
-#sone .sone .id {
- display: none;
-}
-
#sone .sone .profile-link {
display: block;
}
#sone .sone .profile-link {
display: block;
}
@@
-360,7
+402,7
@@
textarea {
font-weight: bold;
}
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;
display: inline;
border: solid 1px #ccc;
border-left: none;
@@
-371,11
+413,7
@@
textarea {
bottom: -0.5ex
}
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;
display: inline;
color: rgb(28, 131, 191);
background: none;
@@
-384,11
+422,19
@@
textarea {
padding: 0px;
}
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);
}
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;
}
#sone .sone .spacer {
display: inline;
}