Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
This commit is contained in:
commit
d3ee6eb05e
|
@ -306,7 +306,6 @@ padding:4px 11px;
|
||||||
border-width:1px;
|
border-width:1px;
|
||||||
border-style:solid;
|
border-style:solid;
|
||||||
border-bottom:0;
|
border-bottom:0;
|
||||||
text-shadow: 2px 2px 2px #ddd;
|
|
||||||
font-weight:bold;
|
font-weight:bold;
|
||||||
}
|
}
|
||||||
#site_nav_local_views .nav {
|
#site_nav_local_views .nav {
|
||||||
|
@ -396,8 +395,8 @@ border-radius:7px;
|
||||||
-moz-border-radius-topleft:0;
|
-moz-border-radius-topleft:0;
|
||||||
-webkit-border-radius:7px;
|
-webkit-border-radius:7px;
|
||||||
-webkit-border-top-left-radius:0;
|
-webkit-border-top-left-radius:0;
|
||||||
border-style:solid;
|
|
||||||
border-width:1px;
|
border-width:1px;
|
||||||
|
border-style:solid;
|
||||||
}
|
}
|
||||||
#shownotice #content {
|
#shownotice #content {
|
||||||
min-height:0;
|
min-height:0;
|
||||||
|
@ -413,7 +412,7 @@ float:left;
|
||||||
width:27.917%;
|
width:27.917%;
|
||||||
min-height:259px;
|
min-height:259px;
|
||||||
float:left;
|
float:left;
|
||||||
margin-left:0.385%;
|
margin-left:0.5%;
|
||||||
padding:1.795%;
|
padding:1.795%;
|
||||||
border-radius:7px;
|
border-radius:7px;
|
||||||
-moz-border-radius:7px;
|
-moz-border-radius:7px;
|
||||||
|
@ -469,7 +468,6 @@ height:16px;
|
||||||
#form_notice #notice_data-attach {
|
#form_notice #notice_data-attach {
|
||||||
left:183px;
|
left:183px;
|
||||||
padding:0;
|
padding:0;
|
||||||
|
|
||||||
height:16px;
|
height:16px;
|
||||||
}
|
}
|
||||||
#form_notice .form_note {
|
#form_notice .form_note {
|
||||||
|
|
|
@ -19,7 +19,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
|
||||||
font-size:1em;
|
font-size:1em;
|
||||||
}
|
}
|
||||||
address {
|
address {
|
||||||
margin-right:7.18%;
|
margin-right:7.2%;
|
||||||
}
|
}
|
||||||
|
|
||||||
input, textarea, select, option {
|
input, textarea, select, option {
|
||||||
|
@ -27,7 +27,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
|
||||||
}
|
}
|
||||||
input, textarea, select,
|
input, textarea, select,
|
||||||
.entity_remote_subscribe {
|
.entity_remote_subscribe {
|
||||||
border-color:#aaa;
|
border-color:#AAAAAA;
|
||||||
}
|
}
|
||||||
#filter_tags ul li {
|
#filter_tags ul li {
|
||||||
border-color:#C3D6DF;
|
border-color:#C3D6DF;
|
||||||
|
@ -47,10 +47,13 @@ background-color:#A9BF4F;
|
||||||
input:focus, textarea:focus, select:focus,
|
input:focus, textarea:focus, select:focus,
|
||||||
#form_notice.warning #notice_data-text {
|
#form_notice.warning #notice_data-text {
|
||||||
border-color:#A9BF4F;
|
border-color:#A9BF4F;
|
||||||
|
box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
|
||||||
|
-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
|
||||||
|
-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
|
||||||
}
|
}
|
||||||
input.submit,
|
input.submit,
|
||||||
.entity_remote_subscribe {
|
.entity_remote_subscribe {
|
||||||
color:#fff;
|
color:#FFFFFF;
|
||||||
}
|
}
|
||||||
|
|
||||||
a,
|
a,
|
||||||
|
@ -79,10 +82,10 @@ background-color:#CEE1E9;
|
||||||
}
|
}
|
||||||
|
|
||||||
#notice_text-count {
|
#notice_text-count {
|
||||||
color:#333;
|
color:#333333;
|
||||||
}
|
}
|
||||||
#form_notice.warning #notice_text-count {
|
#form_notice.warning #notice_text-count {
|
||||||
color:#000;
|
color:#000000;
|
||||||
}
|
}
|
||||||
#form_notice label[for=notice_data-attach] {
|
#form_notice label[for=notice_data-attach] {
|
||||||
background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
|
background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
|
||||||
|
@ -92,27 +95,38 @@ opacity:0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#form_notice.processing #notice_action-submit {
|
#form_notice.processing #notice_action-submit {
|
||||||
background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
|
background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
|
||||||
cursor:wait;
|
cursor:wait;
|
||||||
text-indent:-9999px;
|
text-indent:-9999px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#content {
|
||||||
|
box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
|
||||||
|
-moz-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
|
||||||
|
-webkit-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
|
||||||
|
}
|
||||||
#content,
|
#content,
|
||||||
#site_nav_local_views a,
|
#site_nav_local_views a,
|
||||||
#aside_primary {
|
#aside_primary {
|
||||||
border-color:#fff;
|
border-color:transparent;
|
||||||
}
|
}
|
||||||
#content,
|
#content,
|
||||||
#site_nav_local_views .current a {
|
#site_nav_local_views .current a {
|
||||||
background-color:#fff;
|
background-color:#FFFFFF;
|
||||||
}
|
}
|
||||||
|
|
||||||
#site_nav_local_views a {
|
#site_nav_local_views a {
|
||||||
background-color:rgba(255, 255, 255, 0.2);
|
background-color:rgba(194, 194, 194, 0.5);
|
||||||
|
box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
|
||||||
|
-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
|
||||||
|
-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
|
||||||
}
|
}
|
||||||
#site_nav_local_views a:hover {
|
#site_nav_local_views a:hover {
|
||||||
background-color:rgba(255, 255, 255, 0.7);
|
background-color:rgba(255, 255, 255, 0.7);
|
||||||
}
|
}
|
||||||
|
#site_nav_local_views .current a {
|
||||||
|
text-shadow: rgba(194,194,194,0.5) 1px 1px 1px;
|
||||||
|
}
|
||||||
|
|
||||||
.error {
|
.error {
|
||||||
background-color:#F7E8E8;
|
background-color:#F7E8E8;
|
||||||
|
@ -123,8 +137,8 @@ background-color:#EFF3DC;
|
||||||
|
|
||||||
#anon_notice {
|
#anon_notice {
|
||||||
background-color:#C3D6DF;
|
background-color:#C3D6DF;
|
||||||
color:#fff;
|
color:#FFFFFF;
|
||||||
border-color:#fff;
|
border-color:#FFFFFF;
|
||||||
}
|
}
|
||||||
|
|
||||||
#showstream #anon_notice {
|
#showstream #anon_notice {
|
||||||
|
@ -162,7 +176,7 @@ background-color:transparent;
|
||||||
.form_user_subscribe input.submit,
|
.form_user_subscribe input.submit,
|
||||||
.form_user_unsubscribe input.submit {
|
.form_user_unsubscribe input.submit {
|
||||||
background-color:#A9BF4F;
|
background-color:#A9BF4F;
|
||||||
color:#fff;
|
color:#FFFFFF;
|
||||||
}
|
}
|
||||||
.form_user_unsubscribe input.submit,
|
.form_user_unsubscribe input.submit,
|
||||||
.form_group_leave input.submit,
|
.form_group_leave input.submit,
|
||||||
|
@ -222,14 +236,14 @@ opacity:0.4;
|
||||||
opacity:1;
|
opacity:1;
|
||||||
}
|
}
|
||||||
div.entry-content {
|
div.entry-content {
|
||||||
color:#333;
|
color:#333333;
|
||||||
}
|
}
|
||||||
div.notice-options a,
|
div.notice-options a,
|
||||||
div.notice-options input {
|
div.notice-options input {
|
||||||
font-family:sans-serif;
|
font-family:sans-serif;
|
||||||
}
|
}
|
||||||
.notices li.hover {
|
.notices li.hover {
|
||||||
background-color:#fcfcfc;
|
background-color:#FCFCFC;
|
||||||
}
|
}
|
||||||
|
|
||||||
.notices .notices {
|
.notices .notices {
|
||||||
|
|
|
@ -19,7 +19,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
|
||||||
font-size:1em;
|
font-size:1em;
|
||||||
}
|
}
|
||||||
address {
|
address {
|
||||||
margin-right:7.18%;
|
margin-right:7.2%;
|
||||||
}
|
}
|
||||||
|
|
||||||
input, textarea, select, option {
|
input, textarea, select, option {
|
||||||
|
@ -27,10 +27,10 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
|
||||||
}
|
}
|
||||||
input, textarea, select,
|
input, textarea, select,
|
||||||
.entity_remote_subscribe {
|
.entity_remote_subscribe {
|
||||||
border-color:#aaa;
|
border-color:#AAAAAA;
|
||||||
}
|
}
|
||||||
#filter_tags ul li {
|
#filter_tags ul li {
|
||||||
border-color:#ddd;
|
border-color:#DDDDDD;
|
||||||
}
|
}
|
||||||
|
|
||||||
.form_settings input.form_action-primary {
|
.form_settings input.form_action-primary {
|
||||||
|
@ -47,10 +47,13 @@ background-color:#9BB43E;
|
||||||
input:focus, textarea:focus, select:focus,
|
input:focus, textarea:focus, select:focus,
|
||||||
#form_notice.warning #notice_data-text {
|
#form_notice.warning #notice_data-text {
|
||||||
border-color:#9BB43E;
|
border-color:#9BB43E;
|
||||||
|
box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
|
||||||
|
-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
|
||||||
|
-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
|
||||||
}
|
}
|
||||||
input.submit,
|
input.submit,
|
||||||
.entity_remote_subscribe {
|
.entity_remote_subscribe {
|
||||||
color:#fff;
|
color:#FFFFFF;
|
||||||
}
|
}
|
||||||
|
|
||||||
a,
|
a,
|
||||||
|
@ -79,10 +82,10 @@ background-color:#CEE1E9;
|
||||||
}
|
}
|
||||||
|
|
||||||
#notice_text-count {
|
#notice_text-count {
|
||||||
color:#333;
|
color:#333333;
|
||||||
}
|
}
|
||||||
#form_notice.warning #notice_text-count {
|
#form_notice.warning #notice_text-count {
|
||||||
color:#000;
|
color:#000000;
|
||||||
}
|
}
|
||||||
#form_notice label[for=notice_data-attach] {
|
#form_notice label[for=notice_data-attach] {
|
||||||
background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
|
background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
|
||||||
|
@ -92,27 +95,38 @@ opacity:0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#form_notice.processing #notice_action-submit {
|
#form_notice.processing #notice_action-submit {
|
||||||
background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
|
background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
|
||||||
cursor:wait;
|
cursor:wait;
|
||||||
text-indent:-9999px;
|
text-indent:-9999px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#content {
|
||||||
|
box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
|
||||||
|
-moz-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
|
||||||
|
-webkit-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
|
||||||
|
}
|
||||||
#content,
|
#content,
|
||||||
#site_nav_local_views a,
|
#site_nav_local_views a,
|
||||||
#aside_primary {
|
#aside_primary {
|
||||||
border-color:#fff;
|
border-color:transparent;
|
||||||
}
|
}
|
||||||
#content,
|
#content,
|
||||||
#site_nav_local_views .current a {
|
#site_nav_local_views .current a {
|
||||||
background-color:#fff;
|
background-color:#FFFFFF;
|
||||||
}
|
}
|
||||||
|
|
||||||
#site_nav_local_views a {
|
#site_nav_local_views a {
|
||||||
background-color:rgba(135, 180, 200, 0.3);
|
background-color:rgba(194, 194, 194, 0.5);
|
||||||
|
box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
|
||||||
|
-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
|
||||||
|
-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
|
||||||
}
|
}
|
||||||
#site_nav_local_views a:hover {
|
#site_nav_local_views a:hover {
|
||||||
background-color:rgba(255, 255, 255, 0.7);
|
background-color:rgba(255, 255, 255, 0.7);
|
||||||
}
|
}
|
||||||
|
#site_nav_local_views .current a {
|
||||||
|
text-shadow: rgba(194,194,194,0.5) 1px 1px 1px;
|
||||||
|
}
|
||||||
|
|
||||||
.error {
|
.error {
|
||||||
background-color:#F7E8E8;
|
background-color:#F7E8E8;
|
||||||
|
@ -123,8 +137,8 @@ background-color:#EFF3DC;
|
||||||
|
|
||||||
#anon_notice {
|
#anon_notice {
|
||||||
background-color:#87B4C8;
|
background-color:#87B4C8;
|
||||||
color:#fff;
|
color:#FFFFFF;
|
||||||
border-color:#fff;
|
border-color:#FFFFFF;
|
||||||
}
|
}
|
||||||
|
|
||||||
#showstream #anon_notice {
|
#showstream #anon_notice {
|
||||||
|
@ -162,7 +176,7 @@ background-color:transparent;
|
||||||
.form_user_subscribe input.submit,
|
.form_user_subscribe input.submit,
|
||||||
.form_user_unsubscribe input.submit {
|
.form_user_unsubscribe input.submit {
|
||||||
background-color:#9BB43E;
|
background-color:#9BB43E;
|
||||||
color:#fff;
|
color:#FFFFFF;
|
||||||
}
|
}
|
||||||
.form_user_unsubscribe input.submit,
|
.form_user_unsubscribe input.submit,
|
||||||
.form_group_leave input.submit,
|
.form_group_leave input.submit,
|
||||||
|
@ -222,14 +236,14 @@ opacity:0.4;
|
||||||
opacity:1;
|
opacity:1;
|
||||||
}
|
}
|
||||||
div.entry-content {
|
div.entry-content {
|
||||||
color:#333;
|
color:#333333;
|
||||||
}
|
}
|
||||||
div.notice-options a,
|
div.notice-options a,
|
||||||
div.notice-options input {
|
div.notice-options input {
|
||||||
font-family:sans-serif;
|
font-family:sans-serif;
|
||||||
}
|
}
|
||||||
.notices li.hover {
|
.notices li.hover {
|
||||||
background-color:#fcfcfc;
|
background-color:#FCFCFC;
|
||||||
}
|
}
|
||||||
|
|
||||||
.notices .notices {
|
.notices .notices {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user