Merge branch 'nightly' into repeat_as_shareplugin

This commit is contained in:
Mikael Nordfeldth 2015-03-12 15:21:23 +01:00
commit 5bea746fa8
4 changed files with 7 additions and 15 deletions

View File

@ -723,10 +723,8 @@ font-style:italic;
.notice-options { .notice-options {
margin-bottom: 7px; margin-bottom: 7px;
margin-top: 12px; margin-top: 12px;
}
.notice-options {
float: right; float: right;
position: relative;
} }
.notice-options fieldset { .notice-options fieldset {
@ -1172,6 +1170,7 @@ cursor:pointer;
.dialogbox { .dialogbox {
position:absolute; position:absolute;
width: 200px;
top: 0px; top: 0px;
right: 0px; right: 0px;
z-index:9; z-index:9;
@ -1212,6 +1211,11 @@ padding-left:4px;
margin-bottom:0; margin-bottom:0;
} }
.notice-options .form_repeat.dialogbox input.submit_dialogbox {
float: right;
min-width: 80px;
}
#pagination { #pagination {
background-color: #f2f2f2; background-color: #f2f2f2;
clear: left; clear: left;

View File

@ -477,10 +477,6 @@ div.entry-content a.response:after {
padding-top: 10px; padding-top: 10px;
} }
.notice-options .form_repeat.dialogbox input.submit_dialogbox {
min-width: 80px;
}
#content .threaded-replies .notice .author .photo { #content .threaded-replies .notice .author .photo {
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);

View File

@ -1291,10 +1291,6 @@ div.entry-content a.response:after {
padding-top: 10px; padding-top: 10px;
} }
.notice-options .form_repeat.dialogbox input.submit_dialogbox {
min-width: 80px;
}
#content .threaded-replies .notice .author .photo { #content .threaded-replies .notice .author .photo {
box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.5);

View File

@ -441,10 +441,6 @@ abbr {border-bottom: none;}
padding-top: 10px; padding-top: 10px;
} }
.notice-options .form_repeat.dialogbox input.submit_dialogbox {
min-width: 80px;
}
.user_in.realtime-popup .notice div.e-content { .user_in.realtime-popup .notice div.e-content {
max-width: 320px; max-width: 320px;
} }