summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README6
-rw-r--r--actions/apioauthaccesstoken.php26
-rw-r--r--actions/apioauthauthorize.php32
-rw-r--r--actions/apioauthrequesttoken.php7
-rw-r--r--actions/designadminpanel.php4
-rw-r--r--lib/apiauth.php67
-rw-r--r--lib/apioauthstore.php9
-rw-r--r--locale/en_GB/LC_MESSAGES/statusnet.po2
-rw-r--r--theme/clean/css/display.css122
-rw-r--r--theme/clean/css/ie.css29
-rw-r--r--theme/clean/css/mp-screen.css186
-rw-r--r--theme/clean/images/page_bg.pngbin204352 -> 89227 bytes
-rw-r--r--theme/rebase/css/display.css1146
-rw-r--r--theme/rebase/css/ie.css39
-rw-r--r--theme/shiny/css/display.css391
-rw-r--r--theme/shiny/css/ie.css33
-rw-r--r--theme/shiny/css/mp-screen.css237
-rw-r--r--theme/shiny/images/overlay10.pngbin0 -> 608 bytes
-rw-r--r--theme/shiny/images/overlay20.pngbin0 -> 617 bytes
-rw-r--r--theme/shiny/images/overlay25.pngbin0 -> 630 bytes
-rw-r--r--theme/shiny/images/page_bg1.pngbin204352 -> 89227 bytes
21 files changed, 1562 insertions, 774 deletions
diff --git a/README b/README
index 733e62512..26a9fe4ec 100644
--- a/README
+++ b/README
@@ -112,7 +112,7 @@ Notable changes this version:
- New experimental plugins: AnonFavorites, SlicedFavorites, GroupFavorited,
ForceGroup, ShareNotice
- OAuth upgraded to 1.0a
-- Localization updates now include plugins, thanks to TranslateWiki.net!
+- Localization updates now include plugins, thanks to translatewiki.net!
- SSL link generation should be more consistent; alternate SSL URLs can be
set in the admin UI for more parts of the system.
- Experimental backupuser.php, restoreuser.php command-line scripts to
@@ -604,7 +604,7 @@ subdirectory to add a new language to your system. You'll need to
compile the ".po" files into ".mo" files, however.
Contributions of translation information to StatusNet are very easy:
-you can use the Web interface at TranslateWiki.net to add one
+you can use the Web interface at translatewiki.net to add one
or a few or lots of new translations -- or even new languages. You can
also download more up-to-date .po files there, if you so desire.
@@ -1697,7 +1697,7 @@ if anyone's been overlooked in error.
* mEDI
* Brett Taylor
* Brigitte Schuster
-* Siebrand Mazeland and the amazing volunteer translators at TranslateWiki.net
+* Siebrand Mazeland and the amazing volunteer translators at translatewiki.net
* Brion Vibber, StatusNet, Inc.
* James Walker, StatusNet, Inc.
* Samantha Doherty, designer, StatusNet, Inc.
diff --git a/actions/apioauthaccesstoken.php b/actions/apioauthaccesstoken.php
index 663a7a2bb..6b36d1919 100644
--- a/actions/apioauthaccesstoken.php
+++ b/actions/apioauthaccesstoken.php
@@ -67,7 +67,7 @@ class ApiOauthAccessTokenAction extends ApiOauthAction
$server->add_signature_method($hmac_method);
- $atok = null;
+ $atok = $app = null;
// XXX: Insist that oauth_token and oauth_verifier be populated?
// Spec doesn't say they MUST be.
@@ -78,7 +78,7 @@ class ApiOauthAccessTokenAction extends ApiOauthAction
$this->reqToken = $req->get_parameter('oauth_token');
$this->verifier = $req->get_parameter('oauth_verifier');
-
+ $app = $datastore->getAppByRequestToken($this->reqToken);
$atok = $server->fetch_access_token($req);
} catch (OAuthException $e) {
@@ -92,22 +92,26 @@ class ApiOauthAccessTokenAction extends ApiOauthAction
// Token exchange failed -- log it
- list($proxy, $ip) = common_client_ip();
-
$msg = sprintf(
- 'API OAuth - Failure exchanging request token for access token, '
- . 'request token = %s, verifier = %s, IP = %s, proxy = %s',
+ 'API OAuth - Failure exchanging OAuth request token for access token, '
+ . 'request token = %s, verifier = %s',
$this->reqToken,
- $this->verifier,
- $ip,
- $proxy
+ $this->verifier
);
- common_log(LOG_WARNING, $msg);
-
+ common_log(LOG_WARNIGN, $msg);
$this->clientError(_("Invalid request token or verifier.", 400, 'text'));
} else {
+ common_log(
+ LOG_INFO,
+ sprintf(
+ "Issued now access token '%s' for application %d (%s).",
+ $atok->key,
+ $app->id,
+ $app->name
+ )
+ );
$this->showAccessToken($atok);
}
}
diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php
index ea5c30c2a..eb1000e25 100644
--- a/actions/apioauthauthorize.php
+++ b/actions/apioauthauthorize.php
@@ -113,14 +113,12 @@ class ApiOauthAuthorizeAction extends Action
$this->reqToken = $this->store->getTokenByKey($this->oauthTokenParam);
if (empty($this->reqToken)) {
- $this->serverError(
- _('Invalid request token.')
- );
+ $this->clientError(_('Invalid request token.'));
} else {
// Check to make sure we haven't already authorized the token
if ($this->reqToken->state != 0) {
- $this->clientError("Invalid request token.");
+ $this->clientError(_("Invalid request token."));
}
}
}
@@ -240,15 +238,31 @@ class ApiOauthAuthorizeAction extends Action
// Redirect the user to the provided OAuth callback
common_redirect($targetUrl, 303);
- } else {
+ } elseif ($this->app->type == 2) {
+
+ // Strangely, a web application seems to want to do the OOB
+ // workflow. Because no callback was specified anywhere.
common_log(
- LOG_INFO,
- "No oauth_callback parameter provided for application ID "
- . $this->app->id
- . " when authorizing request token."
+ LOG_WARNING,
+ sprintf(
+ "API OAuth - No callback provided for OAuth web client ID %s (%s) "
+ . "during authorization step. Falling back to OOB workflow.",
+ $this->app->id,
+ $this->app->name
+ )
);
}
+ common_log(
+ LOG_INFO,
+ sprintf(
+ "The request token '%s' for OAuth application %s (%s) has been authorized.",
+ $this->oauthTokenParam,
+ $this->app->id,
+ $this->app->name
+ )
+ );
+
// Otherwise, inform the user that the rt was authorized
$this->showAuthorized();
diff --git a/actions/apioauthrequesttoken.php b/actions/apioauthrequesttoken.php
index 478d2dbfc..376567125 100644
--- a/actions/apioauthrequesttoken.php
+++ b/actions/apioauthrequesttoken.php
@@ -146,7 +146,7 @@ class ApiOauthRequestTokenAction extends ApiOauthAction
function verifyCallback($callback)
{
if ($callback == "oob") {
- common_debug("OAuth request token requested for out of bounds client.");
+ common_debug("OAuth request token requested for out of band client.");
// XXX: Should we throw an error if a client is registered as a
// web application but requests the pin based workflow? For now I'm
@@ -154,10 +154,7 @@ class ApiOauthRequestTokenAction extends ApiOauthAction
return true;
} else {
- return Validate::uri(
- $callback,
- array('allowed_schemes' => array('http', 'https'))
- );
+ return Validate::uri($callback);
}
}
diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php
index 587333e06..199be43ea 100644
--- a/actions/designadminpanel.php
+++ b/actions/designadminpanel.php
@@ -258,8 +258,8 @@ class DesignadminpanelAction extends AdminPanelAction
function saveBackgroundImage()
{
$filename = null;
-
- if ($_FILES['design_background-image_file']['error'] ==
+ if (isset($_FILES['design_background-image_file']['error']) &&
+ $_FILES['design_background-image_file']['error'] ==
UPLOAD_ERR_OK) {
$filepath = null;
diff --git a/lib/apiauth.php b/lib/apiauth.php
index 8b0a3da17..a1c698bba 100644
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -168,9 +168,11 @@ class ApiAuthAction extends ApiAction
$app = Oauth_application::getByConsumerKey($consumer);
if (empty($app)) {
- common_log(LOG_WARNING,
- 'Couldn\'t find the OAuth app for consumer key: ' .
- $consumer);
+ common_log(
+ LOG_WARNING,
+ 'API OAuth - Couldn\'t find the OAuth app for consumer key: ' .
+ $consumer
+ );
// TRANS: OAuth exception thrown when no application is found for a given consumer key.
throw new OAuthException(_('No application for that consumer key.'));
}
@@ -197,16 +199,19 @@ class ApiAuthAction extends ApiAction
}
$msg = "API OAuth authentication for user '%s' (id: %d) on behalf of " .
- "application '%s' (id: %d) with %s access.";
-
- common_log(LOG_INFO, sprintf($msg,
- $this->auth_user->nickname,
- $this->auth_user->id,
- $app->name,
- $app->id,
- ($this->access = self::READ_WRITE) ?
- 'read-write' : 'read-only'
- ));
+ "application '%s' (id: %d) with %s access.";
+
+ common_log(
+ LOG_INFO,
+ sprintf(
+ $msg,
+ $this->auth_user->nickname,
+ $this->auth_user->id,
+ $app->name,
+ $app->id,
+ ($this->access = self::READ_WRITE) ? 'read-write' : 'read-only'
+ )
+ );
} else {
// TRANS: OAuth exception given when an incorrect access token was given for a user.
throw new OAuthException(_('Bad access token.'));
@@ -218,6 +223,7 @@ class ApiAuthAction extends ApiAction
}
} catch (OAuthException $e) {
+ $this->logAuthFailure($e->getMessage());
common_log(LOG_WARNING, 'API OAuthException - ' . $e->getMessage());
$this->clientError($e->getMessage(), 401, $this->format);
exit;
@@ -276,16 +282,11 @@ class ApiAuthAction extends ApiAction
$this->access = self::READ_WRITE;
if (empty($this->auth_user) && ($required || isset($_SERVER['PHP_AUTH_USER']))) {
-
- // basic authentication failed
- list($proxy, $ip) = common_client_ip();
-
- $msg = sprintf( 'Failed API auth attempt, nickname = %1$s, ' .
- 'proxy = %2$s, ip = %3$s',
- $this->auth_user_nickname,
- $proxy,
- $ip);
- common_log(LOG_WARNING, $msg);
+ $msg = sprintf(
+ "basic auth nickname = %s",
+ $this->auth_user_nickname
+ );
+ $this->logAuthFailure($msg);
// TRANS: Client error thrown when authentication fails.
$this->clientError(_("Could not authenticate you."), 401, $this->format);
exit;
@@ -332,4 +333,24 @@ class ApiAuthAction extends ApiAction
}
}
}
+
+ /**
+ * Log an API authentication failer. Collect the proxy and IP
+ * and log them
+ *
+ * @param string $logMsg additional log message
+ */
+
+ function logAuthFailure($logMsg)
+ {
+ list($proxy, $ip) = common_client_ip();
+
+ $msg = sprintf(
+ 'API auth failure (proxy = %1$s, ip = %2$s) - ',
+ $proxy,
+ $ip
+ );
+
+ common_log(LOG_WARNING, $msg . $logMsg);
+ }
}
diff --git a/lib/apioauthstore.php b/lib/apioauthstore.php
index f3bf0b857..6e0039bdd 100644
--- a/lib/apioauthstore.php
+++ b/lib/apioauthstore.php
@@ -74,8 +74,13 @@ class ApiStatusNetOAuthDataStore extends StatusNetOAuthDataStore
function new_access_token($token, $consumer, $verifier)
{
common_debug(
- 'new_access_token("' . $token->key . '","' . $consumer->key. '","' . $verifier . '")',
- __FILE__
+ sprintf(
+ "%s - New access token from request token %s, consumer %s and verifier %s ",
+ __FILE__,
+ $token,
+ $consumer,
+ $verifier
+ )
);
$rt = new Token();
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index 88421ca45..a13584b99 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -2693,7 +2693,7 @@ msgstr "Message sent"
#: actions/newmessage.php:185 lib/command.php:511
#, php-format
msgid "Direct message to %s sent."
-msgstr "Could not create application."
+msgstr "Direct message to %s sent."
#: actions/newmessage.php:210 actions/newnotice.php:261
msgid "Ajax Error"
diff --git a/theme/clean/css/display.css b/theme/clean/css/display.css
index 260ee5926..9cc8346fd 100644
--- a/theme/clean/css/display.css
+++ b/theme/clean/css/display.css
@@ -11,17 +11,16 @@
@media screen, projection, tv {
body {
- background: #9a9aa4 url(../images/page_bg.png) no-repeat fixed 50% 100%;
+ background: url(../images/page_bg.png) no-repeat fixed 50% 100%;
background-color: #6e6e8c;
font-family: "Liberation Sans", "Nimbus Sans L", "FreeSans", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 86%;
}
#wrap {
- width: 860px;
+ width: 867px;
margin: 0px auto;
- padding: 10px;
- padding-top: 0px;
+ padding: 0px 8px 10px 8px;
background-color: #fff;
box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.7);
-moz-box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.7);
@@ -29,7 +28,10 @@ body {
}
#header {
+ width: 851px;
+ padding: 0px;
padding-top: 70px;
+ margin-left: 8px;
}
address {
@@ -61,11 +63,11 @@ address {
display: block;
position: absolute;
top: 0;
+ left: 0;
z-index: 98;
background-color: #829d25;
- width: 880px;
- left: 50%;
- margin-left: -440px;
+ width: 883px;
+ margin-left: -16px;
margin-top: 0px;
height: 30px;
line-height: 30px;
@@ -74,6 +76,10 @@ address {
border-bottom: 1px solid #fff;
}
+#site_nav_global_primary li:last-child {
+ margin-right: 16px;
+}
+
#site_nav_global_primary a {
color: #fff !important;
text-shadow: 0px 1px 1px rgba(0, 0, 0, 0.5);
@@ -81,16 +87,11 @@ address {
#site_notice {
float: right;
- width: 266px;
+ width: 270px;
+ padding: 10px;
margin-left: 40px;
}
-.form_notice {
- float: right;
- width: 500px;
- margin-top: 0px;
-}
-
#anon_notice {
clear: both;
background: none;
@@ -98,36 +99,62 @@ address {
margin-bottom: 0px;
}
+.form_notice {
+ float: right;
+ width: 494px;
+ margin-top: 0px;
+}
+
.form_notice fieldset {
width: 100%;
}
.form_notice textarea {
- width: 364px;
+ width: 362px;
height: 54px;
}
+.form_notice label[for=notice_data-attach],
+.form_notice #notice_data-attach {
+ top: 27px;
+}
+
.form_notice #notice_data-geo_wrap label,
.form_notice #notice_data-geo_wrap input {
- top: 48px;
+ top: 52px;
}
.form_notice #notice_action-submit {
font-size: 0.9em;
- top: 74px;
+ top: 80px;
right:0;
height: 2.4em;
width: 96px;
- right: 10px;
+ right: 10px;
+}
+
+.form_notice .error,
+.form_notice .success {
+ width: 375px;
+}
+
+.form_notice .error {
+ width: 375px;
+ margin-left: 0px;
}
#core {
clear: both;
+ margin: 0px;
+ width: 851px;
+ margin-left: 8px;
margin-top: 14px;
}
#content {
padding-top: 10px;
+ width: 545px;
+ margin-right: 0px;
}
#site_nav_local_views {
@@ -149,6 +176,27 @@ address {
text-decoration: none;
}
+#aside_primary {
+ width: 280px;
+ padding-left: 10px;
+}
+
+#aside_primary .section {
+ width: 270px;
+ margin-left: 0px;
+ margin-right: 10px;
+}
+
+.section ul.entities {
+ width: 290px;
+}
+
+.section .entities li {
+ margin-right: 17px;
+ margin-bottom: 10px;
+ width: 24px;
+}
+
.notice {
line-height: 1.35em;
}
@@ -161,36 +209,48 @@ address {
min-height: 26px;
}
-#showstream .notice .entry-title {
- min-height: 0px;
-}
-
#shownotice .notice .entry-title {
min-height:123px;
}
-.user_in .notice div.entry-content {
- max-width: 360px;
+.notice div.entry-content {
+ font-size: 0.9em;
+ line-height: 1.2em;
+ margin-top: 10px;
opacity: 0.6;
}
-.user_in .notice div.entry-content:hover {
+.notice:hover div.entry-content {
opacity: 1;
}
-.notice div.entry-content {
- font-size: 0.9em;
- line-height: 1.2em;
- margin-top: 10px;
+.user_in .notice div.entry-content {
+ max-width: 360px;
+}
+
+div.entry-content a.response:before {
+ content: "(";
+}
+
+div.entry-content a.response:after {
+ content: ")";
}
.notice-options {
- margin-top: 6px;
+ margin-top: 8px;
}
.pagination {
height: 1.2em;
}
-}/*end of @media screen, projection, tv*/
+#jOverlayContent button {
+ top: 20px;
+ right: 36px;
+}
+.entity_profile {
+ width: 365px;
+}
+
+}/*end of @media screen, projection, tv*/
diff --git a/theme/clean/css/ie.css b/theme/clean/css/ie.css
index ede8f078a..80c4dccba 100644
--- a/theme/clean/css/ie.css
+++ b/theme/clean/css/ie.css
@@ -1,13 +1,11 @@
-/* IE specific styles */
-
-/* base theme overrides */
+/* Temporary copy of base styles for overriding */
input.checkbox,
input.radio {
top:0;
}
.form_notice textarea {
- width: 364px;
+ width: 362px;
}
.form_notice .form_note + label {
position:absolute;
@@ -17,8 +15,8 @@ text-indent:-9999px;
height:16px;
width:16px;
display:block;
- top: 31px;
- right: 88px;
+ left: 390px;
+ top: 27px;
}
.form_notice #notice_action-submit {
width: 96px;
@@ -57,6 +55,23 @@ z-index:9999;
line-height:auto;
}
+/* IE specific styles */
+
+.notice-options input.submit {
+ color:#FFFFFF;
+}
+
.form_notice #notice_data-attach {
-filter: alpha(opacity=0);
+ filter: alpha(opacity=0);
+}
+
+.form_notice .form_note + label {
+ background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -328px;
+}
+
+.form_notice #notice_data-geo_wrap label {
+ background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -1780px;
+}
+.form_notice #notice_data-geo_wrap label.checked {
+ background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -1846px;
}
diff --git a/theme/clean/css/mp-screen.css b/theme/clean/css/mp-screen.css
index c9fb6dcc4..d544fcb76 100644
--- a/theme/clean/css/mp-screen.css
+++ b/theme/clean/css/mp-screen.css
@@ -1,7 +1,191 @@
-/* just a placeholder for now */
+/* mobile style */
+
+body {
+ background-image: none;
+ min-width: 0;
+}
+
+#wrap {
+ margin: 0;
+ padding: 0;
+ min-width:0;
+ max-width:100%;
+}
+
+#header {
+ width: 96%;
+ padding: 0 2%;
+ padding-top: 20px;
+}
+
+.user_in #header {
+ padding-top: 40px;
+}
+
+address {
+margin:1em 0 0 0;
+float:left;
+width:100%;
+}
address img + .fn {
display:block;
margin-top:1em;
+ margin-right: 10px;
+clear: left;
float:left;
}
+
+#site_nav_global_primary {
+ margin:0;
+ width: 98%;
+ padding: 4px 0;
+ margin-left: -2%;
+ height: auto;
+ position:absolute;
+ top:0;
+ left:0;
+ font-size: 1em;
+ letter-spacing: 0em;
+}
+
+#site_nav_global_primary li {
+ margin-left:0;
+ margin-right:10px;
+ float:left;
+ font-size:0.9em;
+ padding: 2px 4px;
+ line-height: 1em;
+}
+
+.form_notice {
+ float: left;
+ margin-left: -10px;
+ width: 300px;
+ padding: 4px;
+}
+
+#form_notice-direct.form_notice {
+ padding-top: 10px;
+}
+
+.form_notice textarea {
+ width: 210px;
+ height: 50px;
+ padding: 4px;
+}
+
+#notice_text-count {
+position:absolute;
+bottom:2px;
+ left: 175px;
+ font-size: 0.8em;
+z-index:9;
+}
+
+#form_notice-direct.form_notice #notice_text-count {
+ left: 0px;
+}
+
+/*input type=file no good in
+iPhone/iPod Touch, Android, Opera Mini Simulator
+*/
+.form_notice #notice_text-count + label,
+.form_notice label[for="notice_data-attach"] {
+display:none;
+}
+.form_notice #notice_data-attach {
+position:static;
+clear:both;
+width:65%;
+height:auto;
+display:block;
+z-index:9;
+padding:0;
+margin:0;
+background:none;
+opacity:1;
+}
+
+.form_notice #notice_action-submit {
+ text-align: center;
+ left: 230px;
+ top: 32px;
+ width: 70px;
+ font-size: 0.8em;
+}
+
+#form_notice-direct.form_notice #notice_action-submit {
+ top: 62px;
+}
+
+#site_nav_local_views {
+ height: auto;
+ font-size: 0.9em;
+ line-height: 2em;
+ margin-bottom: 0px;
+ padding-left: 4px;
+}
+
+#site_nav_local_views li {
+ margin-right: 6px;
+}
+
+
+#core {
+ width: 100%;
+ margin: 0;
+}
+
+#content {
+ width: 96%;
+ padding: 10px 2%;
+ margin: 0;
+ min-height: auto;
+}
+
+#footer {
+ margin: 0;
+ padding: 10px 4px 4px 4px;
+}
+
+
+.form_settings fieldset {
+margin-bottom:7px;
+}
+
+.form_settings label {
+width:auto;
+display:block;
+float:none;
+ text-align: left;
+}
+
+.form_settings .form_data li {
+margin-bottom:7px;
+}
+
+.form_settings .form_data textarea,
+.form_settings .form_data select,
+.form_settings .form_data input {
+margin-left:0;
+display:block;
+}
+.form_settings .form_data textarea {
+width:96.41%;
+}
+
+.form_settings .form_data label {
+float:none;
+}
+
+.form_settings .form_data p.form_guide {
+width:auto;
+margin-left:0;
+}
+
+
+#settings_design_color .form_data {
+ width: auto;
+ margin-right: 0;
+}
diff --git a/theme/clean/images/page_bg.png b/theme/clean/images/page_bg.png
index d27bab591..a9f446812 100644
--- a/theme/clean/images/page_bg.png
+++ b/theme/clean/images/page_bg.png
Binary files differ
diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css
index b532be5d0..19ef2b577 100644
--- a/theme/rebase/css/display.css
+++ b/theme/rebase/css/display.css
@@ -10,22 +10,30 @@
@media screen, projection, tv {
-* { margin: 0; padding: 0px; vertical-align: baseline; }
-abbr { border-bottom:0; }
-input.submit { cursor: pointer; }
+/* general styles and layout */
+
+* {margin: 0; padding: 0; vertical-align: baseline;}
+a abbr {border-bottom: 0; cursor: pointer;}
+input.submit {cursor: pointer;}
+table {border-collapse: collapse;}
+ol, ul {list-style-position: inside;}
+fieldset {border: none;}
+legend {font-weight: bold; font-size: 1.2em;}
+input, textarea, select, option {padding: 2px;}
+textarea {overflow:auto;}
body {
background-color: #ffffff;
color: #000;
font-family: sans-serif;
font-size: 100%;
- line-height: 1.2;
+ line-height: 1.4;
min-width: 700px;
}
a {
- color: #00008c;
- text-decoration: none;
+ color: #00008c;
+ text-decoration: none;
outline: none;
}
@@ -40,16 +48,22 @@ a img {
h1, h2, h3, h4, h5, h6 {
font-weight: normal;
- font-weight: 1.6em;
margin-bottom: 15px;
}
-h1 {
- font-size: 2.2em;
+h1 {font-size: 2.2em;}
+h2 {font-size: 1.8em;}
+h3 {font-size: 1.6em;}
+h4 {font-size: 1.4em;}
+h5 {font-size: 1.2em;}
+h6 {font-size: 1em;}
+
+p {
+ margin-bottom: 1.4em;
}
-h2 {
- font-size: 1.8em;
+.form_notice p, li p, .section p {
+ margin-bottom: 0;
}
input, textarea, select, option {
@@ -57,9 +71,14 @@ input, textarea, select, option {
font-size: 1em;
}
-input {
- font-family: "DejaVu Sans", "Bitstream Vera Sans", Geneva, Verdana, sans-serif;
- font-size: 1em;
+select {
+ padding-right: 10px;
+ padding-bottom: 0px;
+ margin-top: -4px;
+}
+
+option {
+ padding-bottom: 0px;
}
#wrap {
@@ -105,7 +124,10 @@ input {
}
#aside_primary .section {
- margin: 0px 10px 20px 10px;
+ margin: 0px 2% 20px 2%;
+ position: relative;
+ width: 96%;
+ float: left;
clear: both;
}
@@ -113,6 +135,8 @@ body[id$=adminpanel] #aside_primary {
display:none;
}
+/* header elements */
+
address {
margin-bottom: 10px;
}
@@ -124,7 +148,7 @@ address img + .fn {
address .poweredby {
display: block;
width: auto;
-}
+}
#site_nav_global_primary {
margin: 20px 0px 20px 0px;
@@ -145,17 +169,12 @@ address .poweredby {
margin-bottom: 10px;
}
-#site_notice ul {
- margin-left: 15px;
+#site_notice p {
+ margin-bottom: 0px;
}
-.system_notice dt {
- display:none;
-}
-
-#page_notice {
- padding: 4px;
- margin-bottom: 20px;
+#site_notice ul {
+ margin-left: 15px;
}
#anon_notice {
@@ -164,6 +183,12 @@ address .poweredby {
margin-bottom: 10px;
}
+#anon_notice p {
+ margin-bottom: 0px;
+}
+
+/* new notice & direct message forms */
+
.form_notice {
background: #ccc;
margin-bottom: 10px;
@@ -180,13 +205,6 @@ address .poweredby {
display: none;
}
-.form_notice label[for=notice_data-text] {
- float: left;
- font-size: 1.2em;
- margin-bottom: 0.2em;
- opacity: 1;
-}
-
.form_notice textarea {
clear: left;
float: left;
@@ -194,41 +212,52 @@ address .poweredby {
border: none;
position: relative;
width: 485px;
- height: 63px;
- padding-bottom: 15px;
+ height: 60px;
+ padding-bottom: 18px;
z-index: 9;
}
+.form_notice label[for=notice_data-text] {
+ float: left;
+ font-weight: normal;
+ font-size: 1.2em;
+ margin-bottom: 0.2em;
+ opacity: 1;
+ color: #333 !important;
+}
+
.form_notice label[for=notice_data-attach],
.form_notice #notice_data-attach {
position:absolute;
- top: 24px;
- right: 87px;
+ top: 31px;
+ right: 88px;
cursor:pointer;
}
.form_notice label[for=notice_data-attach] {
-text-indent:-9999px;
-width:16px;
-height:16px;
+ text-indent:-9999px;
+ width:16px;
+ height:16px;
}
+
.form_notice #notice_data-attach {
-padding:0;
-height:16px;
+ padding:0;
+ height:16px;
}
+
.form_notice .form_note {
-position:absolute;
-bottom:2px;
-right:21.715%;
-z-index:9;
+ position: absolute;
+ bottom: 0px;
+ right: 125px;
+ z-index: 9;
+ font-size: 0.8em;
}
+
.form_notice .form_note dt {
-font-weight:bold;
-display:none;
+ display:none;
}
.form_notice #notice_text-count {
- margin-right: 10px;
color: #777;
}
@@ -237,10 +266,10 @@ display:none;
}
.form_notice #notice_action-submit {
-padding:0;
-position:absolute;
-right:0;
- top: 79px;
+ padding:0;
+ position:absolute;
+ right:0;
+ top: 81px;
height: 2.4em;
width: 106px;
}
@@ -249,39 +278,38 @@ right:0;
margin-top: 0px;
float: left;
font-size: 1.2em;
+ font-weight: normal;
+ color: #333 !important;
}
.form_notice select[id=to] {
margin-bottom: 4px;
margin-top: -4px;
-margin-left:18px;
-float:left;
-max-width:322px;
+ margin-left:18px;
+ float:left;
+ max-width:322px;
}
.form_notice .error,
.form_notice .success {
-float:left;
-clear:both;
-width:81.5%;
-margin-bottom:0;
-line-height:1.618;
-}
-
-.form_notice #notice_data-attach_selected {
+ clear: left;
+ float: left;
+ overflow: auto;
+ line-height: 1.2em;
padding: 2px 2px 2px 5px;
width: 498px;
border: 2px solid #ccc;
margin-left: -2px;
-}
+}
.form_notice #notice_data-attach_selected code {
- float: left;
- width: 470px;
- display: block;
- overflow: auto;
font-size: 1.2em;
- line-height: 1.8em;
+}
+
+.form_notice .error {
+ border: none;
+ width: 502px;
+ padding: 6px 2px 6px 5px;
}
.form_notice #notice_data-attach_selected button.close {
@@ -289,60 +317,27 @@ line-height:1.618;
font-size:0.8em;
}
-.processing {
-background-image:url(../../base/images/icons/icon_processing.gif);
-background-repeat:no-repeat;
-background-position:47% 47%;
-}
-
-.error {
- background-color: #F7E8E8;
-}
-.success {
- background-color: #f2f2f2;
-}
-
.form_notice #notice_data-geo_wrap label,
.form_notice #notice_data-geo_wrap input {
-position:absolute;
- top: 50px;
- right: 87px;
-left:auto;
-cursor:pointer;
-width:16px;
-height:16px;
-display:block;
-}
-.form_notice #notice_data-geo_wrap input {
-visibility:hidden;
-}
-.form_notice #notice_data-geo_wrap label {
-font-weight:normal;
-font-size:1em;
-margin-bottom:0;
-text-indent:-9999px;
-}
-
-.form_notice #notice_data-attach {
-opacity:0;
-}
-
-.form_notice label[for=notice_data-attach],
-.form_notice label[for=notice_data-geo] {
- background-image: url(../images/icons/icons-01.gif);
- background-repeat: no-repeat;
- background-color: transparent;
+ position:absolute;
+ top: 55px;
+ right: 88px;
+ left:auto;
+ cursor:pointer;
+ width:16px;
+ height:16px;
+ display:block;
}
-.form_notice label[for=notice_data-attach] {
- background-position: 0 -328px;
+.form_notice #notice_data-geo_wrap input {
+ visibility:hidden;
}
-.form_notice label[for=notice_data-geo] {
- background-position: 0 -1780px;
-}
-.form_notice label[for=notice_data-geo].checked {
- background-position: 0 -1846px;
+.form_notice #notice_data-geo_wrap label {
+ font-weight:normal;
+ font-size:1em;
+ margin-bottom:0;
+ text-indent:-9999px;
}
.form_notice label {
@@ -353,6 +348,11 @@ opacity:0;
opacity: 1;
}
+.form_notice #notice_data-attach {
+ opacity:0;
+}
+
+/* Local navigation */
#site_nav_local_views {
margin-bottom: 20px;
@@ -371,182 +371,10 @@ opacity:0;
text-decoration: underline;
}
-
-#aside_primary li {
- list-style-type: none;
-}
-
-#aside_primary ol.notices {
- float: left;
- position: relative;
- margin-bottom: 10px;
-}
-
-#aside_primary .notices li {
- margin-bottom: 8px;
-}
-
-#aside_primary .notice {
- min-height: 24px;
-}
-
-#export_data li {
- list-style-type:none;
- display: inline;
- line-height: 2;
-}
-
-#export_data li a {
- padding-left: 20px;
- margin-right: 10px;
-}
-#export_data li a.foaf {
- padding-left: 30px;
-}
-
-#export_data li a.rss,
-#export_data li a.atom,
-#export_data li a.foaf {
- background-image: url(../images/icons/icons-01.gif);
- background-repeat: no-repeat;
- background-color: transparent;
-}
-
-#export_data li a.rss {
- background-position: 0 -130px;
-}
-#export_data li a.atom {
- background-position: 0 -64px;
-}
-#export_data li a.foaf {
- background-position: 0 1px;
-}
-
-#aside_primary td {
- padding-right: 10px;
- padding-bottom: 10px;
-}
-
-
-#entity_statistics dt,
-#entity_statistics dd {
-display:inline;
-margin-right:11px;
-}
-#entity_statistics dt:after {
-content: ":";
-}
-
-.section ul.entities {
-float:left;
-width:100%;
-
-}
-.section .entities li {
-list-style-type:none;
-float:left;
-margin-right:7px;
-margin-bottom:7px;
-display:inline;
-}
-.section .entities li .photo {
-margin-right:0;
-margin-bottom:0;
-}
-.section .entities li .fn {
-display:none;
-}
-
-.aside .section p,
-.aside .section .more {
-clear:both;
-}
-
-.section tbody td {
-padding-right:18px;
-padding-bottom:11px;
-}
-.section .vcard .photo {
-margin-right:7px;
-margin-bottom:0;
-}
-
-.section .notice {
-padding-top:7px;
-padding-bottom:7px;
-border-top:0;
-}
-
-.section .notice:first-child {
-padding-top:0;
-}
-
-.section .notice .author {
-margin-right:0;
-}
-.section .notice .author .fn {
-display:none;
-}
-
-.tag-cloud {
-list-style-type:none;
-text-align:center;
-}
-.aside .tag-cloud {
-font-size:0.8em;
-word-wrap:break-word;
-}
-.tag-cloud li {
-display:inline;
-margin-right:7px;
-line-height:1.25;
-}
-
-.tag-cloud li:before {
-content:'\0009';
-}
-
-.aside .tag-cloud li {
-line-height:1.5;
-}
-.tag-cloud li a {
-text-decoration:none;
-}
-#tagcloud.section dt {
-text-transform:uppercase;
-font-weight:bold;
-}
-.tag-cloud-1 {
-font-size:1em;
-}
-.tag-cloud-2 {
-font-size:1.25em;
-}
-.tag-cloud-3 {
-font-size:1.75em;
-}
-.tag-cloud-4 {
-font-size:2em;
-}
-.tag-cloud-5 {
-font-size:2.25em;
-}
-.tag-cloud-6 {
-font-size:2.75em;
-}
-.tag-cloud-7 {
-font-size:3.25em;
-}
-
-#publictagcloud #tagcloud.section dt {
-display:none;
-}
-
-#content .notices {
- padding-top: 8px;
-}
+/* notices */
#notices_primary {
+ padding-top: 8px;
clear: both;
}
@@ -554,107 +382,100 @@ display:none;
display: none;
}
-.notices li {
+.notice {
list-style-type: none;
margin-bottom: 25px;
clear: left;
+ min-height: 54px;
+ padding-bottom: 2px;
}
-.notice, .profile, .application {
+.notice, .profile, .application {
position:relative;
clear:both;
float:left;
width:100%;
}
-.notice {
- min-height: 56px;
-}
-
.notice .author {
margin-right: 8px;
}
-#showstream #content .notice .author {
-display:none;
-}
-
.fn {
-overflow:hidden;
+ overflow: hidden;
}
.notice .author .fn {
-font-weight:bold;
+ font-weight: bold;
}
#core .vcard .photo {
-display:inline;
-margin-right:11px;
-float:left;
-}
-
-#shownotice .vcard .photo {
-margin-bottom:4px;
+ display: inline;
+ margin-right: 11px;
+ float: left;
}
#content .notice .author .photo {
-position:absolute;
+ position: absolute;
top: 4px;
left: 4px;
-float:none;
+ float: none;
}
#content .notice .entry-title {
margin: 2px 7px 0px 59px;
}
-#showstream .notice .entry-title {
- min-height: 1em;
-}
-
.vcard .url {
-text-decoration:none;
+ text-decoration:none;
}
.vcard .url:hover {
-text-decoration:underline;
+ text-decoration:underline;
}
.notice .entry-title {
-overflow:hidden;
-word-wrap:break-word;
+ overflow:hidden;
+ word-wrap:break-word;
}
+
.notice .entry-title.ov {
overflow:visible;
}
-#showstream .notice .entry-title,
-#showstream .notice div.entry-content {
-margin-left:0;
+
+#showstream h1 {
+ display:none;
}
+
+#showstream .notice .entry-title, #showstream .notice div.entry-content {
+ margin-left: 0;
+}
+
+#showstream #content .notice .author {
+ display: none;
+}
+
+#showstream .notice {
+ min-height: 1em;
+}
+
+#shownotice .vcard .photo {
+ margin-bottom: 4px;
+}
+
#shownotice .notice .entry-title {
-margin-left:110px;
-font-size:2.2em;
-min-height:123px;
+ margin-left:110px;
+ font-size:2.2em;
+ min-height:123px;
font-size: 1.6em;
line-height: 1.2em;
}
#shownotice .notice div.entry-content {
-margin-left:0;
+ margin-left:0;
}
.notice p.entry-content {
-display:inline;
-}
-
-#content .notice p.entry-content a:visited {
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
-}
-.notice p.entry-content .vcard a {
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
+ display:inline;
}
.notice div.entry-content {
@@ -668,77 +489,17 @@ border-radius:4px;
display: block;
}
-button.close,
-button.minimize {
-width:16px;
-height:16px;
-text-indent:-9999px;
-padding:0;
-border:0;
-text-align:center;
-font-weight:bold;
-cursor:pointer;
-}
-
-.dialogbox {
-position:absolute;
-top:-1px;
-right:-1px;
-z-index:9;
+.entry-content .repeat .photo {
float:none;
-padding:11px;
-border-style:solid;
-border-width:1px;
- background: #fff;
-}
-
-.dialogbox legend {
-display:block !important;
-margin-right:18px;
-margin-bottom:18px;
-}
-
-.dialogbox button.close {
-position:absolute;
-right:3px;
-top:3px;
-}
-
-.dialogbox .form_guide {
-font-weight:normal;
-padding:0;
-}
-
-.dialogbox .submit_dialogbox {
-font-weight:bold;
-text-indent:0;
-min-width:46px;
-}
-.dialogbox input {
-padding-left:4px;
-}
-.dialogbox fieldset {
-margin-bottom:0;
-}
-
-#wrap form.processing input.submit,
-.entity_actions a.processing,
-.dialogbox.processing .submit_dialogbox {
-cursor:wait;
-outline:none;
-text-indent:-9999px;
-}
-
-.form_repeat.dialogbox {
-top:-4px;
-right:29px;
-min-width:199px;
+margin-right:1px;
+position:relative;
+top:4px;
+left:0;
}
-
.notice-options {
float: right;
- margin-top: 10px;
+ margin-top: 12px;
margin-right: -6px;
}
@@ -765,38 +526,14 @@ min-width:199px;
border: 0;
height: 16px;
width: 16px;
- background-image: url(../images/icons/icons-01.gif);
- background-repeat: no-repeat;
- background-color: transparent;
}
.notice-options input.submit, .notice-options a {
- opacity: 0.6;
+ opacity: 0.6;
}
.notice-options input.submit:hover, .notice-options a:hover {
- opacity: 1;
-}
-
-.notice-options form.form_favor input.submit {
- background-position: 0 -460px;
-}
-.notice-options form.form_disfavor input.submit {
- background-position: 0 -526px;
-}
-
-.notice-options .notice_reply {
- background-position: 0 -592px;
-}
-
-.notice-options .notice_delete {
- background-position: 0 -658px;
-}
-.notice-options form.form_repeat input.submit {
- background-position: 0 -1582px;
-}
-.notice-options .repeated {
- background-position: 0 -1648px;
+ opacity: 1;
}
.notice .attachment {
@@ -818,12 +555,14 @@ margin-left:4px;
.notice .attachment.more {
padding-left:0;
}
+
.notice .attachment img {
position:absolute;
top:18px;
left:0;
z-index:99;
}
+
#shownotice .notice .attachment img {
position:static;
}
@@ -856,24 +595,20 @@ margin-bottom:0;
#jOverlayContent #content {
padding:11px;
min-height:auto;
+ border: 1px solid #fff;
}
#jOverlayContent .entry-title {
display:block;
margin-bottom:11px;
}
#jOverlayContent button {
-position:absolute;
-top:0;
-right:0;
+ position:absolute;
+ top: 5px;
+ right: 20px;
}
#jOverlayContent h1 {
max-width:425px;
}
-#jOverlayContent #content {
-border-radius:7px;
--moz-border-radius:7px;
--webkit-border-radius:7px;
-}
#jOverlayLoading {
top:5%;
left:40%;
@@ -898,10 +633,11 @@ font-weight:bold;
content: ":";
}
-.notices li li {
- margin-left:18px;
- width: auto;
- margin-top: 25px;
+#content .notice .notice {
+ width: 98%;
+ margin-left: 2%;
+ margin-top: 16px;
+ margin-bottom: 10px;
}
.notice .notice {
@@ -917,6 +653,271 @@ background-color:rgba(200, 200, 200, 0.150);
background-color:rgba(200, 200, 200, 0.300);
}
+/* aside primary specific styles */
+
+.aside .section p,
+.aside .section .more {
+clear:both;
+}
+
+.section .vcard .photo {
+margin-right:7px;
+margin-bottom:0;
+}
+
+.section .notice {
+padding-top:7px;
+padding-bottom:7px;
+border-top:0;
+}
+
+.section .notice:first-child {
+padding-top:0;
+}
+
+.section .notice .author {
+margin-right:0;
+}
+.section .notice .author .fn {
+display:none;
+}
+
+#aside_primary ol.notices {
+ list-style-type: none;
+ float: left;
+ position: relative;
+ margin-bottom: 10px;
+}
+
+#aside_primary .notices li {
+ margin-bottom: 8px;
+}
+
+#aside_primary .notice {
+ min-height: 24px;
+}
+
+#export_data li {
+ list-style-type:none;
+ display: inline;
+ line-height: 2;
+}
+
+#export_data li a {
+ padding-left: 20px;
+ margin-right: 10px;
+}
+#export_data li a.foaf {
+ padding-left: 30px;
+}
+
+#aside_primary td {
+ padding-right: 10px;
+ padding-bottom: 10px;
+}
+
+.section tbody td {
+padding-right:18px;
+padding-bottom:11px;
+}
+
+#entity_statistics dt,
+#entity_statistics dd {
+display:inline;
+margin-right:11px;
+}
+#entity_statistics dt:after {
+content: ":";
+}
+
+.section ul.entities {
+ float:left;
+ width:100%;
+}
+
+.section .entities li {
+ list-style-type: none;
+ float: left;
+ margin-right: 3px;
+ margin-bottom: 8px;
+ display: inline;
+}
+.section .entities li .photo {
+ margin: 0;
+}
+.section .entities li .fn {
+ display: none;
+}
+
+.tag-cloud {
+list-style-type:none;
+text-align:center;
+}
+.aside .tag-cloud {
+font-size:0.8em;
+word-wrap:break-word;
+}
+.tag-cloud li {
+display:inline;
+margin-right:7px;
+line-height:1.25;
+}
+
+.tag-cloud li:before {
+content:'\0009';
+}
+
+.aside .tag-cloud li {
+line-height:1.5;
+}
+.tag-cloud li a {
+text-decoration:none;
+}
+#tagcloud.section dt {
+text-transform:uppercase;
+font-weight:bold;
+}
+.tag-cloud-1 {
+font-size:1em;
+}
+.tag-cloud-2 {
+font-size:1.25em;
+}
+.tag-cloud-3 {
+font-size:1.75em;
+}
+.tag-cloud-4 {
+font-size:2em;
+}
+.tag-cloud-5 {
+font-size:2.25em;
+}
+.tag-cloud-6 {
+font-size:2.75em;
+}
+.tag-cloud-7 {
+font-size:3.25em;
+}
+
+#publictagcloud #tagcloud.section dt {
+display:none;
+}
+
+/* secondary elements */
+
+.processing {
+background-image:url(../../base/images/icons/icon_processing.gif);
+background-repeat:no-repeat;
+background-position:47% 47%;
+}
+
+.error {
+ background-color: #F7E8E8;
+}
+.success {
+ background-color: #f2f2f2;
+}
+
+.system_notice dt {
+ display:none;
+}
+
+#page_notice {
+clear:both;
+margin-bottom:18px;
+}
+
+.entry-content .success {
+ padding: 6px;
+}
+
+.system_notice ul,
+.instructions ul {
+margin-left:1em;
+}
+.instructions p,
+.instructions ul {
+margin-bottom:18px;
+}
+.help dt {
+display:none;
+}
+.guide {
+clear:both;
+}
+
+#bookmarklet address {
+display:none;
+}
+#bookmarklet .form_notice {
+width:auto;
+}
+#bookmarklet #wrap {
+min-width:0;
+}
+
+button.close,
+button.minimize {
+width:16px;
+height:16px;
+text-indent:-9999px;
+padding:0;
+border:0;
+text-align:center;
+font-weight:bold;
+cursor:pointer;
+}
+
+.dialogbox {
+position:absolute;
+ top: 0px;
+ right: 0px;
+z-index:9;
+float:none;
+padding:11px;
+border-style:solid;
+border-width:1px;
+ background: #fff;
+ color: #000;
+}
+
+.dialogbox legend {
+display:block !important;
+margin-right:18px;
+margin-bottom:18px;
+}
+
+.dialogbox button.close {
+position:absolute;
+right:3px;
+top:3px;
+}
+
+.dialogbox .form_guide {
+font-weight:normal;
+padding:0;
+}
+
+.dialogbox .submit_dialogbox {
+font-weight:bold;
+text-indent:0;
+min-width:46px;
+}
+.dialogbox input {
+padding-left:4px;
+}
+.dialogbox fieldset {
+margin-bottom:0;
+}
+
+#wrap form.processing input.submit,
+.entity_actions a.processing,
+.dialogbox.processing .submit_dialogbox {
+cursor:wait;
+outline:none;
+text-indent:-9999px;
+}
+
.pagination {
background-color: #f2f2f2;
clear: left;
@@ -949,7 +950,6 @@ background-color:rgba(200, 200, 200, 0.300);
padding: 1%;
}
-
#site_nav_global_secondary dt {
display: none;
}
@@ -967,12 +967,24 @@ background-color:rgba(200, 200, 200, 0.300);
margin-top: 10px;
}
+#site_content_license_cc {
+margin-bottom:0;
+}
+#site_content_license_cc img {
+display:inline;
+vertical-align:top;
+margin-right:4px;
+}
form ul li {
list-style-type:none;
margin:0 0 18px 0;
}
+form label.submit {
+display:none;
+}
+
.form_settings {
clear:both;
}
@@ -995,6 +1007,7 @@ form ul li {
.form_settings fieldset fieldset legend {
line-height:0;
font-size: 1.4em;
+ font-weight: normal;
}
.form_settings input.remove {
@@ -1122,42 +1135,61 @@ padding:0 7px;
margin-right: 20px;
}
+#form_search .submit {
+margin-left:11px;
+}
+#form_search .form_data input {
+width:auto;
+}
+
.hentry .entry-content .form_settings ul {
margin-left:0;
}
+/* override OStatus plugin style */
-#form_ostatus_connect.form_settings.dialogbox {
- width: 80%;
+#form_ostatus_connect.form_settings.dialogbox, #form_ostatus_sub.dialogbox {
+ width: 76%;
}
#form_ostatus_connect.form_settings.dialogbox legend {
font-size: 1.4em;
- font-weight: bold;
+ font-weight: normal;
+ padding-bottom: 10px;
}
-#form_ostatus_connect.form_settings.dialogbox #ostatus_profile label {
- font-weight: bold;
+#form_ostatus_connect.dialogbox .form_data label,
+#form_ostatus_sub.dialogbox .form_data label {
+ font-weight: normal;
font-size: 1.2em;
+ width:34%;
}
-#form_ostatus_connect.form_settings.dialogbox #ostatus_profile input {
+#form_ostatus_connect.dialogbox .form_data input,
+#form_ostatus_sub.dialogbox .form_data input {
float: right;
- width: 50%;
+ width: 52% !important;
}
-#form_ostatus_connect.form_settings.dialogbox .form_guide {
+#form_ostatus_connect.dialogbox .form_data .form_guide,
+#form_ostatus_sub.dialogbox .form_data .form_guide {
background: none !important;
+ text-align: right;
+ margin-right: 16px;
}
-#form_search .form_data input {
-width:auto;
+.section .entity_actions {
+ margin-right: 0px !important;
+}
+
+.section .entity_remote_subscribe {
+ color:#000 !important;
+ padding-left: 26px !important;
+ background-position: 4px -1183px !important;
}
#filter_tags ul li,
.entity_send-a-message .form_notice,
-.pagination .nav_prev a,
-.pagination .nav_next a,
.form_settings fieldset fieldset,
.entity_moderation:hover ul,
.entity_role:hover ul,
@@ -1169,7 +1201,6 @@ border-color:#DDDDDD;
background:none;
}
-.form_notice.warning #notice_text-count,
.form_settings .form_note {
background-color:#9BB43E;
}
@@ -1207,7 +1238,6 @@ clear:both;
margin-bottom:0;
}
-
#settings_design_background-image img {
max-width:480px;
max-height:480px;
@@ -1243,11 +1273,6 @@ margin-left:0;
width:auto;
}
-
-#showstream h1 {
- display:none;
-}
-
.entity_profile {
position:relative;
width:73%;
@@ -1286,19 +1311,20 @@ margin-left:113px;
margin-bottom:4px;
}
-.entity_profile .entity_fn,
-.entity_profile .entity_nickname {
-margin-left:11px;
-display:inline;
-}
-.entity_profile .entity_nickname {
+.entity_profile .entity_nickname,
+.entity_profile .entity_fn {
margin-left:0;
}
-.entity_profile .fn,
+
.entity_profile .nickname {
font-size:1.4em;
-font-weight:bold;
}
+
+.entity_profile .fn {
+ font-size: 1.2em;
+ clear: left;
+}
+
.entity_profile .fn:before {
content: "(";
font-weight:normal;
@@ -1323,7 +1349,7 @@ font-style:italic;
.entity_actions {
float:right;
margin-left:2%;
-margin-bottom:18px;
+ margin-bottom: 28px;
min-width:21%;
}
@@ -1351,7 +1377,6 @@ display:none;
display:block;
text-align:left;
width:100%;
- border: none;
}
.entity_actions a {
text-decoration:none;
@@ -1360,25 +1385,34 @@ display:block;
}
.entity_actions a, .entity_actions input, .entity_actions p {
- background-color: #ccc !important;
+ color: #333 !important;
font-weight: normal;
- padding-top: 4px;
- padding-bottom: 4px;
line-height: 1.6em;
- padding-left:23px;
}
-.entity_actions a:hover, .entity_actions input:hover {
- background-color: #f2f2f2 !important;
+.entity_actions a {
+ padding: 3px 4px 4px 28px;
}
-.entity_actions #entity_remote_subscribe a {
- padding-right: 6px;
+.entity_actions input {
+ padding: 4px 4px 4px 26px;
+}
+
+.entity_actions a, .entity_actions p, .entity_actions .entity_subscribe input, .entity_actions .entity_block input {
+ background-color: #ccc !important;
+ border: none;
}
-.entity_actions a,
.entity_actions p {
-padding:2px 4px 1px 26px;
+ padding: 2px 4px 4px 28px;
+}
+
+.entity_actions a, .entity_actions p, .entity_actions .entity_subscribe input, .entity_actions .entity_block input {
+ background-color: #f2f2f2 !important;
+}
+
+.entity_actions #entity_remote_subscribe a {
+ padding-right: 6px;
}
.entity_actions .accept {
@@ -1392,24 +1426,38 @@ right:3px;
}
.entity_send-a-message .form_notice {
-position:absolute;
-top:34px;
-right:-1px;
-padding:1.795%;
-width:65%;
-z-index:2;
+ width: 410px;
+ padding: 10px;
+ position: absolute;
+ top: 46px;
+ right: 10px;
+ z-index: 2;
+}
+
+.entity_send-a-message .form_notice fieldset {
+ width: 410px;
}
+
+.entity_send-a-message .form_notice textarea {
+ width: 280px;
+}
+
.entity_send-a-message .form_notice legend {
display:block;
margin-bottom:11px;
+ font-weight: normal;
+ color: #333 !important;
}
.entity_send-a-message .form_notice label,
.entity_send-a-message .form_notice select {
display:none;
}
-.entity_send-a-message .form_notice input.submit {
-text-align:center;
+.entity_send-a-message .form_notice #notice_action-submit {
+ position: absolute;
+ top: 52px;
+ right: 0px;
+ text-align: center;
}
.entity_moderation,
@@ -1452,38 +1500,55 @@ margin-right:7px;
content:'\0009';
}
-
-#entity_statistics dt,
-#entity_statistics dd {
-display:inline;
-margin-right:11px;
+#filter_tags {
+ margin-bottom: 20px;
+ padding-bottom: 10px;
+ border-bottom: 1px solid #ccc;
+ float: left;
}
-#entity_statistics dt:after {
-content: ":";
+#filter_tags dt {
+display:none;
}
-
-.section ul.entities {
+#filter_tags ul {
+list-style-type:none;
+}
+#filter_tags li {
float:left;
-width:100%;
+margin-left:7px;
+padding-left:7px;
+border-left-width: 1px;
+border-left-style:solid;
+}
+#filter_tags #filter_tags_all {
+ margin-left: 10px;
+border-left:0;
+padding-left:0;
}
-.section .entities li {
-list-style-type:none;
+#filter_tags_all a {
+font-weight:bold;
+ margin-top: 4px;
float:left;
-margin-right:7px;
-margin-bottom:7px;
-display:inline;
}
-.section .entities li .photo {
-margin-right:0;
-margin-bottom:0;
+
+#filter_tags_item label {
+ margin-right: 14px;
+ margin-left: 7px;
+ padding-top: 4px;
}
-.section .entities li .fn {
-display:none;
+#filter_tags_item label,
+#filter_tags_item select {
+float:left;
}
-.aside .section p,
-.aside .section .more {
+#filter_tags_item p {
+float:left;
clear:both;
+margin-left:38px;
+}
+#filter_tags_item .submit {
+position:relative;
+top:3px;
+left:3px;
}
.profile .entity_profile {
@@ -1499,8 +1564,13 @@ display:none;
}
.profiles {
-list-style-type:none;
+ list-style-type:none;
}
+
+.profiles li {
+ margin-bottom: 20px;
+}
+
.profile .entity_profile .fn.nickname,
.profile .entity_profile .url[rel~=contact] {
margin-left:0;
@@ -1534,7 +1604,6 @@ font-weight:normal;
margin-right:11px;
}
-
.applications {
margin-bottom:18px;
float:left;
@@ -1587,20 +1656,14 @@ font-size:1.3em;
width:14.5%;
}
-
-.profiles {
-list-style-type:none;
-}
-
-.profiles li {
- margin-bottom: 20px;
-}
-
-
.mark-top {
border-top: 1px solid #ccc;
}
+#realtime_actions li {
+ margin-right: -4px;
+}
+
#realtime_play, #realtime_pause, #realtime_popup {
background-image: url(../images/icons/icons-01.gif);
background-repeat: no-repeat;
@@ -1668,6 +1731,7 @@ body.realtime-popup {
right: 2px;
}
+/* icons */
.form_notice label[for=notice_data-attach],
#export_data li a.rss,
@@ -1727,8 +1791,6 @@ background-position:0 -1120px;
button.minimize {
background-position:0 -1912px;
}
-
-
#export_data li a.rss {
background-position:0 -130px;
}
@@ -1738,8 +1800,6 @@ background-position:0 -64px;
#export_data li a.foaf {
background-position:0 1px;
}
-
-
.form_group_leave input.submit,
.form_user_unsubscribe input.submit {
background-position:5px -1246px;
@@ -1750,14 +1810,12 @@ background-position:5px -1246px;
.entity_subscribe a {
background-position:5px -1181px;
}
-
.entity_edit a {
background-position: 5px -719px;
}
.entity_send-a-message a {
background-position: 5px -852px;
}
-
.entity_nudge p,
.form_user_nudge input.submit {
background-position: 5px -785px;
@@ -1829,7 +1887,6 @@ background-position: 0 -2374px;
#realtime_popup {
background-position: 0 -1714px;
}
-
.notice .attachment {
background-position:0 -394px;
}
@@ -1851,32 +1908,37 @@ background-position:0 -526px;
.notice-options .notice_delete {
background-position:0 -658px;
}
-
.notice-options .form_repeat.processing {
background-image:none;
}
-
.notice-options form.form_repeat input.submit {
background-position:0 -1582px;
}
.notice-options .repeated {
background-position:0 -1648px;
}
-
#new_group a {
background-position:0 -1054px;
}
-
+.form_notice label[for=notice_data-attach] {
+ background-position: 0 -328px;
+}
+.form_notice label[for=notice_data-geo] {
+ background-position: 0 -1780px;
+}
+.form_notice label[for=notice_data-geo].checked {
+ background-position: 0 -1846px;
+}
.pagination .nav_prev a {
- padding-top: 8px;
- padding-left: 25px;
-background-position:0 -187px;
+ padding-top: 8px;
+ padding-left: 25px;
+ background-position:0 -187px;
}
.pagination .nav_next a {
- padding-top: 9px;
- padding-right: 25px;
-background-position: 115% -252px;
+ padding-top: 9px;
+ padding-right: 25px;
+ background-position: 115% -252px;
}
#usergroups #new_group {
diff --git a/theme/rebase/css/ie.css b/theme/rebase/css/ie.css
index 88985efb7..5d38ca102 100644
--- a/theme/rebase/css/ie.css
+++ b/theme/rebase/css/ie.css
@@ -1,17 +1,11 @@
-/**
- * @package StatusNet
- * @author Sarven Capadisli <csarven@status.net>
- * @copyright 2009-2010 StatusNet, Inc.
- * @license http://creativecommons.org/licenses/by/3.0/ Creative Commons Attribution 3.0 Unported
- * @link http://status.net/
- */
-/* IE specific styles */
+/* Temporary copy of base styles for overriding */
+
input.checkbox,
input.radio {
top:0;
}
.form_notice textarea {
-width:78%;
+ width: 485px;
}
.form_notice .form_note + label {
position:absolute;
@@ -21,10 +15,11 @@ text-indent:-9999px;
height:16px;
width:16px;
display:block;
+ top: 30px;
}
.form_notice #notice_action-submit {
-width:17%;
-max-width:17%;
+ width: 106px;
+ max-width: 106px;
}
.form_notice #notice_data-attach_selected,
.form_notice #notice_data-geo_selected {
@@ -60,6 +55,26 @@ line-height:auto;
}
+/* IE specific styles */
+
+.notice-options input.submit {
+ color:#FFFFFF;
+}
+
.form_notice #notice_data-attach {
-filter: alpha(opacity=0);
+ filter: alpha(opacity=0);
+}
+
+.form_notice .form_note + label {
+ background:transparent url(../images/icons/icons-01.gif) no-repeat 0 -328px;
+}
+
+.form_notice #notice_data-geo_wrap label {
+ background:transparent url(../images/icons/icons-01.gif) no-repeat 0 -1780px;
}
+
+.form_notice #notice_data-geo_wrap label.checked {
+ background:transparent url(../images/icons/icons-01.gif) no-repeat 0 -1846px;
+}
+
+
diff --git a/theme/shiny/css/display.css b/theme/shiny/css/display.css
index ec98a049c..758d462ba 100644
--- a/theme/shiny/css/display.css
+++ b/theme/shiny/css/display.css
@@ -12,24 +12,23 @@
body {
background: url(../images/page_bg1.png) no-repeat fixed 50% 100%;
- background-color: #222;
+ background-color: #181818;
font-family: "DejaVu Sans", "Bitstream Vera Sans", Geneva, Verdana, sans-serif;
- font-size: 86%;
+ font-size: 84%;
}
#wrap {
- width: 860px;
+ width: 867px;
margin: 0px auto;
- padding: 10px;
- padding-top: 0px;
+ padding: 0px 8px 10px 8px;
box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.7);
-moz-box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.7);
-webkit-box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.7);
- background-color: rgba(165,168,167,0.6);
+ background-color: rgba(201, 203, 202, 0.5);
}
a {
- color: #333;
+ color: #24245c;
}
address {
@@ -38,19 +37,33 @@ address {
margin-top: 0px;
}
+h1, h2, h3, h4, h5, h6 {
+ font-weight: normal;
+ margin-bottom: 15px;
+ margin-top: 10px;
+}
+
+h1 {font-size: 1.4em;}
+h2 {font-size: 1.3em;}
+h3 {font-size: 1.2em;}
+h4 {font-size: 1.1em;}
+h5 {font-size: 1em;}
+h6 {font-size: 1em;}
+
#content h1 {
- text-transform: uppercase;
letter-spacing: 0.2em;
font-size: 1.4em;
- margin-left: 2px;
- margin-bottom: 16px;
- font-weight: bold;
+ font-weight: normal;
text-shadow:0 1px 0 rgba(255,255,255,0.4);
+ margin: -4px 0px 15px 0px;
}
#header {
- margin: 0px;
+ width: 851px;
+ padding: 0px;
padding-top: 60px;
+ margin: 0px;
+ margin-left: 8px;
}
.poweredby {
@@ -58,11 +71,11 @@ address {
height: 40px;
font-size: 0.8em;
color: #fff;
- line-height: 32px;
+ line-height: 16px;
padding-left: 50px;
position: absolute;
- top: 2px;
- left: 0;
+ top: 0px;
+ left: -10px;
z-index: 99;
font-style: normal;
}
@@ -70,6 +83,8 @@ address {
.poweredby a {
color: #fff !important;
font-weight: bold;
+ display: block;
+ clear: left;
}
#site_nav_global_primary {
@@ -90,17 +105,16 @@ address {
font-size: 0.8em;
background: url(../images/global_bg.png) repeat-x top left;
position: absolute;
+ width: 893px;
top: -20px;
- width: 890px;
- left: 50%;
- margin-left: -445px;
+ left: 0;
+ margin-left: -21px;
}
#site_nav_global_primary ul.nav {
float: right;
- padding-right: 20px;
text-transform: uppercase;
- padding-right: 16px;
+ padding-right: 10px;
}
#site_nav_global_primary ul.nav li {
@@ -122,7 +136,7 @@ address {
#site_nav_global_primary ul.nav a:hover {
color: #fff;
- background: #000;
+ background-color: #000;
border-bottom: 1px solid #666;
border-left: 1px solid #666;
text-decoration: none;
@@ -133,13 +147,14 @@ address {
}
#anon_notice {
+ background: url(../images/overlay10.png) repeat-x top left;
clear: both;
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-color: #333;
- border-top-color: #ddd;
- border-left-color: #ddd;
+ border-top-color: #aaa;
+ border-left-color: #aaa;
border-width: 1px;
border-style: solid;
color: #ccc;
@@ -148,7 +163,7 @@ address {
font-size: 1.1em;
margin-top: 16px;
margin-bottom: 12px;
- background-color: #4b4b4b;
+ background-color: #444;
text-shadow: 0px 1px 0px rgba(0,0,0,0.8);
}
@@ -162,7 +177,8 @@ address {
#site_notice {
float: right;
- width: 266px;
+ width: 270px;
+ padding: 10px;
margin-left: 40px;
background: none;
border-radius: 4px;
@@ -177,113 +193,124 @@ address {
.form_notice {
float: right;
- width: 500px;
+ width: 494px;
margin-top: 0px;
- background: #ccc;
+ background: #ccc;
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
padding: 10px;
+ border: 1px solid #ddd;
+ box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2);
+ -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2);
+ -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2);
+}
+
+.form_notice label[for=notice_data-text], .form_notice label[for=to] {
+ text-shadow:0 1px 0 rgba(255,255,255,0.4);
+ padding-left: 2px;
}
.form_notice fieldset {
- width: 510px;
+ width: 494px;
}
.form_notice textarea {
- width: 374px;
+ width: 362px;
height: 54px;
- border-radius:7px;
- -moz-border-radius:7px;
- -webkit-border-radius:7px;
+ border: 1px solid #bbb;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
position:relative;
}
+.entity_send-a-message .form_notice legend {
+ text-shadow:0 1px 0 rgba(255,255,255,0.4);
+}
+
+.form_notice textarea:focus {
+ border: 1px solid #9495b7;
+}
+
+.form_notice label[for=notice_data-attach],
+.form_notice #notice_data-attach {
+ top: 27px;
+ right: 86px;
+}
+
.form_notice #notice_data-geo_wrap label,
.form_notice #notice_data-geo_wrap input {
- top: 48px;
+ top: 50px;
+ right: 86px;
}
.form_notice #notice_action-submit {
- font-size: 0.9em;
- top: 74px;
- right:0;
- height: 2.4em;
- width: 96px;
- right: 10px;
-}
-
-#content {
- border-radius: 4px;
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
- border-radius-topright: 0px;
- -moz-border-radius-topright: 0px;
- -webkit-border-top-right-radius: 0px;
- padding-left: 10px;
- padding-right: 10px;
- padding-top: 14px;
- width: 541px;
- margin-right: 0;
- background-color: #e2e2e2;
+ top: 79px;
+ right: 0;
+ width: 102px;
+ right: 0px;
+ height: 2.2em;
}
-#aside_primary {
- padding: 0px;
- margin-top: -20px;
- padding-top: 15px;
- background-color: #222;
- border-radius-bottomright: 6px;
- -moz-border-radius-bottomright: 6px;
- -webkit-border-bottom-right-radius: 6px;
+.entity_send-a-message .form_notice #notice_action-submit {
+ color: #fff !important;
}
-#aside_primary .section {
- border-radius: 4px;
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
- padding: 6px;
- border: 1px solid #f9f9f9;
- box-shadow: 1px 1px 2px #444;
- -moz-box-shadow: 1px 1px 2px #444;
- -webkit-box-shadow: 1px 1px 2px #444;
- background-color: rgba(255,255,255, 0.4);
- float: left;
- width: 248px;
+.form_notice input.submit, .form_settings input.submit {
+ border: 1px solid #555;
+ border-top: none;
+ border-left: none;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ background: #666 url(../images/overlay25.png) repeat-x top left;
+ text-shadow: 0px 1px 0px rgba(0,0,0,0.8);
+ color:#fff;
+ font-weight: normal;
+ font-size: 1em;
+ height: 2.2em;
+ padding-left: 1em;
+ padding-right: 1em;
+ box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
+ -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
+ -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3);
+}
+
+.form_notice input.submit:hover, .form_settings input.submit:hover {
+ background-color: #888;
+}
+
+.form_notice .error,
+.form_notice .success {
+ width: 373px;
+ margin-left: 0px;
}
-#aside_primary .section H2 {
- font-size: 1.1em;
- font-weight: normal;
- letter-spacing: 0.2em;
- margin-bottom: 10px;
- margin-left: -4px;
- padding: 6px;
- margin-top: 2px;
- text-shadow:0 1px 0 rgba(255,255,255,0.4);
- line-height: 1.1em;
+.form_notice .error {
+ width: 375px;
+ margin-left: 1px;
}
#site_nav_local_views {
position: relative;
z-index: 9;
float: right;
- margin: 0px 10px 20px 0px;
- width: 271px;
+ margin: 0px 0px 20px 0px;
+ width: 290px;
}
#site_nav_local_views li {
- width:100%;
- margin-right:0;
+ width: 100%;
+ margin-right: 0;
margin-bottom: 0px;
text-align: right;
}
-#site_nav_local_views a {
+#site_nav_local_views a {
+ background: url(../images/overlay10.png) repeat-x top left;
display:block;
- width: 242px;
padding-right: 10px;
- padding-left:10%;
border: 1px solid #fff;
border-color: transparent;
padding-top: 4px;
@@ -293,7 +320,7 @@ address {
letter-spacing: 0.2em;
text-transform: uppercase;
color: #f2f2f2 !important;
- background-color: #4b4b4b;
+ background-color: #444;
border-bottom: 1px solid #999;
border-left: none;
text-shadow: 0px 1px 0px rgba(0,0,0,0.8);
@@ -303,42 +330,124 @@ address {
text-decoration: none;
}
-
#site_nav_local_views li:first-child a {
border-radius-topright:4px;
-moz-border-radius-topright:4px;
-webkit-border-top-right-radius:4px;
}
-#site_nav_local_views a:hover {
+#site_nav_local_views a:hover {
+ background: url(../images/overlay20.png) repeat-x top left;
color: #4d424c !important;
- background-color: #c6c6c6;
+ background-color: #b3b3b3;
text-shadow: 0 1px 0 rgba(255,255,255,0.75);
}
#site_nav_local_views .current a {
+ background: none;
display: block;
- color: #4d424c !important;
- margin-left: -1px;
- width: 243px;
- box-shadow: 1px 0px 1px #444;
- -moz-box-shadow: 1px 0px 1px #444;
- -webkit-box-shadow: 1px 0px 1px #444;
+ color: #4d4d4d !important;
+ box-shadow: 1px 1px 1px rgba(0,0,0,0.5);
+ -moz-box-shadow: 1px 1px 1px rgba(0,0,0,0.5);
+ -webkit-box-shadow: 1px 1px 1px rgba(0,0,0,0.5);
border-bottom: 1px solid #fff;
text-shadow: 1px 1px 0px rgba(0,0,0,0.2);
background-color: #e2e2e2;
text-decoration: none;
}
+#core {
+ clear: both;
+ margin: 0px;
+ width: 851px;
+ margin-left: 8px;
+ margin-top: 4px;
+}
+
+#content {
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ border-radius-topright: 0px;
+ -moz-border-radius-topright: 0px;
+ -webkit-border-top-right-radius: 0px;
+ padding: 14px 10px 20px 10px;
+ width: 541px;
+ margin-right: 0px;
+ background-color: #e2e2e2;
+}
+
+#aside_primary {
+ width: 280px;
+ padding: 0px;
+ padding-top: 16px;
+ padding-left: 10px;
+ margin-top: -20px;
+ background-color: #262626;
+ border-radius-bottomright: 6px;
+ -moz-border-radius-bottomright: 6px;
+ -webkit-border-bottom-right-radius: 6px;
+}
+
+#aside_primary .section {
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ padding: 6px;
+ padding-bottom: 12px;
+ border: 1px solid #ddd;
+ box-shadow: 1px 1px 2px #444;
+ -moz-box-shadow: 1px 1px 2px #444;
+ -webkit-box-shadow: 1px 1px 2px #444;
+ background-color: rgba(201, 203, 202, 0.5);
+ margin-left: 4px;
+ width: 248px;
+}
+
+#aside_primary .section H2 {
+ font-size: 1.1em;
+ font-weight: normal;
+ letter-spacing: 0.2em;
+ margin-bottom: 10px;
+ margin-left: -4px;
+ padding: 6px;
+ margin-top: 2px;
+ text-shadow:0 1px 0 rgba(255,255,255,0.4);
+ line-height: 1.1em;
+}
+
#aside_primary .notice {
background: none;
border: none;
}
-#content .notices li {
+.section ul.entities {
+ width: 270px;
+}
+
+.section .entities li {
+ margin-right: 13px;
+ margin-bottom: 10px;
+ width: 24px;
+}
+
+#notices_primary {
+ padding-top: 2px;
+}
+
+#content .notices .notice {
border-top: 1px dotted #bbb;
- padding-top: 16px;
- margin-bottom: 16px;
+ padding-top: 14px;
+ margin-bottom: 14px;
+}
+
+#content .notices .notices .notice {
+ margin-bottom: 0px;
+ padding-bottom: 14px;
+}
+
+#content .notices .notices .notice + .notice {
+ margin-bottom: -10px;
}
.notice {
@@ -351,11 +460,7 @@ address {
}
#content .notice .entry-title {
- min-height: 27px;
-}
-
-#showstream .notice .entry-title {
- min-height: 0px;
+ min-height: 26px;
}
#shownotice .notice .entry-title {
@@ -366,19 +471,19 @@ address {
font-size: 0.9em;
line-height: 1em;
margin-top: 10px;
+ opacity: 0.6;
+}
+
+.notice:hover div.entry-content {
+ opacity: 1;
}
.notice-options {
- margin-top: 6px;
+ margin-top: 7px;
}
.user_in .notice div.entry-content {
max-width: 360px;
- opacity: 0.6;
-}
-
-.user_in .notice div.entry-content:hover {
- opacity: 1;
}
div.entry-content a.response:before {
@@ -393,4 +498,60 @@ div.entry-content a.response:after {
background: none;
}
+.form_settings input {
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ border: 1px solid #bbb;
+ padding: 4px;
+ margin-bottom: 4px;
+}
+
+.form_settings input:focus {
+ border: 1px solid #9495b7;
+}
+
+.form_settings fieldset fieldset legend {
+ line-height:0;
+ font-size: 1.2em;
+ letter-spacing: 0.2em;
+}
+
+#jOverlayContent #content {
+ box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.7);
+ -moz-box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.7);
+ -webkit-box-shadow: 0px 0px 12px rgba(0, 0, 0, 0.7);
+}
+
+#jOverlayContent button {
+ top: 10px;
+ right: 36px;
+}
+
+.entity_profile {
+ width: 365px;
+}
+
+.entity_actions {
+ min-width: 140px;
+}
+
+.entity_actions a, .entity_actions input, .entity_actions p {
+ text-shadow:0 1px 0 rgba(255,255,255,0.4);
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+}
+
+.entity_moderation:hover ul,
+.entity_role:hover ul {
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+}
+
+.pagination {
+ background: none;
+}
+
}/*end of @media screen, projection, tv*/
diff --git a/theme/shiny/css/ie.css b/theme/shiny/css/ie.css
index 3c8e2230d..a901a15dd 100644
--- a/theme/shiny/css/ie.css
+++ b/theme/shiny/css/ie.css
@@ -1,15 +1,11 @@
-/* IE specific styles */
-
-/* IE specific styles */
-
-/* base theme overrides */
+/* Temporary copy of base styles for overriding */
input.checkbox,
input.radio {
top:0;
}
.form_notice textarea {
- width: 374px;
+ width: 362px;
}
.form_notice .form_note + label {
position:absolute;
@@ -19,8 +15,9 @@ text-indent:-9999px;
height:16px;
width:16px;
display:block;
- top: 31px;
- right: 88px;
+ left: 392px;
+ top: 27px;
+ right: 88px;
}
.form_notice #notice_action-submit {
width: 96px;
@@ -59,8 +56,26 @@ z-index:9999;
line-height:auto;
}
+
+/* IE specific styles */
+
+.notice-options input.submit {
+ color:#FFFFFF;
+}
+
.form_notice #notice_data-attach {
-filter: alpha(opacity=0);
+ filter: alpha(opacity=0);
+}
+
+.form_notice .form_note + label {
+ background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -328px;
+}
+
+.form_notice #notice_data-geo_wrap label {
+ background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -1780px;
+}
+.form_notice #notice_data-geo_wrap label.checked {
+ background:transparent url(../../rebase/images/icons/icons-01.gif) no-repeat 0 -1846px;
}
#wrap {
diff --git a/theme/shiny/css/mp-screen.css b/theme/shiny/css/mp-screen.css
index c9fb6dcc4..6a47b8e7f 100644
--- a/theme/shiny/css/mp-screen.css
+++ b/theme/shiny/css/mp-screen.css
@@ -1,7 +1,242 @@
-/* just a placeholder for now */
+/* mobile style */
+
+body {
+ background-image: none;
+ min-width: 0;
+}
+
+#wrap {
+ margin: 0;
+ padding: 0;
+ min-width:0;
+ max-width:100%;
+}
+
+#header {
+ width: 96%;
+ padding: 0 2%;
+ padding-top: 20px;
+}
+
+.user_in #header {
+ padding-top: 40px;
+}
+
+address {
+margin:1em 0 0 0;
+float:left;
+width:100%;
+}
address img + .fn {
display:block;
margin-top:1em;
+ margin-right: 10px;
+clear: left;
float:left;
}
+
+#site_nav_global_primary {
+ margin:0;
+ margin-left: -2%;
+ width: 94%;
+ padding: 2%;
+ height: auto;
+ position:absolute;
+ top:0;
+ left:0;
+ background: #333;
+ font-size: 1em;
+ letter-spacing: 0em;
+}
+
+#site_nav_global_primary li {
+ margin-left:0;
+ margin-right:10px;
+ float:left;
+ font-size:0.9em;
+ padding: 2px 4px;
+ line-height: 1em;
+}
+
+#site_nav_global_primary li a {
+ color: #fff !important;
+}
+
+.form_notice {
+ float: left;
+ margin-left: -10px;
+ width: 300px;
+ padding: 4px;
+}
+
+#form_notice-direct.form_notice {
+ padding-top: 10px;
+}
+
+.form_notice textarea {
+ width: 210px;
+ height: 50px;
+ padding: 4px;
+}
+
+#notice_text-count {
+position:absolute;
+bottom:2px;
+ left: 175px;
+ font-size: 0.8em;
+z-index:9;
+}
+
+#form_notice-direct.form_notice #notice_text-count {
+ left: -185px;
+}
+
+/*input type=file no good in
+iPhone/iPod Touch, Android, Opera Mini Simulator
+*/
+.form_notice #notice_text-count + label,
+.form_notice label[for="notice_data-attach"] {
+display:none;
+}
+.form_notice #notice_data-attach {
+position:static;
+clear:both;
+width:65%;
+height:auto;
+display:block;
+z-index:9;
+padding:0;
+margin:0;
+background:none;
+opacity:1;
+}
+
+.form_notice #notice_action-submit {
+ text-align: center;
+ left: 230px;
+ top: 34px;
+ width: 70px;
+ font-size: 0.8em;
+}
+
+#form_notice-direct.form_notice #notice_action-submit {
+ top: 64px;
+}
+
+#site_nav_local_views {
+ position: relative;
+ z-index: 9;
+ float: left;
+ margin: 0px 10px 2px 4px;
+ width: auto;
+}
+
+#site_nav_local_views li {
+ width: auto;
+ text-align: left;
+}
+
+#site_nav_local_views a {
+ background: none;
+ display:block;
+ float: left;
+ padding: 4px;
+ margin: 0px 10px 10px 0px;
+ border: none !important;
+ font-size: 0.9em;
+ font-weight: normal;
+ letter-spacing: 0em;
+ text-transform: uppercase;
+ color: #f2f2f2 !important;
+ background-color: #444;
+ text-shadow: none;
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+}
+
+#site_nav_local_views li:first-child a {
+ border-radius: 4px;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+}
+
+#site_nav_local_views a:hover {
+ background: none;
+ background-color: #b3b3b3;
+}
+
+#site_nav_local_views .current a {
+ background: none;
+ display: inline;
+ color: #4d4d4d !important;
+ box-shadow: none;
+ -moz-box-shadow: none;
+ -webkit-box-shadow: none;
+ border-bottom: 1px solid #fff;
+ text-shadow: 1px 1px 0px rgba(0,0,0,0.2);
+ background-color: #e2e2e2;
+ text-decoration: none;
+}
+
+#core {
+ width: 100%;
+ margin: 0;
+}
+
+#content {
+ width: 96%;
+ padding: 10px 2%;
+ margin: 0;
+ min-height: auto;
+ border-radius-topright: 4px;
+ -moz-border-radius-topright: 4px;
+ -webkit-border-top-right-radius: 4px;
+}
+
+#footer {
+ margin: 0;
+ padding: 10px 4px 4px 4px;
+}
+
+
+.form_settings fieldset {
+margin-bottom:7px;
+}
+
+.form_settings label {
+width:auto;
+display:block;
+float:none;
+ text-align: left;
+}
+
+.form_settings .form_data li {
+margin-bottom:7px;
+}
+
+.form_settings .form_data textarea,
+.form_settings .form_data select,
+.form_settings .form_data input {
+margin-left:0;
+display:block;
+}
+.form_settings .form_data textarea {
+width:96.41%;
+}
+
+.form_settings .form_data label {
+float:none;
+}
+
+.form_settings .form_data p.form_guide {
+width:auto;
+margin-left:0;
+}
+
+
+#settings_design_color .form_data {
+ width: auto;
+ margin-right: 0;
+}
diff --git a/theme/shiny/images/overlay10.png b/theme/shiny/images/overlay10.png
new file mode 100644
index 000000000..a4cdbe82a
--- /dev/null
+++ b/theme/shiny/images/overlay10.png
Binary files differ
diff --git a/theme/shiny/images/overlay20.png b/theme/shiny/images/overlay20.png
new file mode 100644
index 000000000..e15aba828
--- /dev/null
+++ b/theme/shiny/images/overlay20.png
Binary files differ
diff --git a/theme/shiny/images/overlay25.png b/theme/shiny/images/overlay25.png
new file mode 100644
index 000000000..718286062
--- /dev/null
+++ b/theme/shiny/images/overlay25.png
Binary files differ
diff --git a/theme/shiny/images/page_bg1.png b/theme/shiny/images/page_bg1.png
index d27bab591..a9f446812 100644
--- a/theme/shiny/images/page_bg1.png
+++ b/theme/shiny/images/page_bg1.png
Binary files differ
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-16 19:37:16 +0000