summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/action.php2
-rw-r--r--theme/base/css/ie.css1
-rw-r--r--theme/base/css/ie7.css5
-rw-r--r--theme/identica/css/display.css16
-rw-r--r--theme/identica/logo.pngbin2215 -> 4988 bytes
5 files changed, 10 insertions, 14 deletions
diff --git a/lib/action.php b/lib/action.php
index 8f02b36bf..4d4c3d4c9 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -162,6 +162,8 @@ class Action extends HTMLOutputter // lawsuit
'media' => 'screen, projection, tv'));
$this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
'href="'.theme_path('css/ie.css', 'base').'?version='.LACONICA_VERSION.'" /><![endif]');
+ $this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
+ 'href="'.theme_path('css/ie.css', null).'?version='.LACONICA_VERSION.'" /><![endif]');
foreach (array(6,7) as $ver) {
if (file_exists(theme_file('ie'.$ver.'.css'))) {
// Yes, IE people should be put in jail.
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index ffa8bedea..45176a201 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -9,7 +9,6 @@ margin-top:3px;
height:16px;
text-align:right;
text-indent:0;
-color:#fff;
width:24px;
}
diff --git a/theme/base/css/ie7.css b/theme/base/css/ie7.css
deleted file mode 100644
index a6ee001e2..000000000
--- a/theme/base/css/ie7.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/* IE7 specific styles */
-
-#form_notice textarea {
-width:370px;
-}
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 5c394533e..beb5a2c13 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -40,12 +40,12 @@ input.submit,
#nav_register a,
.form_settings .form_note,
.entity_remote_subscribe {
-background-color:#A9BF4F;
+background-color:#9BB43E;
}
input:focus, textarea:focus, select:focus,
#form_notice.warning #notice_data-text {
-border-color:#A9BF4F;
+border-color:#9BB43E;
}
input.submit,
#nav_register a,
@@ -69,7 +69,7 @@ border-top-color:#CEE1E9;
}
.section .notice,
.section .profile {
-border-top-color:#97BFD1;
+border-top-color:#87B4C8;
}
@@ -116,7 +116,7 @@ background-color:#fff;
}
#site_nav_local_views a {
-background-color:rgba(151, 191, 209, 0.3);
+background-color:rgba(135, 180, 200, 0.3);
}
#site_nav_local_views a:hover {
background-color:rgba(255, 255, 255, 0.7);
@@ -134,13 +134,13 @@ background-color:#EFF3DC;
#anon_notice {
-background-color:#97BFD1;
+background-color:#87B4C8;
color:#fff;
border-color:#fff;
}
#showstream #anon_notice {
-background-color:#A9BF4F;
+background-color:#9BB43E;
}
@@ -177,12 +177,12 @@ background-color:transparent;
.form_group_leave input.submit
.form_user_subscribe input.submit,
.form_user_unsubscribe input.submit {
-background-color:#A9BF4F;
+background-color:#9BB43E;
color:#fff;
}
.form_user_unsubscribe input.submit,
.form_group_leave input.submit {
-background-color:#97BFD1;
+background-color:#87B4C8;
}
.entity_send-a-message a {
diff --git a/theme/identica/logo.png b/theme/identica/logo.png
index cee36799e..7c68b34f6 100644
--- a/theme/identica/logo.png
+++ b/theme/identica/logo.png
Binary files differ