Merge branch '0.9.x' into forward

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

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index cdc17d67fe3200a09db50781a50b5d9359de6f9b..7446a42cdd8cd41a0e7368ed07a1065bda626d4b 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -48,14 +48,6 @@ padding:4px;
 font-family:sans-serif;
 font-size:1em;
 }
-input, textarea, select {
-border-width:2px;
-border-style: solid;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-}
-
 input.submit {
 font-weight:bold;
 cursor:pointer;
@@ -93,17 +85,33 @@ border-radius:4px;
 -webkit-border-radius:4px;
 margin-bottom:18px;
 }
+
+.xoxo li {
+list-style-type:none;
+}
+
 form label.submit {
 display:none;
 }
-
 .form_settings {
 clear:both;
 }
-
 .form_settings fieldset {
 margin-bottom:29px;
 }
+.form_settings fieldset fieldset {
+margin-bottom:41px;
+padding:3% 1.795% 1.795% 3%;
+border-radius:11px;
+-moz-border-radius:11px;
+-webkit-border-radius:11px;
+border-width:1px;
+border-style:solid;
+}
+.form_settings fieldset fieldset legend {
+line-height:0;
+}
+
 .form_settings input.remove {
 margin-left:11px;
 }
@@ -117,16 +125,28 @@ float:left;
 .form_settings .form_data textarea,
 .form_settings .form_data select,
 .form_settings .form_data input {
-margin-left:11px;
+margin-left:1.795%;
 float:left;
 }
+.form_settings .form_data input {
+width:39%;
+}
+.form_settings .form_data input.submit,
+.form_settings .form_data input.checkbox,
+.form_settings .form_data input.radio {
+width:auto;
+}
+.form_settings .form_data textarea {
+width:63%;
+}
+
 .form_settings .form_data input.submit {
 margin-left:0;
 }
 
 .form_settings label {
 margin-top:2px;
-width:152px;
+width:24%;
 }
 
 .form_actions label {
@@ -163,7 +183,7 @@ display:none;
 
 .form_settings .form_data p.form_guide {
 clear:both;
-margin-left:163px;
+margin-left:26%;
 margin-bottom:0;
 }
 
@@ -221,6 +241,9 @@ margin-left:29px;
 #form_search .submit {
 margin-left:11px;
 }
+#form_search .form_data input {
+width:auto;
+}
 
 address {
 float:left;
@@ -541,12 +564,13 @@ padding:0;
 border:0;
 text-align:center;
 font-weight:bold;
+cursor:pointer;
 }
 
 /* entity_profile */
 .entity_profile {
 position:relative;
-width:74.702%;
+width:73%;
 min-height:123px;
 float:left;
 margin-bottom:18px;
@@ -617,9 +641,9 @@ font-style:italic;
 /*entity_actions*/
 .entity_actions {
 float:right;
-margin-left:2.35%;
+margin-left:2%;
 margin-bottom:18px;
-width:21%;
+min-width:21%;
 }
 .entity_actions h2 {
 display:none;
@@ -646,8 +670,7 @@ display:block;
 text-align:left;
 width:100%;
 }
-.entity_actions a,
-.entity_remote_subscribe {
+.entity_actions a {
 text-decoration:none;
 font-weight:bold;
 display:block;
@@ -662,28 +685,20 @@ border-radius:4px;
 .entity_actions a,
 .entity_actions input,
 .entity_actions p {
-border:0;
+border-width:2px;
+border-style:solid;
 padding-left:23px;
 }
 
 .entity_actions a,
 .entity_actions p {
-padding:1px 4px 1px 26px;
+padding:2px 4px 1px 26px;
 }
 
-.entity_remote_subscribe {
-padding:4px;
-border-width:2px;
-border-style:solid;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-}
 .entity_actions .accept {
 margin-bottom:18px;
 }
 
-
 .entity_send-a-message button {
 position:absolute;
 top:3px;
@@ -716,6 +731,35 @@ display:none;
 text-align:center;
 }
 
+.entity_moderation {
+position:relative;
+}
+.entity_moderation p {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+font-weight:bold;
+padding-bottom:2px;
+margin-bottom:7px;
+}
+.entity_moderation ul {
+display:none;
+}
+.entity_moderation:hover ul {
+display:block;
+min-width:21%;
+width:100%;
+padding:11px;
+position:absolute;
+top:-1px;
+right:-1px;
+z-index:1;
+border-width:1px;
+border-style:solid;
+border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+}
 
 .entity_tags ul {
 list-style-type:none;
@@ -839,6 +883,10 @@ margin-left:2%;
 width:98%;
 float:left;
 }
+.mark-top {
+border-top-width:1px;
+border-top-style:solid;
+}
 
 /* NOTICES */
 #notices_primary {
@@ -915,11 +963,13 @@ clear:left;
 float:left;
 font-size:0.95em;
 margin-left:59px;
-width:50%;
+min-width:60%;
+max-width:74%;
 }
 #showstream .notice div.entry-content,
 #shownotice .notice div.entry-content {
 margin-left:0;
+max-width:82%;
 }
 
 .notice .notice-options a,
@@ -937,7 +987,6 @@ position:relative;
 font-size:0.95em;
 width:90px;
 float:right;
-margin-right:11px;
 }
 
 .notice-options a {
@@ -945,20 +994,16 @@ float:left;
 }
 .notice-options .notice_delete,
 .notice-options .notice_reply,
+.notice-options .form_repeat,
 .notice-options .form_favor,
 .notice-options .form_disfavor {
-position:absolute;
-top:0;
+float:left;
+margin-left:20%;
 }
+.notice-options .form_repeat,
 .notice-options .form_favor,
 .notice-options .form_disfavor {
-left:0;
-}
-.notice-options .notice_reply {
-left:29px;
-}
-.notice-options .notice_delete {
-right:0;
+margin-left:0;
 }
 .notice-options input,
 .notice-options a {
@@ -981,10 +1026,12 @@ border-radius:0;
 -moz-border-radius:0;
 -webkit-border-radius:0;
 }
+.notice-options .form_repeat legend,
 .notice-options .form_favor legend,
 .notice-options .form_disfavor legend {
 display:none;
 }
+.notice-options .form_repeat fieldset,
 .notice-options .form_favor fieldset,
 .notice-options .form_disfavor fieldset {
 border:0;
@@ -1309,18 +1356,18 @@ clear:both;
 margin-bottom:0;
 }
 
-#form_settings_design #settings_design_background-image img {
+#settings_design_background-image img {
 max-width:480px;
 max-height:480px;
 }
 
-#form_settings_design #settings_design_color .form_data,
-#form_settings_design #color-picker {
+#settings_design_color .form_data,
+#color-picker {
 float:left;
 }
-#form_settings_design #settings_design_color .form_data {
+#settings_design_color .form_data {
 width:400px;
-margin-right:28px;
+margin-right:1%;
 }
 
 #settings_design_color .form_data li {
@@ -1333,6 +1380,7 @@ display:block;
 #settings_design_color .form_data .swatch {
 padding:11px;
 margin-left:0;
+width:auto;
 }
 
 .instructions ul {