summaryrefslogtreecommitdiff
path: root/theme
diff options
context:
space:
mode:
Diffstat (limited to 'theme')
-rw-r--r--theme/README (renamed from theme/readme.txt)8
-rw-r--r--theme/base/css/display.css42
-rw-r--r--theme/base/images/icons/icons-01.gifbin2913 -> 3097 bytes
-rw-r--r--theme/base/images/icons/twotone/green/badge.gifbin0 -> 105 bytes
-rw-r--r--theme/base/images/icons/twotone/green/sandbox.gifbin0 -> 104 bytes
-rw-r--r--theme/base/images/icons/twotone/green/silence.gifbin0 -> 103 bytes
-rw-r--r--theme/base/images/icons/twotone/green/skull.gifbin0 -> 85 bytes
-rw-r--r--theme/default/css/display.css48
-rw-r--r--theme/default/css/ie.css8
-rw-r--r--theme/identica/css/display.css48
-rw-r--r--theme/identica/css/ie.css2
11 files changed, 120 insertions, 36 deletions
diff --git a/theme/readme.txt b/theme/README
index d030f2db4..266a89fdf 100644
--- a/theme/readme.txt
+++ b/theme/README
@@ -1,10 +1,10 @@
-/** Howto: create a statusnet theme
+/** Howto: create a StatusNet theme
*
* @package StatusNet
- * @author Sarven Capadisli <csarven@status.net>
- * @copyright 2009 Control Yourself, Inc.
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2009 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link http://laconi.ca/
+ * @link http://status.net/
*/
Location of key paths and files under theme/:
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index f1bc9c8ac..44d1d0300 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -48,14 +48,6 @@ padding:4px;
font-family:sans-serif;
font-size:1em;
}
-input, textarea, select {
-border-width:2px;
-border-style: solid;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-}
-
input.submit {
font-weight:bold;
cursor:pointer;
@@ -574,6 +566,7 @@ padding:0;
border:0;
text-align:center;
font-weight:bold;
+cursor:pointer;
}
/* entity_profile */
@@ -701,7 +694,7 @@ padding-left:23px;
.entity_actions a,
.entity_actions p {
-padding:1px 4px 1px 26px;
+padding:2px 4px 1px 26px;
}
.entity_remote_subscribe {
@@ -749,6 +742,35 @@ display:none;
text-align:center;
}
+.entity_moderation {
+position:relative;
+}
+.entity_moderation p {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+font-weight:bold;
+padding-bottom:2px;
+margin-bottom:7px;
+}
+.entity_moderation ul {
+display:none;
+}
+.entity_moderation:hover ul {
+display:block;
+min-width:21%;
+width:100%;
+padding:11px;
+position:absolute;
+top:-1px;
+right:-1px;
+z-index:1;
+border-width:1px;
+border-style:solid;
+border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+}
.entity_tags ul {
list-style-type:none;
@@ -986,7 +1008,7 @@ float:left;
.notice-options .form_favor,
.notice-options .form_disfavor {
float:left;
-margin-left:18px;
+margin-left:20%;
}
.notice-options .form_favor,
.notice-options .form_disfavor {
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
index f19d6a3f6..e910c86c0 100644
--- a/theme/base/images/icons/icons-01.gif
+++ b/theme/base/images/icons/icons-01.gif
Binary files differ
diff --git a/theme/base/images/icons/twotone/green/badge.gif b/theme/base/images/icons/twotone/green/badge.gif
new file mode 100644
index 000000000..2dca5b99f
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/badge.gif
Binary files differ
diff --git a/theme/base/images/icons/twotone/green/sandbox.gif b/theme/base/images/icons/twotone/green/sandbox.gif
new file mode 100644
index 000000000..17031962a
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/sandbox.gif
Binary files differ
diff --git a/theme/base/images/icons/twotone/green/silence.gif b/theme/base/images/icons/twotone/green/silence.gif
new file mode 100644
index 000000000..8c624acdd
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/silence.gif
Binary files differ
diff --git a/theme/base/images/icons/twotone/green/skull.gif b/theme/base/images/icons/twotone/green/skull.gif
new file mode 100644
index 000000000..033506732
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/skull.gif
Binary files differ
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index f4af07081..ad64b4198 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -20,7 +20,13 @@ font-size:1em;
address {
margin-right:5.7%;
}
-
+input, textarea, select {
+border-width:2px;
+border-style: solid;
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
input, textarea, select, option {
font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
}
@@ -40,7 +46,8 @@ box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
.entity_send-a-message .form_notice,
.pagination .nav_prev a,
.pagination .nav_next a,
-.form_settings fieldset fieldset {
+.form_settings fieldset fieldset,
+.entity_moderation:hover ul {
border-color:#DDDDDD;
}
@@ -61,6 +68,7 @@ input.submit,
.entity_remote_subscribe,
.entity_actions a,
.entity_actions input,
+.entity_moderation p,
button {
box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
@@ -89,7 +97,8 @@ a,
.form_settings input.form_action-primary,
.notice-options input,
.entity_actions a,
-.entity_actions input {
+.entity_actions input,
+.entity_moderation p {
color:#002FA7;
}
@@ -97,8 +106,8 @@ color:#002FA7;
.profile {
border-top-color:#C8D1D5;
}
-.section .profile {
-border-top-color:#87B4C8;
+.mark-top {
+border-color:#AAAAAA;
}
#aside_primary {
@@ -144,13 +153,18 @@ button.close,
.form_user_unsubscribe input.submit,
.form_group_join input.submit,
.form_user_subscribe input.submit,
-.entity_subscribe a {
+.entity_subscribe a,
+.entity_moderation p,
+.entity_sandbox input.submit,
+.entity_silence input.submit,
+.entity_delete input.submit {
background-image:url(../../base/images/icons/icons-01.gif);
background-repeat:no-repeat;
background-color:transparent;
}
-#wrap form.processing input.submit {
+#wrap form.processing input.submit,
+.entity_actions a.processing {
background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
cursor:wait;
text-indent:-9999px;
@@ -169,11 +183,12 @@ border-color:transparent;
}
#content,
#site_nav_local_views .current a,
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.entity_moderation:hover ul {
background-color:#FFFFFF;
}
-#site_nav_local_views li {
+#site_nav_local_views li.current {
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);
@@ -252,7 +267,8 @@ background-position: 5px -718px;
.entity_send-a-message a {
background-position: 5px -852px;
}
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.entity_moderation:hover ul {
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);
@@ -271,6 +287,18 @@ background-position: 5px -918px;
.form_make_admin input.submit {
background-position: 5px -983px;
}
+.entity_moderation p {
+background-position: 5px -1313px;
+}
+.entity_sandbox input.submit {
+background-position: 5px -1380px;
+}
+.entity_silence input.submit {
+background-position: 5px -1445px;
+}
+.entity_delete input.submit {
+background-position: 5px -1511px;
+}
/* NOTICES */
.notice .attachment {
diff --git a/theme/default/css/ie.css b/theme/default/css/ie.css
index a0d3cd682..228347166 100644
--- a/theme/default/css/ie.css
+++ b/theme/default/css/ie.css
@@ -7,8 +7,14 @@ color:#FFFFFF;
background-color:#C8D1D5;
}
.form_notice .form_note + label {
-background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
+background:transparent url(../../base/images/icons/icons-01.gif) no-repeat 0 -328px;
}
.form_notice #notice_data-attach {
filter: alpha(opacity=0);
}
+.notice-options form.form_favor input.submit {
+background-position:0 -460px;
+}
+.notice-options form.form_disfavor input.submit {
+background-position:0 -526px;
+}
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index ff7311302..d5a5d38de 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -20,7 +20,13 @@ font-size:1em;
address {
margin-right:7.2%;
}
-
+input, textarea, select {
+border-width:2px;
+border-style: solid;
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
input, textarea, select, option {
font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
}
@@ -40,7 +46,8 @@ box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
.entity_send-a-message .form_notice,
.pagination .nav_prev a,
.pagination .nav_next a,
-.form_settings fieldset fieldset {
+.form_settings fieldset fieldset,
+.entity_moderation:hover ul {
border-color:#DDDDDD;
}
@@ -61,6 +68,7 @@ input.submit,
.entity_remote_subscribe,
.entity_actions a,
.entity_actions input,
+.entity_moderation p,
button {
box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
@@ -89,7 +97,8 @@ a,
.form_settings input.form_action-primary,
.notice-options input,
.entity_actions a,
-.entity_actions input {
+.entity_actions input,
+.entity_moderation p {
color:#002FA7;
}
@@ -97,8 +106,8 @@ color:#002FA7;
.profile {
border-top-color:#CEE1E9;
}
-.section .profile {
-border-top-color:#87B4C8;
+.mark-top {
+border-color:#AAAAAA;
}
#aside_primary {
@@ -144,13 +153,18 @@ button.close,
.form_user_unsubscribe input.submit,
.form_group_join input.submit,
.form_user_subscribe input.submit,
-.entity_subscribe a {
+.entity_subscribe a,
+.entity_moderation p,
+.entity_sandbox input.submit,
+.entity_silence input.submit,
+.entity_delete input.submit {
background-image:url(../../base/images/icons/icons-01.gif);
background-repeat:no-repeat;
background-color:transparent;
}
-#wrap form.processing input.submit {
+#wrap form.processing input.submit,
+.entity_actions a.processing {
background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
cursor:wait;
text-indent:-9999px;
@@ -169,11 +183,12 @@ border-color:transparent;
}
#content,
#site_nav_local_views .current a,
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.entity_moderation:hover ul {
background-color:#FFFFFF;
}
-#site_nav_local_views li {
+#site_nav_local_views li.current {
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);
@@ -251,7 +266,8 @@ background-position: 5px -718px;
.entity_send-a-message a {
background-position: 5px -852px;
}
-.entity_send-a-message .form_notice {
+.entity_send-a-message .form_notice,
+.entity_moderation:hover ul {
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);
@@ -270,6 +286,18 @@ background-position: 5px -918px;
.form_make_admin input.submit {
background-position: 5px -983px;
}
+.entity_moderation p {
+background-position: 5px -1313px;
+}
+.entity_sandbox input.submit {
+background-position: 5px -1380px;
+}
+.entity_silence input.submit {
+background-position: 5px -1445px;
+}
+.entity_delete input.submit {
+background-position: 5px -1511px;
+}
/* NOTICES */
.notice .attachment {
diff --git a/theme/identica/css/ie.css b/theme/identica/css/ie.css
index 9ede1e324..f69c13ae7 100644
--- a/theme/identica/css/ie.css
+++ b/theme/identica/css/ie.css
@@ -7,7 +7,7 @@ color:#FFFFFF;
background-color:#D9DADB;
}
.form_notice .form_note + label {
-background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px;
+background:transparent url(../../base/images/icons/icons-01.gif) no-repeat 0 -328px;
}
.form_notice #notice_data-attach {
filter: alpha(opacity=0);