diff options
author | vdigital <vdigital@piwigo.org> | 2007-02-17 10:38:21 +0000 |
---|---|---|
committer | vdigital <vdigital@piwigo.org> | 2007-02-17 10:38:21 +0000 |
commit | 273ea4de5cddb65c475cd1fa40e94d02fd06e427 (patch) | |
tree | b0142db20eb3859986cca579da7824de128ccac4 | |
parent | 856f707fe60d64b0e7a6a8748ed847f72284287c (diff) |
Some css changes to reach CSS3 Conformity (even not official)
(New): mozilla family hacks are all in a not-ie.css
(New): HTTP Upload has been moved (enhanced visibility).
git-svn-id: http://piwigo.org/svn/trunk@1832 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r-- | template/yoga/content.css | 1 | ||||
-rw-r--r-- | template/yoga/header.tpl | 3 | ||||
-rw-r--r-- | template/yoga/menubar.css | 1 | ||||
-rw-r--r-- | template/yoga/menubar.tpl | 10 | ||||
-rw-r--r-- | template/yoga/not-ie.css | 19 | ||||
-rw-r--r-- | template/yoga/theme/clear/theme.css | 1 | ||||
-rw-r--r-- | template/yoga/theme/dark/theme.css | 1 | ||||
-rw-r--r-- | template/yoga/theme/p0w0/theme.css | 1 | ||||
-rw-r--r-- | template/yoga/theme/wipi/theme.css | 1 | ||||
-rw-r--r-- | template/yoga/thumbnails.css | 3 |
10 files changed, 31 insertions, 10 deletions
diff --git a/template/yoga/content.css b/template/yoga/content.css index 6b61ea72c..3c75585cd 100644 --- a/template/yoga/content.css +++ b/template/yoga/content.css @@ -88,7 +88,6 @@ UL.categoryActions { #content DIV#comments { padding-left: 5px; padding-right: 5px; - -moz-box-sizing: padding-box; } #content DIV.comment { margin: 0 0 0.5em 0; diff --git a/template/yoga/header.tpl b/template/yoga/header.tpl index 7fd63dada..fed04fb48 100644 --- a/template/yoga/header.tpl +++ b/template/yoga/header.tpl @@ -37,6 +37,9 @@ the "text/nonsense" prevents gecko based browsers to load it --> <!--[if gt IE 6]> <link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/fix-ie7.css"> <![endif]--> +<!--[if !IE]> <--> + <link rel="stylesheet" href="{pwg_root}template/{themeconf:template}/not-ie.css" type="text/css"> +<!--> <![endif]--> <link rel="stylesheet" type="text/css" media="print" href="{pwg_root}template/{themeconf:template}/print.css"> <link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/default-colors.css"> <link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/theme/{themeconf:theme}/theme.css"> diff --git a/template/yoga/menubar.css b/template/yoga/menubar.css index 712a25f68..6e40eb4eb 100644 --- a/template/yoga/menubar.css +++ b/template/yoga/menubar.css @@ -112,7 +112,6 @@ FORM#quickconnect LABEL { FORM#quickconnect LABEL { margin:0; width: 100%; - -moz-box-sizing: padding-box; /* FIXME in a specific css file for FF */ box-sizing: border-box; /* CSS3 */ } diff --git a/template/yoga/menubar.tpl b/template/yoga/menubar.tpl index 603733fa2..9dde24af7 100644 --- a/template/yoga/menubar.tpl +++ b/template/yoga/menubar.tpl @@ -32,8 +32,14 @@ <dt><a href="{U_CATEGORIES}">{lang:Categories}</a></dt> <dd> {MENU_CATEGORIES_CONTENT} + <!-- BEGIN upload --> + <ul><li> + <a href="{upload.U_UPLOAD}">{lang:upload_picture}</a> + </li></ul> + <!-- END upload --> <p class="totalImages">{NB_PICTURE} {lang:total}</p> </dd> + </dl> <!-- BEGIN tags --> @@ -81,9 +87,7 @@ <!-- BEGIN summary --> <li><a href="{summary.U_SUMMARY}" title="{summary.TITLE}" {summary.REL}>{summary.NAME}</a></li> <!-- END summary --> - <!-- BEGIN upload --> - <li><a href="{upload.U_UPLOAD}">{lang:upload_picture}</a></li> - <!-- END upload --> + </ul> </dd> </dl> diff --git a/template/yoga/not-ie.css b/template/yoga/not-ie.css new file mode 100644 index 000000000..ede96708f --- /dev/null +++ b/template/yoga/not-ie.css @@ -0,0 +1,19 @@ +/* $Id$ */
+
+/* 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 */
+}
+#content DIV#comments {
+ padding-left: 5px;
+ padding-right: 5px;
+ -moz-box-sizing: padding-box !important;
+}
+FORM#quickconnect LABEL {
+ margin:0;
+ width: 100%;
+ -moz-box-sizing: padding-box !important;
+ box-sizing: border-box; /* CSS3 */
+}
diff --git a/template/yoga/theme/clear/theme.css b/template/yoga/theme/clear/theme.css index c537d6a05..32b0cabe2 100644 --- a/template/yoga/theme/clear/theme.css +++ b/template/yoga/theme/clear/theme.css @@ -46,7 +46,6 @@ FIELDSET, INPUT, SELECT, TEXTAREA, #content UL.thumbnails SPAN.wrap2 { border: 1px solid #aaaaaa; /* thumbnails border color and style */ - -moz-border-radius: 4px; /* round corners with Geko */ border-radius: 4px 4px; /* round corners with CSS3 compliant browsers */ } diff --git a/template/yoga/theme/dark/theme.css b/template/yoga/theme/dark/theme.css index a2d8145b5..2401e4e27 100644 --- a/template/yoga/theme/dark/theme.css +++ b/template/yoga/theme/dark/theme.css @@ -79,7 +79,6 @@ FIELDSET, INPUT, SELECT, TEXTAREA, #content UL.thumbnails SPAN.wrap2 { border: 1px solid #aaaaaa; /* thumbnails border color and style */ - -moz-border-radius: 4px; /* round corners with Geko */ border-radius: 4px 4px; /* round corners with CSS3 compliant browsers */ } diff --git a/template/yoga/theme/p0w0/theme.css b/template/yoga/theme/p0w0/theme.css index 2a21f9085..ef2798c95 100644 --- a/template/yoga/theme/p0w0/theme.css +++ b/template/yoga/theme/p0w0/theme.css @@ -213,7 +213,6 @@ FIELDSET, INPUT, SELECT, TEXTAREA, } #content UL.thumbnails SPAN.wrap2 { border: 1px solid #69c; /* thumbnails border color and style */ - -moz-border-radius: 4px; /* round corners with Geko */ border-radius: 4px 4px; /* round corners with CSS3 compliant browsers */ } #content UL.thumbnails SPAN.wrap2:hover { diff --git a/template/yoga/theme/wipi/theme.css b/template/yoga/theme/wipi/theme.css index 62274a8f0..2277b73a7 100644 --- a/template/yoga/theme/wipi/theme.css +++ b/template/yoga/theme/wipi/theme.css @@ -189,7 +189,6 @@ FIELDSET, INPUT, SELECT, TEXTAREA, #content UL.thumbnails SPAN.wrap2 {
border: 1px solid #aaaaaa; /* thumbnails border color and style */
- -moz-border-radius: 4px; /* round corners with Geko */
border-radius: 4px 4px; /* round corners with CSS3 compliant browsers */
}
diff --git a/template/yoga/thumbnails.css b/template/yoga/thumbnails.css index 854a10dda..0fb01ed8e 100644 --- a/template/yoga/thumbnails.css +++ b/template/yoga/thumbnails.css @@ -17,7 +17,8 @@ #content UL.thumbnails SPAN.wrap1 { margin: 0 5px 5px 5px; - display: table-cell; display: inline-table; display: inline-block; + display: table-cell; /* display: inline-table; + /* display: inline-block; /* Why 3 display option ??? */ vertical-align: top; /* OK with Opera and IE6 not Geko */ text-align: center; /* to center the thumbnail and legend in Geko/Opera */ } |