aboutsummaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2007-09-13 23:30:46 +0000
committerrvelices <rv-github@modusoptimus.com>2007-09-13 23:30:46 +0000
commit08aa93a93b8fdb94c767bdd118f260f826ad9326 (patch)
tree834118c6c1c5091894e5bd37e5d45a56f1f72482 /template
parent98c804aba2dae42e0f3685990a9f505176102f08 (diff)
- merge content of layout.css and popuphelp.css (very few lines) into existing css -> faster page loading the first time (avoid 2 http requests)
- optimized sql for $conf['display_fromto'] in category_cats.inc.php git-svn-id: http://piwigo.org/svn/trunk@2091 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--template-common/layout.css7
-rw-r--r--template/yoga/default-layout.css35
-rw-r--r--template/yoga/layout.css5
-rw-r--r--template/yoga/popuphelp.css22
4 files changed, 29 insertions, 40 deletions
diff --git a/template-common/layout.css b/template-common/layout.css
deleted file mode 100644
index 31b9b4784..000000000
--- a/template-common/layout.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/* $Id$ */
-
-/* template css */
-@import "default-layout.css";
-/* 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 2b43bc5bc..010b914ab 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -215,11 +215,6 @@ FORM.properties SPAN.property {
padding: 0;
}
-BODY#thePopuphelpPage #copyright {
- color: green;
- display: none;
-}
-
FORM#addComment FIELDSET LABEL {
clear: both;
}
@@ -252,7 +247,7 @@ UL.tagSelection LI {
}
#fullTagCloud {
- font-size: 140%;
+ font-size: 120%;
text-align: justify;
padding: 0;
margin: 1em 2em 1em 2em;
@@ -263,12 +258,34 @@ UL.tagSelection LI {
white-space: nowrap;
}
-#content #fullTagCloud {
- font-size: 120%;
-}
.tagLevel5 { font-size: 150%; }
.tagLevel4 { font-size: 140%; }
.tagLevel3 { font-size: 120%; }
.tagLevel2 { font-size: 100%; }
.tagLevel1 { font-size: 90%; }
+
+
+/* Popup help page */
+BODY#thePopuphelpPage #copyright {
+ display: none;
+}
+
+BODY#thePopuphelpPage #theHeader P {
+ display: none;
+}
+
+BODY#thePopuphelpPage #content P {
+ text-align: justify;
+ padding: 0.5em;
+}
+
+BODY#thePopuphelpPage #content OL LI,
+BODY#thePopuphelpPage #content UL LI
+{
+ margin-bottom: 0.5em;
+}
+
+BODY#thePopuphelpPage P#pageBottomActions A {
+ border: none;
+}
diff --git a/template/yoga/layout.css b/template/yoga/layout.css
index fdc3ca664..348ea2f4c 100644
--- a/template/yoga/layout.css
+++ b/template/yoga/layout.css
@@ -5,10 +5,11 @@
@import "content.css";
@import "thumbnails.css";
@import "picture.css";
-@import "popuphelp.css";
@import "default-layout.css";
/* Override properties with import local file */
@import "local-layout.css";
/* common css */
-@import "../../template-common/layout.css";
+@import "../../template-common/default-layout.css";
+/* Override properties with import local file */
+@import "../../template-common/local-layout.css";
diff --git a/template/yoga/popuphelp.css b/template/yoga/popuphelp.css
deleted file mode 100644
index b61b7952d..000000000
--- a/template/yoga/popuphelp.css
+++ /dev/null
@@ -1,22 +0,0 @@
-BODY#thePopuphelpPage #copyright {
- display: none;
-}
-
-BODY#thePopuphelpPage #theHeader P {
- display: none;
-}
-
-BODY#thePopuphelpPage #content P {
- text-align: justify;
- padding: 0.5em;
-}
-
-BODY#thePopuphelpPage #content OL LI,
-BODY#thePopuphelpPage #content UL LI
-{
- margin-bottom: 0.5em;
-}
-
-BODY#thePopuphelpPage P#pageBottomActions A {
- border: none;
-}