Somewhat better layout for approving/rejecting subrequests

[quix0rs-gnu-social.git] / theme / base / css / display.css

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 631a62ea5dca35ad81d80bae3bb14fed0c4e291b..234bd9c9130b5519435e7542138b813b54eb6f24 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -20,7 +20,11 @@ ol, ul {list-style-position: inside;}
 fieldset {border: none;}
 legend {font-weight: bold; font-size: 1.2em;}
 input, textarea, select, option {padding: 2px;}
-textarea {overflow:auto;}
+
+textarea {
+    overflow:auto;
+    resize: vertical;
+}
 
 body {
     background-color: #f2f2f2;
@@ -79,6 +83,10 @@ option {
     padding-bottom: 0px;
 }
 
+.hidden {
+    display: none;
+}
+
 #wrap {
     position: relative;
     width: 960px;
@@ -248,15 +256,20 @@ address .poweredby {
 /* input forms */
 
 .input_forms {
-    float: left;
     position: relative;
     margin-bottom: 10px;
     border-bottom: 1px dotted #ccc;
+    width: 100%;
+}
+
+.input_forms > label {
+    float: left;
+    margin-right: 1em;
+    opacity: 0.6;
 }
 
 #input_form_nav {
     float: left;
-    width: 100%;
     margin-bottom: 10px;
     list-style-type: none;
 }
@@ -384,7 +397,7 @@ address .poweredby {
 
 .form_notice .count {
     position: absolute;
-    top: 50px;
+    bottom: 72px;
     right: 32px;
     z-index: 99;
     font-size: 0.8em;
@@ -443,14 +456,9 @@ address .poweredby {
 }
 
 .input_form fieldset fieldset label {
-    position: absolute;
-    top: 0;
-    left: 6px;
     float: none;
     text-align: left;
     color: #888;
-    cursor: text;
-    background: #fff;
 }
 
 .input_form .form_settings li input {
@@ -471,6 +479,10 @@ address .poweredby {
     font-size: 1em;
 }
 
+.input_form .form_data label {
+    display: none;
+}
+
 .input_form .form_settings .form_data p.form_guide {
     margin-left: 5px;
 }
@@ -622,19 +634,26 @@ address .poweredby {
     line-height: 1.36em;
 }
 
-.notice, .profile, .application, #content .peopletag {
+.profile, .application, #content .peopletag {
     position:relative;
     clear:both;
     float:left;
     width:100%;
 }
 
-.notice .p-author {
-    margin-right: 8px;
+.application, #content .peopletag {
+    position:relative;
+    clear:both;
+    float:left;
+    width:100%;
 }
 
-.notice .addressees::before {
-    content: '\25B8';
+.notice .parents {
+    display: inline;
+}
+
+.notice .parents::before {
+    content: '\25B8  ';
 }
 .notice .addressees, .notice .addressees li {
     display: inline;
@@ -660,11 +679,7 @@ address .poweredby {
 
 #core .h-card .u-photo {
     float: left;
-}
-
-#content .notice .h-entry {
-    margin: 2px 0 0 0;
-    min-height: 32px;
+    margin-right: 8px;
 }
 
 .h-card .u-url, .h-card.u-url {
@@ -674,23 +689,10 @@ address .poweredby {
     text-decoration:underline;
 }
 
-.notice .h-entry {
-    overflow:hidden;
-    word-wrap:break-word;
-}
-
-.notice .entry-title.ov {
-overflow:visible;
-}
-
 .notice .automatic { 
 font-style:italic;
 }
 
-#showstream h1 { 
-    display:none;
-}
-
 #remoteprofile .notice .h-entry,
 #showstream .notice .h-entry,
 #remoteprofile .notice .entry-title,
@@ -715,35 +717,20 @@ font-style:italic;
     line-height: 1.2em;
 }
 
-.notice div.e-content {
-    margin-left: 55px;
-}
-
-.entry-metadata .repeat {
-    display: block;
-}
-
-.entry-metadata .repeat .u-photo {
-float:none;
-margin-right:1px;
-position:relative;
-top:4px;
-left:0;
-}
-
-.entry-metadata {
-    clear: left;
-    float: left;
-    font-size: 0.88em;
+.notice .e-content {
+    margin-left: 56px;
+    max-height: 400px;
+    overflow-y: auto;
 }
 
-.entry-metadata, .notice-options {
-    margin-bottom: 7px;
-    margin-top: 12px;
+.notice .e-content img {
+    max-width: 100%;
 }
 
 .notice-options {
+    margin-bottom: 7px;
     float: right;    
+    position: relative;
 }
 
 .notice-options fieldset {
@@ -813,17 +800,20 @@ position:static;
 .notice.h-entry .attachments {
     clear: both;
     position: relative;
-    top: 1em;
+    margin-bottom: 1em;
 }
 
 .notice.h-entry .attachments .inline-attachment * {
     max-width: 100%;
 }
 .notice.h-entry .attachments .inline-attachment > a {
-    font-size: 0.88em;
+    font-size: 0.8em;
     line-height: 16px;
     height: 16px;
 }
+.notice.h-entry .attachments .inline-attachment > img {
+    display: block;
+}
 
 #attachments {
 clear:both;
@@ -868,12 +858,10 @@ content: ":";
 
 .threaded-replies {
     clear: both;
-    float: left;
     width: 458px;
     margin-left: 55px;
     margin-bottom: 10px;
     padding-right: 2px;
-    padding-top: 5px;
     border-left: 3px solid #ECECF2;
     background: #fafafa;
     color: #222;
@@ -881,7 +869,7 @@ content: ":";
 }
 
 .threaded-replies:empty {
-    margin-bottom: 0px; 
+    display: none;
 }
 
 #content .notice .threaded-replies .notice,
@@ -897,7 +885,7 @@ content: ":";
     background: none;
 }
 
-#content .notice .threaded-replies .h-entry,
+#content .notice .threaded-replies .notice.h-entry,
 #content .notice .threaded-replies .entry-title {
     min-height: 1px;
 }
@@ -908,11 +896,7 @@ content: ":";
     top: 12px;
 }
 
-#content .notice .threaded-replies .notice .h-entry p.e-content {
-    margin-left: 32px;
-}
-
-#content .notice .threaded-replies .notice div.e-content {
+#content .threaded-replies .notice.h-entry .e-content {
     margin-left: 32px;
 }
 
@@ -969,12 +953,13 @@ content: ":";
 }
 
 .threaded-replies .form_notice .count {
-    top: 60px;
+    bottom: 60px;
     right: 50px;
 }
 
 .threaded-replies .form_notice input.submit {
-    bottom: 0;
+    bottom: 1ex;
+    right: 1ex;
 }
 
 .threaded-replies .form_notice .error,
