Cross-browser stuff

5 files changed, 67 insertions, 5 deletions

diff --git a/lib/action.php b/lib/action.php
index c463c8459..9cd2d5a18 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -134,6 +134,8 @@ class Action extends HTMLOutputter // lawsuit
                                      'type' => 'text/css',
                                      'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION,
                                      '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]');
         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/display.css b/theme/base/css/display.css
index 5a52780fc..06860e30d 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -52,7 +52,9 @@ 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;
@@ -88,7 +90,9 @@ border:0;
 #page_notice .error,
 #page_notice .success {
 padding:4px 7px;
+border-radius:4px;
 -moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
 form label.submit {
 display:none;
@@ -175,7 +179,9 @@ margin-left:0;
 
 
 .form_settings .form_note {
+border-radius:4px;
 -moz-border-radius:4px;
+-webkit-border-radius:4px;
 padding:0 7px;
 }
 
@@ -206,6 +212,7 @@ margin-bottom:29px;
 
 #site_nav_global_primary {
 float:right;
+margin-right:18px;
 }
 #site_nav_global_primary ul li {
 display:inline;
@@ -236,8 +243,8 @@ margin-bottom:18px;
 
 #footer {
 float:left;
-width:68%;
-padding-bottom:11px;
+width:64%;
+padding:18px;
 }
 
 
@@ -260,6 +267,8 @@ text-decoration:none;
 padding:4px 11px;
 -moz-border-radius-topleft:4px;
 -moz-border-radius-topright:4px;
+-webkit-border-top-left-radius:4px;
+-webkit-border-top-right-radius:4px;
 border-width:1px;
 border-style:solid;
 border-bottom:0;
@@ -328,8 +337,8 @@ margin-bottom:11px;
 line-height:1.5;
 }
 
-
-#site_content_license_cc p {
+#site_content_license_cc {
+margin-bottom:0;
 }
 #site_content_license_cc img {
 display:inline;
@@ -357,12 +366,17 @@ margin-bottom:1em;
 width:644px;
 padding:18px;
 float:left;
+border-radius:7px;
 -moz-border-radius:7px;
 -moz-border-radius-topleft:0;
+-webkit-border-radius:7px;
+-webkit-border-top-left-radius:0;
 }
 
 #content_inner {
 position:relative;
+width:100%;
+float;left;
 }
 
 #aside_primary {
@@ -370,7 +384,9 @@ width:300px;
 float:left;
 margin-left:2px;
 padding:18px 4px 18px 18px;
+border-radius:7px;
 -moz-border-radius:7px;
+-webkit-border-radius:7px;
 }
 
 
@@ -393,8 +409,11 @@ padding:0;
 display:none;
 }
 #form_notice textarea {
--moz-border-radius:4px;
+border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
 width:377px;
+width:370px;
 height:86px;
 line-height:1.5;
 padding:7px 7px 14px 7px;
@@ -680,7 +699,9 @@ list-style-type:none;
 #notices_primary {
 float:left;
 width:644px;
+border-radius:7px;
 -moz-border-radius:7px;
+-webkit-border-radius:7px;
 }
 #notices_primary h2 {
 display:none;
@@ -919,11 +940,13 @@ border-bottom:0;
 
 .pagination .nav_prev a {
 -moz-border-radius-topright:7px;
+-webkit-border-top-right-radius:7px;
 padding-left:20px;
 border-left:0;
 }
 .pagination .nav_next a {
 -moz-border-radius-topleft:7px;
+-webkit-border-top-left-radius:7px;
 padding-right:20px;
 border-right:0;
 }
@@ -1138,7 +1161,9 @@ height:109px;
 border-width:1px;
 border-style:dotted;
 text-decoration:none;
+border-radius:7px;
 -moz-border-radius:7px;
+-webkit-border-radius:7px;
 padding:7px;
 font-size:1.6em;
 font-weight:bold;
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
new file mode 100644
index 000000000..ef64da953
--- /dev/null
+++ b/theme/base/css/ie.css
@@ -0,0 +1,26 @@
+/* IE specific styles */
+
+#aside_primary {
+padding-left:11px;
+}
+.notice-options form input.submit {
+font-size:0;
+margin-top:3px;
+height:16px;
+text-align:right;
+text-indent:0;
+color:#fff;
+width:24px;
+}
+
+input.checkbox {
+top:0;
+}
+
+legend {
+margin-left:-7px;
+}
+
+.notice div.entry-content .timestamp a {
+display:inline;
+}
\ No newline at end of file
diff --git a/theme/base/css/ie7.css b/theme/base/css/ie7.css
new file mode 100644
index 000000000..a6e2548ab
--- /dev/null
+++ b/theme/base/css/ie7.css
@@ -0,0 +1,5 @@
+/* IE7 specific styles */
+
+#form_notice textarea {
+width:370px;
+} 
\ No newline at end of file
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 8a1130387..eb7b47a12 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -30,11 +30,15 @@ background-color:#ddd;
 }
 .notice p.entry-content a:visited {
 background-color:#fcfcfc;
+border-radius:4px;
 -moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
 .notice p.entry-content .vcard a {
 background-color:#fcfffc;
+border-radius:4px;
 -moz-border-radius:4px;
+-webkit-border-radius:4px;
 }