forked from GNUsocial/gnu-social
		
	Merge branch '0.9.x' into inblob
This commit is contained in:
		@@ -549,7 +549,7 @@ margin-bottom:0;
 | 
				
			|||||||
line-height:1.618;
 | 
					line-height:1.618;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
.form_notice #notice_data-attach_selected code,
 | 
					.form_notice #notice_data-attach_selected code,
 | 
				
			||||||
.form_notice #notice_data-location_name {
 | 
					.form_notice #notice_data-geo_name {
 | 
				
			||||||
float:left;
 | 
					float:left;
 | 
				
			||||||
width:80%;
 | 
					width:80%;
 | 
				
			||||||
display:block;
 | 
					display:block;
 | 
				
			||||||
@@ -569,7 +569,7 @@ font-size:0.8em;
 | 
				
			|||||||
float:left;
 | 
					float:left;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.form_notice #notice_data-location_wrap label {
 | 
					.form_notice #notice_data-geo_wrap label {
 | 
				
			||||||
position:absolute;
 | 
					position:absolute;
 | 
				
			||||||
top:25px;
 | 
					top:25px;
 | 
				
			||||||
right:4px;
 | 
					right:4px;
 | 
				
			||||||
@@ -579,20 +579,19 @@ width:16px;
 | 
				
			|||||||
height:16px;
 | 
					height:16px;
 | 
				
			||||||
display:block;
 | 
					display:block;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
.form_notice #notice_data-location_wrap input {
 | 
					.form_notice #notice_data-geo_wrap input {
 | 
				
			||||||
display:none;
 | 
					display:none;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
.form_notice #notice_data-location_wrap label {
 | 
					.form_notice #notice_data-geo_wrap label {
 | 
				
			||||||
font-weight:normal;
 | 
					font-weight:normal;
 | 
				
			||||||
font-size:1em;
 | 
					font-size:1em;
 | 
				
			||||||
margin-bottom:0;
 | 
					margin-bottom:0;
 | 
				
			||||||
text-indent:-9999px;
 | 
					text-indent:-9999px;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
.form_notice #notice_data-location_name {
 | 
					.form_notice #notice_data-geo_name {
 | 
				
			||||||
display:block;
 | 
					display:block;
 | 
				
			||||||
padding-left:21px;
 | 
					padding-left:21px;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					 | 
				
			||||||
button.close,
 | 
					button.close,
 | 
				
			||||||
button.minimize {
 | 
					button.minimize {
 | 
				
			||||||
width:16px;
 | 
					width:16px;
 | 
				
			||||||
@@ -1635,7 +1634,7 @@ button.close,
 | 
				
			|||||||
.entity_silence input.submit,
 | 
					.entity_silence input.submit,
 | 
				
			||||||
.entity_delete input.submit,
 | 
					.entity_delete input.submit,
 | 
				
			||||||
.notice-options .repeated,
 | 
					.notice-options .repeated,
 | 
				
			||||||
.form_notice a#notice_data-location_name,
 | 
					.form_notice a#notice_data-geo_name,
 | 
				
			||||||
.form_notice label[for=notice_data-geo],
 | 
					.form_notice label[for=notice_data-geo],
 | 
				
			||||||
button.minimize {
 | 
					button.minimize {
 | 
				
			||||||
background-image:url(../../base/images/icons/icons-01.gif);
 | 
					background-image:url(../../base/images/icons/icons-01.gif);
 | 
				
			||||||
@@ -1731,10 +1730,10 @@ box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
 | 
				
			|||||||
text-shadow:none;
 | 
					text-shadow:none;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.form_notice span#notice_data-location_name {
 | 
					.form_notice span#notice_data-geo_name {
 | 
				
			||||||
background-position:0 47%;
 | 
					background-position:0 47%;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
.form_notice a#notice_data-location_name {
 | 
					.form_notice a#notice_data-geo_name {
 | 
				
			||||||
background-position:0 -1711px;
 | 
					background-position:0 -1711px;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
.form_notice label[for=notice_data-geo] {
 | 
					.form_notice label[for=notice_data-geo] {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user