From 2a6e5d0a436dfb8c2dd6816ee2ee2e1532e46e9c Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Tue, 15 Jun 2010 04:11:33 +0000
Subject: merge r6531 from trunk to branch 2.1 moved content of not-ie.css (1
 rule) into theme.css and obsoleted not-ie.css

git-svn-id: http://piwigo.org/svn/branches/2.1@6532 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 themes/clear/theme.css        | 1 -
 themes/dark/theme.css         | 1 -
 themes/default/local_head.tpl | 3 ---
 themes/default/not-ie.css     | 8 --------
 themes/default/theme.css      | 3 +++
 5 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 themes/default/not-ie.css

diff --git a/themes/clear/theme.css b/themes/clear/theme.css
index c407e95de..a39317853 100644
--- a/themes/clear/theme.css
+++ b/themes/clear/theme.css
@@ -38,7 +38,6 @@ FIELDSET, INPUT, SELECT, TEXTAREA,
 
 .content UL.thumbnails SPAN.wrap2 {
   border: 1px solid #aaaaaa;	/* thumbnails border color and style */
-  border-radius: 4px 4px;	/* round corners with CSS3 compliant browsers */
 }
 
 .content UL.thumbnails SPAN.wrap2:hover,
diff --git a/themes/dark/theme.css b/themes/dark/theme.css
index eea9562cb..49ba57ce9 100644
--- a/themes/dark/theme.css
+++ b/themes/dark/theme.css
@@ -53,7 +53,6 @@ FIELDSET, INPUT, SELECT, TEXTAREA,
 
 .content UL.thumbnails SPAN.wrap2 {
 	border: 1px solid #aaaaaa;	/* thumbnails border color and style */
-	border-radius: 4px 4px;	/* round corners with CSS3 compliant browsers */
 }
 
 .content UL.thumbnails SPAN.wrap2:hover,
diff --git a/themes/default/local_head.tpl b/themes/default/local_head.tpl
index 80241b851..49d8ca78c 100644
--- a/themes/default/local_head.tpl
+++ b/themes/default/local_head.tpl
@@ -6,7 +6,4 @@
 <!--[if IE 7]>
 	<link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/default/fix-ie7.css">
 <![endif]-->
-<!--[if !IE]> <-->
-	<link rel="stylesheet" href="{$ROOT_URL}themes/default/not-ie.css" type="text/css">
-<!--> <![endif]-->
 <link rel="stylesheet" type="text/css" media="print" href="{$ROOT_URL}themes/default/print.css">
diff --git a/themes/default/not-ie.css b/themes/default/not-ie.css
deleted file mode 100644
index c5bd7adef..000000000
--- a/themes/default/not-ie.css
+++ /dev/null
@@ -1,8 +0,0 @@
-
-/* All directives not supported by IE */
-/* can be overiden in any theme but not hidden to IE */
-
-.content UL.thumbnails SPAN.wrap2 {
-  -moz-border-radius: 4px;	/* round corners with Geko */
-  -webkit-border-radius: 4px; /* Safari webkit project */
-}
diff --git a/themes/default/theme.css b/themes/default/theme.css
index 48f1c3089..a7fa56b83 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -317,6 +317,9 @@ DIV#comments DIV.description {
 	margin: 0;			/* important reset the margins */
 	display: table-cell;/* block prevents vertical-align here */
 	vertical-align: middle;/* Ok with Opera and Geko not IE6 */
+	border-radius: 4px 4px;	/* round corners with CSS3 compliant browsers */
+	-moz-border-radius: 4px;	/* round corners with Geko */
+	-webkit-border-radius: 4px; /* Safari webkit project */
 }
 .content UL.thumbnails SPAN.wrap2 A,
 .content UL.thumbnails LABEL {
-- 
cgit v1.2.3