Redesign and consolidate.

[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 a0d5875..919b033 100644 (file)
--- a/src/main/resources/static/css/sone.css
+++ b/src/main/resources/static/css/sone.css
@@ -1,31 +1,65 @@
 /* Sone Main CSS File */
 
+/* first, override some fproxy rules. */
+#sone .post .reply div,#sone .post .time,#sone .post .delete,#sone .post .show-reply-form
+       {
+       font-size: inherit;
+}
+
+#sone form {
+       margin: 0px;
+}
+
+/* now for the real stuff. */
+
 #sone {
-       width: 50em;
+       width: 68em;
        margin: auto;
 }
 
-#sone a {
-       color: inherit;
+#sone .hidden {
+       display: none;
+}
+
+#sone a, #sone a:link, #sone a:visited {
+       color: rgb(28, 131, 191);
+       font-size: inherit;
        text-decoration: none;
 }
 
-#sone a:visited {
-       color: inherit;
+#sone a:active, #sone a:hover {
+       color: rgb(255, 172, 0);
 }
 
-#sone #sidebar {
-       width: 200px;
-       position: absolute;
+#sone #profile {
+       height: 80px;
 }
 
 #sone .profile-link {
        font-weight: bold;
-       color: #23e;
+       color: rgb(28, 131, 191);
+}
+
+#sone #profile.online .picture {
+       float: left;
+       background-image: url("../images/sone.png");
+       width: 80px;
+       height: 80px;
 }
 
-#sone #profile .picture {
+#sone #profile.offline .picture {
        float: left;
+       background-image: url("../images/sone-offline.png");
+       width: 80px;
+       height: 80px;
+}
+
+#sone #profile.offline .edit-profile-link, #sone #profile.offline .profile-link {
+       display: none;
+}
+
+#sone #profile .edit-profile-link {
+       font-size: 85%;
 }
 
 #sone .nice-name {
@@ -33,14 +67,12 @@
 }
 
 #sone #main {
-       margin-left: 200px;
-       padding-left: 1em;
+       padding: 1em;
 }
 
 #sone .post {
        padding: 1ex 0px;
        border-bottom: solid 1px #ccc;
-       margin-bottom: 1ex;
 }
 
 #sone .post .author {
@@ -50,10 +82,12 @@
 
 #sone .post .text {
        display: inline;
+       white-space: pre-wrap;
 }
 
 #sone .post .status-line {
        clear: both;
+       margin-top: 0.5ex;
        font-size: 85%;
 }
 
@@ -77,16 +111,12 @@
 
 #sone .post .reply {
        clear: both;
-       background-color: #eef;
+       background-color: #f0f0ff;
        font-size: 85%;
        margin: 1ex 0px;
        padding: 1ex;
 }
 
-#sone .post .reply div, #sone .post .time, #sone .post .delete {
-       font-size: inherit; /* or else fproxy's css rules will fuck us. */
-}
-
 #sone .post .reply .time {
        float: none;
        display: inline;
@@ -94,6 +124,20 @@
        font-size: inherit;
 }
 
+#sone .post .show-reply-form {
+       display: inline;
+       color: rgb(28, 131, 191);
+       cursor: pointer;
+}
+
+#sone .post .show-reply-form:hover {
+       color: rgb(255, 172, 0);
+}
+
+#sone .post .show-reply-form:before {
+       content: ' ‧ ';
+}
+
 #sone .post .reply .status-line .delete {
        float: none;
        display: inline;
@@ -105,8 +149,87 @@
 
 #sone .post .create-reply {
        clear: both;
+       background-color: #f0f0ff;
+       padding: 0.5ex;
 }
 
+#sone .post .create-reply.light button {
+       display: none;
+}
+
+#sone .sone {
+       clear: both;
+       background-color: #f0f0ff;
+       border: 1px solid #ccc;
+       margin-bottom: 0.5ex;
+       padding: 0.5ex;
+}
+
+#sone .sone .profile-link {
+       display: block;
+}
+
+#sone .sone .short-request-uri {
+       clear: both;
+       float: right;
+}
+
+#sone .sone .unknown-marker, #sone .sone .download-marker, #sone .sone .insert-marker, #sone .sone .idle-marker, #sone .sone .modified-marker {
+       display: none;
+}
+
+#sone .sone.unknown .unknown-marker, #sone .sone.idle .idle-marker, #sone .sone.downloading .download-marker, #sone .sone.inserting .insert-marker, #sone .sone.modified .modified-marker {
+       display: inline;
+       float: right;
+       border: solid 1px #ccc;
+       border-right: none;
+       border-top: none;
+       padding: 0 0.5ex;
+       position: relative;
+       right: -0.5ex;
+       top: -0.5ex
+}
+
+#sone .sone .last-update {
+       float: right;
+       display: inline;
+}
+
+#sone .sone .modified-marker, #sone .sone .unknown-marker {
+       color: red;
+       font-weight: bold;
+}
+
+#sone .sone form {
+       display: inline;
+       border: solid 1px #ccc;
+       border-left: none;
+       border-bottom: none;
+       padding: 0 0.5ex;
+       position: relative;
+       left: -0.5ex;
+       bottom: -0.5ex
+}
+
+#sone .sone form.block button, #sone .sone form.unblock button, #sone .sone form.follow button, #sone .sone form.unfollow button {
+       display: inline;
+       color: rgb(28, 131, 191);
+       background: none;
+       border: none;
+       font: inherit;
+       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 {
+       display: inline;
+       color: rgb(255, 172, 0);
+}
+
+#sone .sone .spacer {
+       display: inline;
+}
+
+
 #sone h1 {
        font-family: inherit;
        font-size: 200%;
@@ -118,6 +241,6 @@
        font-weight: bold;
 }
 
-#sone input.createpost.default {
+#sone input.status-input.default, input.reply-input.default {
        color: #888;
-}
\ No newline at end of file
+}