@@ -995,14 +980,13 @@ content: ":";
     content: '[';
 }
 
-.notice .permalink.external {
+.notice footer .source + .permalink.external {
     display: none;
 }
 
 /* old school conversation style */
 
 #conversation .notices .notices {
-    float: left;
     background-color:rgba(200, 200, 200, 0.050);
     margin-left: 15px;
     width: auto;
@@ -1020,31 +1004,7 @@ content: ":";
 clear:both;
 }
 
-.notice p.e-content {
-    clear: none;
-    display: block;
-}
-
-.section .h-card .u-photo {
-margin-right:7px;
-margin-bottom:0;
-}
-
-.section .notice {
-padding-top:7px;
-padding-bottom:7px;
-border-top:0;
-}
-
-.section .notice:first-child {
-padding-top:0;
-}
-
-.section .notice .author {
-margin-right:0;
-}
-
-.p-name.metadata {
+.notice-title {
     display:none;
 }
 
@@ -1056,12 +1016,13 @@ margin-right:0;
     width: 100%;
 }
 
-#aside_primary .notices li {
-    margin-bottom: 8px;
+#aside_primary .notice .h-card .u-photo {
+    height: 24px;
+    width: 24px;
+    margin-right: 8px;
 }
-
-#aside_primary .notice {
-    min-height: 24px;
+#aside_primary .notice .e-content {
+    margin-left: 32px;
 }
 
 #export_data li {
@@ -1213,6 +1174,7 @@ cursor:pointer;
 
 .dialogbox {
 position:absolute;
+    width: 200px;
     top: 0px;
     right: 0px;
 z-index:9;
@@ -1253,6 +1215,11 @@ padding-left:4px;
 margin-bottom:0;
 }
 
+.notice-options .form_repeat.dialogbox input.submit_dialogbox {
+    float: right;
+    min-width: 80px;
+}
+
 #pagination {
     background-color: #f2f2f2;
     clear: left;
@@ -1494,7 +1461,22 @@ width:auto;
 margin-left:0;
 }
 
