summaryrefslogtreecommitdiff
path: root/themes
diff options
context:
space:
mode:
Diffstat (limited to 'themes')
-rw-r--r--themes/default/css/fix-ie.css21
-rw-r--r--themes/default/css/screen.css51
-rw-r--r--themes/default/js/ui.init.js3
-rw-r--r--themes/default/views/header.html.php26
4 files changed, 46 insertions, 55 deletions
diff --git a/themes/default/css/fix-ie.css b/themes/default/css/fix-ie.css
index d071abac..c7c1ebad 100644
--- a/themes/default/css/fix-ie.css
+++ b/themes/default/css/fix-ie.css
@@ -1,26 +1,17 @@
/**
* Fix display in IE 6, 7
*/
-#gHeader,
-#gSiteMenu,
+
+#gBanner,
.gBreadcrumbs,
#gAlbumGrid,
#gPager,
-#gViewMenu {
+#gViewMenu {
zoom: 1;
}
-#gHeader #gLogo img {
- margin-top: 5px;
- margin-bottom: 0;
-}
-
-#gHeader #gSiteMenu {
- margin-top: 28px;
-}
-
-#gHeader #gQuickSearchForm {
- margin-bottom: 0;
+#gBanner {
+ z-index: 2;
}
input.submit {
@@ -47,4 +38,4 @@ input.submit {
.gQuickPane {
height: 32px !important;
-}
+} \ No newline at end of file
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 88631e81..c5a9956d 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -131,7 +131,7 @@ fieldset {
padding-bottom: .8em;
}
-#gHeader fieldset,
+#gBanner fieldset,
#gSidebar fieldset,
.gShortForm fieldset {
border: none;
@@ -142,7 +142,7 @@ legend {
margin-left: 1em;
}
-#gHeader legend,
+#gBanner legend,
#gSidebar legend,
#gContent #gSearchForm legend,
input[type="hidden"],
@@ -387,16 +387,21 @@ form .gError,
/* Layout containers ~~~~~~~~~~~~~~~~~~~~~ */
#gHeader {
+ margin-bottom: 1em;
+}
+
+#gBanner {
background-color: #e8e8e8;
- border-bottom: 1px solid #fff;
+ border-bottom: 1px solid #ccc;
font-size: .8em;
- margin-bottom: 1em;
- padding: 1em 20px 0 20px;
+ padding: 1em 20px;
+ position: relative;
}
#gContent {
font-size: 1.2em;
padding-left: 20px;
+ position: relative;
width: 696px;
}
@@ -421,18 +426,17 @@ form .gError,
/* Header ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-#gHeader #gLogo img {
- float: left;
- margin: -4px 10px 0 0;
+#gBanner #gLogo img {
+ margin: 0;
}
-#gHeader #gQuickSearchForm {
+#gBanner #gQuickSearchForm {
clear: right;
float: right;
- margin: 1em 0;
+ margin-top: 1em;
}
-#gHeader #gQuickSearchForm input[type='text'] {
+#gBanner #gQuickSearchForm input[type='text'] {
width: 17em;
}
@@ -535,12 +539,12 @@ form .gError,
/* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */
-#gHeader #gLoginMenu li,
+#gBanner #gLoginMenu li,
#gFooter #gCredits li {
display: inline;
}
-#gHeader #gLoginMenu li {
+#gBanner #gLoginMenu li {
padding-left: 1.2em;
}
@@ -558,14 +562,13 @@ form .gError,
*********************************************************************/
#gSiteMenu,
-.gBreadcrumbs,
#gTagCloud ul {
font-size: 1.2em;
}
/* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-#gHeader #gLoginMenu {
+#gBanner #gLoginMenu {
color: #999;
float: right;
}
@@ -573,13 +576,14 @@ form .gError,
/* Site Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
#gSiteMenu {
- float: left;
- margin-top: 20px;
- padding: 0 20px 0 0;
+ bottom: 0;
+ display: none;
+ left: 140px;
+ position: absolute;
}
#gSiteMenu ul {
- margin-bottom: 0;
+ margin-bottom: 0 !important;
}
/* Thumb Menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -641,11 +645,7 @@ form .gError,
/* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
.gBreadcrumbs {
- background-color: #fff;
- border-top: 1px solid #ccc;
- clear: both;
- margin: 0 -20px;
- padding-left: 20px;
+ padding: 0 20px;
}
.gBreadcrumbs li {
@@ -763,9 +763,7 @@ form .gError,
* 6) Browser hacks
*********************************************************************/
-#gSiteMenu:after,
#gHeader:after,
-.gBreadcrumbs:after,
#gAlbumGrid:after,
.gPager:after,
#gViewMenu:after {
@@ -823,7 +821,6 @@ form .gError,
.ui-widget-overlay {
background: #000;
opacity: .7;
- filter: Alpha(Opacity=70);
}
#gDialog {
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 92a42ded..11cd06ed 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -57,6 +57,9 @@ $(document).ready(function() {
if ($("#gAlbumGrid").length) {
// Vertical align thumbnails/metadata in album grid
$(".gItem").vAlign();
+ $(".gQuick").ajaxStop(function(){
+ $(".gItem").vAlign();
+ });
}
// Photo/Item item view only
diff --git a/themes/default/views/header.html.php b/themes/default/views/header.html.php
index c903edf5..2ba1e923 100644
--- a/themes/default/views/header.html.php
+++ b/themes/default/views/header.html.php
@@ -1,19 +1,19 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
-<?= $theme->header_top() ?>
-<? if ($header_text = module::get_var("gallery", "header_text")): ?>
-<?= $header_text ?>
-<? else: ?>
-<a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery home") ?>">
- <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site") ?>" src="<?= $theme->url("images/logo.png") ?>" />
-</a>
-<? endif ?>
-
-<div id="gSiteMenu" style="display: none">
-<?= $theme->site_menu() ?>
+<div id="gBanner">
+ <?= $theme->header_top() ?>
+ <? if ($header_text = module::get_var("gallery", "header_text")): ?>
+ <?= $header_text ?>
+ <? else: ?>
+ <a id="gLogo" href="<?= url::site("albums/1") ?>" title="<?= t("go back to the Gallery home") ?>">
+ <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site") ?>" src="<?= $theme->url("images/logo.png") ?>" />
+ </a>
+ <? endif ?>
+ <div id="gSiteMenu">
+ <?= $theme->site_menu() ?>
+ </div>
+ <?= $theme->header_bottom() ?>
</div>
-<?= $theme->header_bottom() ?>
-
<? if (!empty($parents)): ?>
<ul class="gBreadcrumbs">
<? foreach ($parents as $parent): ?>