summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcarl <>2006-01-18 15:29:37 +0000
committercarl <>2006-01-18 15:29:37 +0000
commit4c6a3b64d51a409107afefe9993ea0d83b962fa0 (patch)
tree30b3b4c56d0b15ab523ec598f1e092b7ecfa813e
parent2c5382ca838f4cb93b2aba9fa1b07296e8f9ce9e (diff)
QuickStart: Fixed div overlapping bug in headers
-rw-r--r--.gitattributes2
-rw-r--r--demos/quickstart/protected/controls/Layout.tpl3
-rw-r--r--demos/quickstart/protected/controls/SampleLayout.tpl3
-rw-r--r--demos/quickstart/themes/PradoSoft/mantis.jpgbin0 -> 12567 bytes
-rw-r--r--demos/quickstart/themes/PradoSoft/mantissample.jpgbin0 -> 16309 bytes
-rw-r--r--demos/quickstart/themes/PradoSoft/style.css44
6 files changed, 43 insertions, 9 deletions
diff --git a/.gitattributes b/.gitattributes
index a407c172..e316fe93 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -117,7 +117,9 @@ demos/quickstart/protected/pages/ViewSource.page -text
demos/quickstart/protected/pages/ViewSource.php -text
demos/quickstart/protected/pages/config.xml -text
demos/quickstart/themes/PradoSoft/arrowdown.gif -text
+demos/quickstart/themes/PradoSoft/mantis.jpg -text
demos/quickstart/themes/PradoSoft/mantisbg.jpg -text
+demos/quickstart/themes/PradoSoft/mantissample.jpg -text
demos/quickstart/themes/PradoSoft/pradologo.gif -text
demos/quickstart/themes/PradoSoft/style.css -text
demos/quickstart/themes/Simple/style.css -text
diff --git a/demos/quickstart/protected/controls/Layout.tpl b/demos/quickstart/protected/controls/Layout.tpl
index 0ad47cce..ac5f84d0 100644
--- a/demos/quickstart/protected/controls/Layout.tpl
+++ b/demos/quickstart/protected/controls/Layout.tpl
@@ -8,7 +8,8 @@
<body>
<com:TForm>
<div id="header">
-Prado QuickStart Tutorial
+<div class="title">Prado QuickStart Tutorial</div>
+<div class="image"></div>
</div>
<div id="menu">
diff --git a/demos/quickstart/protected/controls/SampleLayout.tpl b/demos/quickstart/protected/controls/SampleLayout.tpl
index 46d1d928..5564e832 100644
--- a/demos/quickstart/protected/controls/SampleLayout.tpl
+++ b/demos/quickstart/protected/controls/SampleLayout.tpl
@@ -12,7 +12,8 @@
<div class="title">
<a href="?">PRADO QuickStart Tutorial</a> Sample
-</div>
+</div>
+<div class="image"></div>
</div>
<div class="samplemenu">
diff --git a/demos/quickstart/themes/PradoSoft/mantis.jpg b/demos/quickstart/themes/PradoSoft/mantis.jpg
new file mode 100644
index 00000000..44bdcded
--- /dev/null
+++ b/demos/quickstart/themes/PradoSoft/mantis.jpg
Binary files differ
diff --git a/demos/quickstart/themes/PradoSoft/mantissample.jpg b/demos/quickstart/themes/PradoSoft/mantissample.jpg
new file mode 100644
index 00000000..c31aeaaf
--- /dev/null
+++ b/demos/quickstart/themes/PradoSoft/mantissample.jpg
Binary files differ
diff --git a/demos/quickstart/themes/PradoSoft/style.css b/demos/quickstart/themes/PradoSoft/style.css
index f137624b..bd4a4aee 100644
--- a/demos/quickstart/themes/PradoSoft/style.css
+++ b/demos/quickstart/themes/PradoSoft/style.css
@@ -34,12 +34,28 @@ a
font-weight:bold;
text-align: right;
color: #666;
- height:70px;
+ height:100px;
background-image: url('pradologo.gif');
background-repeat: no-repeat;
- padding-right: 150px;
- padding-top: 30px;
-}
+}
+
+#header div.title
+{
+ display: none;
+}
+
+#header div.image
+{
+ display: block;
+ float: right;
+ width: 757px;
+ height: 100px;
+ background-image: url('mantis.jpg');
+ background-repeat: no-repeat;
+ background-position: top right;
+}
+
+
#menu {
padding:10px;
@@ -200,11 +216,25 @@ tt {
font-weight:bold;
text-align: right;
color: #666;
- height:70px;
+ height:100px;
background-image: url('pradologo.gif');
background-repeat: no-repeat;
- padding-right: 150px;
- padding-top: 30px;
+}
+
+.sampleheader div.title
+{
+ display: none;
+}
+
+.sampleheader div.image
+{
+ display: block;
+ float: right;
+ width: 900px;
+ height: 100px;
+ background-image: url('mantissample.jpg');
+ background-repeat: no-repeat;
+ background-position: top right;
}
.samplemenu