From 9fe82e13467bd435bd97223ef4c295b075fcab78 Mon Sep 17 00:00:00 2001 From: rub Date: Sun, 9 Apr 2006 13:57:51 +0000 Subject: [PATCH] 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 --- template-common/default-layout.css | 3 --- template/yoga/default-layout.css | 11 ----------- template/yoga/header.tpl | 2 +- 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 @@ - + 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 */ +} +