diff options
| author | rub <rub@piwigo.org> | 2006-04-09 13:57:51 +0000 |
|---|---|---|
| committer | rub <rub@piwigo.org> | 2006-04-09 13:57:51 +0000 |
| commit | 9fe82e13467bd435bd97223ef4c295b075fcab78 (patch) | |
| tree | 8d932a2866d25ff923b73a6eb81b09c9add8ee81 | |
| parent | 5f59abd73749cc578bf5ab6836cb3203c7a0c62b (diff) | |
Issue ID 310:
o Fix css file order
o Add example
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1141 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | template-common/default-layout.css | 3 | ||||
| -rw-r--r-- | template/yoga/default-layout.css | 11 | ||||
| -rw-r--r-- | template/yoga/header.tpl | 2 | ||||
| -rw-r--r-- | tools/local-layout.css | 4 |
4 files changed, 5 insertions, 15 deletions
diff --git a/template-common/default-layout.css b/template-common/default-layout.css index 87ef74fb2..8f284e6eb 100644 --- a/template-common/default-layout.css +++ b/template-common/default-layout.css @@ -40,6 +40,3 @@ BODY#theAdminPage #content { #content UL.thumbnails SPAN.thumbLegend { display: block; /* display: none; if you don't want legend */ } - -/* Override properties with import local file */ -@import "local-layout.css"; diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css index bcbfe81f2..f42cfc1a7 100644 --- a/template/yoga/default-layout.css +++ b/template/yoga/default-layout.css @@ -1,14 +1,3 @@ - -/* template css */ -@import "menubar.css"; -@import "content.css"; -@import "image.css"; -@import "popuphelp.css"; -/* Override properties with import local file */ -@import "local-layout.css"; -/* common css */ -@import "../../template-common/default-layout.css"; - /* $Id$ */ /* * { padding: 0 !important; margin: 0 !important; } */ diff --git a/template/yoga/header.tpl b/template/yoga/header.tpl index 4a34929b3..48b187e6d 100644 --- a/template/yoga/header.tpl +++ b/template/yoga/header.tpl @@ -4,7 +4,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset={CONTENT_ENCODING}"> <link rel="shortcut icon" type="image/x-icon" href="{pwg_root}template-common/favicon.ico"> -<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/default-layout.css"> +<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/layout.css"> <!-- the next css is used to fix khtml (Konqueror/Safari) issue the "text/nonsense" prevents gecko based browsers to load it --> <link rel="stylesheet" type="text/nonsense" href="{pwg_root}template/{themeconf:template}/fix-khtml.css"> diff --git a/tools/local-layout.css b/tools/local-layout.css index 2471e13de..16dcf14d7 100644 --- a/tools/local-layout.css +++ b/tools/local-layout.css @@ -4,3 +4,7 @@ BODY { background-attachment:fixed; } +#content UL.thumbnails SPAN.wrap2 { + height: 200px; /* max thumbnail height + 2px */ +} + |