-.entry-metadata .timestamp span.p-name {
+.notice > footer {
+    clear: left;
+    font-size: 0.8em;
+    margin-left: 56px;
+}
+
+.notice > footer > h3 {
+    margin-bottom: 0;
+    margin-top: 1em;
+}
+
+.threaded-replies .notice > footer, .section .notice > footer {
+    margin-left:33px;
+}
+
+.notice > footer .timestamp span.p-name {
     display: none;
 }
 
@@ -1629,11 +1611,17 @@ ul.profile_list li {
     margin-bottom: 20px;
 }
 
+ul.profiles.groups {
+    list-style-type:none;
+}
+
 .profile_list .h-card .u-photo {
     margin-right: 4px;
 }
-.profile_list .h-card .p-nickname {
-    display: block;
+
+table.profile_list tbody tr:nth-child(2n+1) {
+    background-color: #fafafa !important;
+    border: none !important;
 }
 
 .entity_profile .entity_nickname,
@@ -1642,14 +1630,17 @@ margin-left:0;
 }
 
 .entity_profile .p-nickname {
-    font-size:1.4em;
+    font-weight: bold;
 }
 
 .entity_profile .p-name {
-    font-size: 1.2em;
     clear: left;
 }
 
+.entity_profile .label {
+    display: block;
+}
+
 .entity_profile .p-name:before {
 content: "(";
 font-weight:normal;
@@ -1720,7 +1711,7 @@ display:block;
     padding: 4px 4px 4px 26px;
 }
 
-.entity_actions a, .entity_actions p, .entity_actions .entity_subscribe input, .entity_actions .entity_block input, .entity_actions .entity_moderation input, .entity_actions .entity_role input, .entity_actions .entity_nudge input, .entity_actions .entity_delete input, .entity_actions input.submit {
+.entity_actions a, .entity_actions p, .entity_actions .entity_approval input, .entity_actions .entity_subscribe input, .entity_actions .entity_block input, .entity_actions .entity_moderation input, .entity_actions .entity_role input, .entity_actions .entity_nudge input, .entity_actions .entity_delete input, .entity_actions input.submit {
     background-color: #ccc !important;
     border: none;
 }
@@ -1729,7 +1720,7 @@ display:block;
     padding: 2px 4px 4px 28px;
 }
 
-.entity_actions a:hover, .entity_actions p:hover, .entity_actions .entity_subscribe input:hover, .entity_actions .entity_block input:hover, .entity_actions .entity_moderation input:hover, .entity_actions .entity_role input:hover, .entity_actions .entity_nudge input:hover, .entity_actions .entity_delete input:hover, .entity_actions input.submit:hover {
+.entity_actions a:hover, .entity_actions p:hover, .entity_actions, .entity_subscribe input:hover, .entity_actions .entity_subscribe input:hover, .entity_actions .entity_block input:hover, .entity_actions .entity_moderation input:hover, .entity_actions .entity_role input:hover, .entity_actions .entity_nudge input:hover, .entity_actions .entity_delete input:hover, .entity_actions input.submit:hover {
     background-color: #f2f2f2 !important;
 }
 
@@ -1895,7 +1886,7 @@ left:3px;
 }
 
 .profile .entity_profile {
-margin-bottom:0;
+margin-bottom:10px;
 min-height:60px;
 }
 
@@ -2117,11 +2108,13 @@ width:14.5%;
 
 .mark-top {
     border-top: 1px solid #ccc;
+    padding-top: 5px;
 }
 
 #realtime_actions {
     position: relative !important;
     right: -4px !important;
+    top: -65px !important;
     float: right;
     padding-top: 15px;
     margin-bottom: -8px !important;
@@ -2253,6 +2246,8 @@ button.close,
 .form_user_add_peopletag input.submit,
 .form_peopletag_subscribe input.submit,
 .form_peopletag_unsubscribe input.submit,
+.form_group_queue #approve,
+.form_group_queue #cancel,
 .notice-options .repeated,
 .form_notice label.notice_data-geo,
 button.minimize,
@@ -2261,6 +2256,7 @@ button.minimize,
 .entity_clear input.submit,
 .entity_flag input.submit,
 .entity_flag p,
+.entity_approval input.submit,
 .entity_subscribe input.submit,
 #realtime_play,
 #realtime_pause,
@@ -2294,6 +2290,14 @@ background-repeat:no-repeat;
 background-color:transparent;
 }
 
+
+.form_group_queue #approve {
+background-position:2px -2174px;
+}
+.form_group_queue #cancel {
+background-position:2px -2240px;
+}
+
 .form_group_leave input.submit,
 .form_user_unsubscribe input.submit,
 .form_user_remove_peopletag input.submit,
@@ -2374,9 +2378,11 @@ background-position: 5px -2039px;
 .entity_flag p {
 background-position: 5px -2105px;
 }
+.entity_approval input.approve,
 .entity_subscribe input.accept {
 background-position: 5px -2171px;
 }
+.entity_approval input.cancel,
 .entity_subscribe input.reject {
 background-position: 5px -2237px;
 }