Merge branch '0.7.x' into 0.8.x

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

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 9973424293a634d79512edfc7c6d57c950e8aeb2..a6fe8eb754f6c53e81636177e6132435a1830df7 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -29,6 +29,7 @@ h1 {
 font-size:1.4em;
 margin-bottom:18px;
 }
+#showstream h1 { display:none; }
 h2 { font-size:1.3em; }
 h3 { font-size:1.2em; }
 h4 { font-size:1.1em; }
@@ -83,12 +84,13 @@ left:0;
 border:0;
 }
 
-#page_notice .error,
-#page_notice .success {
+.error,
+.success {
 padding:4px 7px;
 border-radius:4px;
 -moz-border-radius:4px;
 -webkit-border-radius:4px;
+margin-bottom:18px;
 }
 form label.submit {
 display:none;
@@ -250,6 +252,7 @@ position:absolute;
 top:65px;
 right:18px;
 width:250px;
+width:24%;
 }
 #page_notice {
 clear:both;
@@ -259,9 +262,8 @@ margin-bottom:18px;
 
 #anon_notice {
 float:left;
-width:432px;
-width:28.052em;
-padding:11px;
+width:43.2%;
+padding:1.1%;
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;
@@ -369,7 +371,9 @@ margin-right:4px;
 
 #wrap {
 margin:0 auto;
-width:1003px;
+width:100%;
+min-width:760px;
+max-width:1003px;
 overflow:hidden;
 }
 
@@ -381,14 +385,17 @@ margin-bottom:1em;
 }
 
 #content {
-width:644px;
-padding:18px;
+width:64.009%;
+min-height:259px;
+padding:1.795%;
 float:left;
 border-radius:7px;
 -moz-border-radius:7px;
 -moz-border-radius-topleft:0;
 -webkit-border-radius:7px;
 -webkit-border-top-left-radius:0;
+border-style:solid;
+border-width:1px;
 }
 
 #content_inner {
@@ -398,10 +405,11 @@ float:left;
 }
 
 #aside_primary {
-width:280px;
+width:27.917%;
+min-height:259px;
 float:left;
-margin-left:4px;
-padding:18px;
+margin-left:0.385%;
+padding:1.795%;
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;
@@ -409,9 +417,8 @@ border-width:1px;
 border-style:solid;
 }
 
-/*Start: FORM NOTICE*/
 #form_notice {
-width:458px;
+width:45.664%;
 float:left;
 position:relative;
 line-height:1;
@@ -428,7 +435,7 @@ float:left;
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;
-width:370px;
+width:80.789%;
 height:67px;
 line-height:1.5;
 padding:7px 7px 16px 7px;
@@ -458,27 +465,27 @@ line-height:1.15;
 padding:1px 2px;
 }
 #form_notice #notice_action-submit {
-width:60px;
-padding:8px;
+width:14%;
+height:47px;
+padding:0;
 position:absolute;
 bottom:0;
 right:0;
 }
 #form_notice label[for=to] {
-margin-top:11px;
+margin-top:7px;
 }
 #form_notice select[id=to] {
 margin-bottom:7px;
 margin-left:18px;
 float:left;
 }
-/*end FORM NOTICE*/
 
 
 /* entity_profile */
 .entity_profile {
 position:relative;
-width:475px;
+width:67.702%;
 min-height:123px;
 float:left;
 margin-bottom:18px;
@@ -508,7 +515,6 @@ margin-bottom:18px;
 .entity_profile .entity_tags {
 margin-left:113px;
 margin-bottom:4px;
-width:322px;
 }
 
 .entity_profile .entity_fn,
@@ -536,14 +542,14 @@ display:none;
 .entity_profile h2 {
 display:none;
 }
-
 /* entity_profile */
 
 
 /*entity_actions*/
 .entity_actions {
 float:right;
-margin-left:28px;
+margin-left:4.35%;
+max-width:25%;
 }
 .entity_actions h2 {
 display:none;
@@ -602,7 +608,9 @@ border-radius:4px;
 -moz-border-radius:4px;
 -webkit-border-radius:4px;
 }
-
+.entity_actions .accept {
+margin-bottom:18px;
+}
 
 .entity_tags ul {
 list-style-type:none;
@@ -684,7 +692,7 @@ float:none;
 .profile .entity_profile .entity_note,
 .profile .entity_profile .entity_url,
 .profile .entity_profile .entity_tags,
-.profile .entity_profile .form_subcription_edit {
+.profile .entity_profile .form_subscription_edit {
 margin-left:59px;
 clear:none;
 display:block;
@@ -696,7 +704,7 @@ margin-right:11px;
 }
 
 
-.profile .entity_profile .form_subcription_edit label {
+.profile .entity_profile .form_subscription_edit label {
 font-weight:normal;
 margin-right:11px;
 }
@@ -712,7 +720,7 @@ clear:both;
 float:left;
 width:100%;
 border-top-width:1px;
-border-top-style:dashed;
+border-top-style:dotted;
 }
 .notices li {
 list-style-type:none;
@@ -911,10 +919,12 @@ display:none;
 border:0;
 padding:0;
 }
-/*END: NOTICES */
-
 
 
+#usergroups #new_group {
+float: left;
+margin-right: 2em;
+}
 #new_group, #group_search {
 margin-bottom:18px;
 }
@@ -1143,4 +1153,25 @@ clear:both;
 margin-bottom:0;
 }
 
+#form_settings_design #settings_design_color .form_data,
+#form_settings_design #color-picker {
+float:left;
+}
+#form_settings_design #settings_design_color .form_data {
+width:400px;
+margin-right:28px;
+}
 
+.instructions ul {
+list-style-position:inside;
+}
+.instructions p,
+.instructions ul {
+margin-bottom:18px;
+}
+.help dt {
+display:none;
+}
+.guide {
+clear:both;
+}