summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/util.js6
-rw-r--r--theme/base/css/display.css23
-rw-r--r--theme/default/css/display.css81
-rw-r--r--theme/identica/css/display.css81
4 files changed, 117 insertions, 74 deletions
diff --git a/js/util.js b/js/util.js
index c5d03ce11..210459844 100644
--- a/js/util.js
+++ b/js/util.js
@@ -310,7 +310,7 @@ var SN = { // StatusNet
imgLoading : $('address .url')[0].href+'theme/base/images/illustrations/illu_progress_loading-01.gif',
bgClickToClose : true,
success : function() {
- $('#jOverlayContent').append('<button>&#215;</button>');
+ $('#jOverlayContent').append('<button class="close">&#215;</button>');
$('#jOverlayContent button').click($.closeOverlay);
},
timeout : 0,
@@ -352,7 +352,7 @@ var SN = { // StatusNet
NoticeDataAttach: function() {
NDA = $('#'+SN.C.S.NoticeDataAttach);
NDA.change(function() {
- S = '<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+$(this).val()+'</code> <button>&#215;</button></div>';
+ S = '<div id="'+SN.C.S.NoticeDataAttachSelected+'" class="'+SN.C.S.Success+'"><code>'+$(this).val()+'</code> <button class="close">&#215;</button></div>';
NDAS = $('#'+SN.C.S.NoticeDataAttachSelected);
(NDAS.length > 0) ? NDAS.replaceWith(S) : $('#'+SN.C.S.FormNotice).append(S);
$('#'+SN.C.S.NoticeDataAttachSelected+' button').click(function(){
@@ -372,7 +372,7 @@ var SN = { // StatusNet
$('.entity_send-a-message').append(document._importNode($('form', data).get(0), true));
NDMF = $('.entity_send-a-message .form_notice');
SN.U.FormNoticeEnhancements(NDMF);
- NDMF.append('<button>&#215;</button>');
+ NDMF.append('<button class="close">&#215;</button>');
$('.entity_send-a-message button').click(function(){
NDMF.hide();
return false;
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 8355a0a5c..fb630d58a 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -533,6 +533,16 @@ float:right;
font-size:0.8em;
}
+button.close {
+width:16px;
+height:16px;
+text-indent:-9999px;
+padding:0;
+border:0;
+text-align:center;
+font-weight:bold;
+}
+
/* entity_profile */
.entity_profile {
position:relative;
@@ -684,11 +694,11 @@ right:-1px;
padding:1.795%;
width:65%;
z-index:1;
-
-background-color:#FFFFFF;
-border:1px solid #CCCCCC;
--moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+ border-radius:7px;
-moz-border-radius:7px;
+-webkit-radius-border:7px;
+border-width:1px;
+border-style:solid;
}
.entity_send-a-message .form_notice legend {
display:block;
@@ -1025,11 +1035,6 @@ margin-bottom:11px;
position:absolute;
top:0;
right:0;
-width:29px;
-height:29px;
-text-align:center;
-font-weight:bold;
-padding:0;
}
#jOverlayContent h1 {
max-width:425px;
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 5eff5842a..40fdb255b 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -28,7 +28,8 @@ input, textarea, select,
.entity_remote_subscribe {
border-color:#AAAAAA;
}
-#filter_tags ul li {
+#filter_tags ul li,
+.entity_send-a-message .form_notice {
border-color:#DDDDDD;
}
@@ -88,12 +89,38 @@ color:#333333;
color:#000000;
}
.form_notice label[for=notice_data-attach] {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px;
+background-position:0 -328px;
}
.form_notice #notice_data-attach {
opacity:0;
}
+.form_notice label[for=notice_data-attach],
+#export_data li a.rss,
+#export_data li a.atom,
+#export_data li a.foaf,
+.entity_edit a,
+.entity_send-a-message a,
+.entity_nudge p,
+.form_user_nudge input.submit,
+.form_user_block input.submit,
+.form_user_unblock input.submit,
+.form_group_block input.submit,
+.form_group_unblock input.submit,
+.form_make_admin input.submit,
+.notice .attachment,
+.notice-options .notice_reply,
+.notice-options form.form_favor input.submit,
+.notice-options form.form_disfavor input.submit,
+.notice-options .notice_delete,
+#new_group a,
+.pagination .nav_prev a,
+.pagination .nav_next a {
+background-image:url(../../base/images/icons/icons-01.png);
+background-repeat:no-repeat;
+background-color:transparent;
+}
+
#wrap form.processing input.submit {
background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
cursor:wait;
@@ -112,7 +139,8 @@ box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
border-color:transparent;
}
#content,
-#site_nav_local_views .current a {
+#site_nav_local_views .current a,
+.entity_send-a-message .form_notice {
background-color:#FFFFFF;
}
@@ -138,6 +166,13 @@ background-color:#F7E8E8;
background-color:#EFF3DC;
}
+button.close {
+background-image:url(../../base/images/icons/twotone/green/x.gif);
+background-repeat:no-repeat;
+background-position:0 47%;
+background-color:transparent;
+}
+
#anon_notice {
background-color:#87B4C8;
color:#FFFFFF;
@@ -152,30 +187,15 @@ background-color:#9BB43E;
background-repeat:no-repeat;
}
#export_data li a.rss {
-background-image:url(../../base/images/icons/icons-01.png);
background-position:0 -130px;
}
#export_data li a.atom {
-background-image:url(../../base/images/icons/icons-01.png);
background-position:0 -64px;
}
#export_data li a.foaf {
-background-image:url(../../base/images/icons/icons-01.png);
background-position:0 1px;
}
-.entity_edit a,
-.entity_send-a-message a,
-.form_user_nudge input.submit,
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_nudge p,
-.form_make_admin input.submit {
-background-repeat: no-repeat;
-background-color:transparent;
-}
.form_group_join input.submit,
.form_group_leave input.submit
.form_user_subscribe input.submit,
@@ -190,48 +210,49 @@ background-color:#87B4C8;
}
.entity_edit a {
-background-image:url(../../base/images/icons/icons-01.png);
background-position: 0 -718px;
}
.entity_send-a-message a {
-background-image:url(../../base/images/icons/icons-01.png);
background-position: 0 -849px;
}
+.entity_send-a-message .form_notice {
+box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+}
+
.entity_nudge p,
.form_user_nudge input.submit {
-background-image:url(../../base/images/icons/icons-01.png);
background-position: 0 -785px;
}
.form_user_block input.submit,
.form_user_unblock input.submit,
.form_group_block input.submit,
.form_group_unblock input.submit {
-background-image:url(../../base/images/icons/icons-01.png);
background-position: 0 -918px;
}
.form_make_admin input.submit {
-background-image:url(../../base/images/icons/icons-01.png);
background-position: 0 -983px;
}
/* NOTICES */
.notice .attachment {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -394px;
+background-position:0 -394px;
}
#attachments .attachment {
background:none;
}
.notice-options .notice_reply {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -589px;
+background-position:0 -589px;
}
.notice-options form.form_favor input.submit {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -457px;
+background-position:0 -457px;
}
.notice-options form.form_disfavor input.submit {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -523px;
+background-position:0 -523px;
}
.notice-options .notice_delete {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -655px;
+background-position:0 -655px;
}
.notices div.entry-content,
@@ -268,7 +289,7 @@ background-color:rgba(200, 200, 200, 0.300);
/*END: NOTICES */
#new_group a {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -1054px;
+background-position:0 -1054px;
}
.pagination .nav_prev a,
@@ -277,10 +298,8 @@ background-repeat:no-repeat;
border-color:#C8D1D5;
}
.pagination .nav_prev a {
-background-image:url(../../base/images/icons/icons-01.png);
background-position:10% -187px;
}
.pagination .nav_next a {
-background-image:url(../../base/images/icons/icons-01.png);
background-position:105% -252px;
}
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 8aedd5144..3b59652c4 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -28,7 +28,8 @@ input, textarea, select,
.entity_remote_subscribe {
border-color:#AAAAAA;
}
-#filter_tags ul li {
+#filter_tags ul li,
+.entity_send-a-message .form_notice {
border-color:#DDDDDD;
}
@@ -88,12 +89,38 @@ color:#333333;
color:#000000;
}
.form_notice label[for=notice_data-attach] {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px;
+background-position:0 -328px;
}
.form_notice #notice_data-attach {
opacity:0;
}
+.form_notice label[for=notice_data-attach],
+#export_data li a.rss,
+#export_data li a.atom,
+#export_data li a.foaf,
+.entity_edit a,
+.entity_send-a-message a,
+.entity_nudge p,
+.form_user_nudge input.submit,
+.form_user_block input.submit,
+.form_user_unblock input.submit,
+.form_group_block input.submit,
+.form_group_unblock input.submit,
+.form_make_admin input.submit,
+.notice .attachment,
+.notice-options .notice_reply,
+.notice-options form.form_favor input.submit,
+.notice-options form.form_disfavor input.submit,
+.notice-options .notice_delete,
+#new_group a,
+.pagination .nav_prev a,
+.pagination .nav_next a {
+background-image:url(../../base/images/icons/icons-01.png);
+background-repeat:no-repeat;
+background-color:transparent;
+}
+
#wrap form.processing input.submit {
background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
cursor:wait;
@@ -112,7 +139,8 @@ box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
border-color:transparent;
}
#content,
-#site_nav_local_views .current a {
+#site_nav_local_views .current a,
+.entity_send-a-message .form_notice {
background-color:#FFFFFF;
}
@@ -138,6 +166,13 @@ background-color:#F7E8E8;
background-color:#EFF3DC;
}
+button.close {
+background-image:url(../../base/images/icons/twotone/green/x.gif);
+background-repeat:no-repeat;
+background-position:0 47%;
+background-color:transparent;
+}
+
#anon_notice {
background-color:#87B4C8;
color:#FFFFFF;
@@ -152,30 +187,15 @@ background-color:#9BB43E;
background-repeat:no-repeat;
}
#export_data li a.rss {
-background-image:url(../../base/images/icons/icons-01.png);
background-position:0 -130px;
}
#export_data li a.atom {
-background-image:url(../../base/images/icons/icons-01.png);
background-position:0 -64px;
}
#export_data li a.foaf {
-background-image:url(../../base/images/icons/icons-01.png);
background-position:0 1px;
}
-.entity_edit a,
-.entity_send-a-message a,
-.form_user_nudge input.submit,
-.form_user_block input.submit,
-.form_user_unblock input.submit,
-.form_group_block input.submit,
-.form_group_unblock input.submit,
-.entity_nudge p,
-.form_make_admin input.submit {
-background-repeat: no-repeat;
-background-color:transparent;
-}
.form_group_join input.submit,
.form_group_leave input.submit
.form_user_subscribe input.submit,
@@ -190,48 +210,49 @@ background-color:#87B4C8;
}
.entity_edit a {
-background-image:url(../../base/images/icons/icons-01.png);
background-position: 0 -718px;
}
.entity_send-a-message a {
-background-image:url(../../base/images/icons/icons-01.png);
background-position: 0 -849px;
}
+.entity_send-a-message .form_notice {
+box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
+}
+
.entity_nudge p,
.form_user_nudge input.submit {
-background-image:url(../../base/images/icons/icons-01.png);
background-position: 0 -785px;
}
.form_user_block input.submit,
.form_user_unblock input.submit,
.form_group_block input.submit,
.form_group_unblock input.submit {
-background-image:url(../../base/images/icons/icons-01.png);
background-position: 0 -918px;
}
.form_make_admin input.submit {
-background-image:url(../../base/images/icons/icons-01.png);
background-position: 0 -983px;
}
/* NOTICES */
.notice .attachment {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -394px;
+background-position:0 -394px;
}
#attachments .attachment {
background:none;
}
.notice-options .notice_reply {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -589px;
+background-position:0 -589px;
}
.notice-options form.form_favor input.submit {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -457px;
+background-position:0 -457px;
}
.notice-options form.form_disfavor input.submit {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -523px;
+background-position:0 -523px;
}
.notice-options .notice_delete {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -655px;
+background-position:0 -655px;
}
.notices div.entry-content,
@@ -268,7 +289,7 @@ background-color:rgba(200, 200, 200, 0.300);
/*END: NOTICES */
#new_group a {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -1054px;
+background-position:0 -1054px;
}
.pagination .nav_prev a,
@@ -277,10 +298,8 @@ background-repeat:no-repeat;
border-color:#CEE1E9;
}
.pagination .nav_prev a {
-background-image:url(../../base/images/icons/icons-01.png);
background-position:10% -187px;
}
.pagination .nav_next a {
-background-image:url(../../base/images/icons/icons-01.png);
background-position:105% -252px;
}