Updating branch refs/heads/master
to 2b74099909a1238ec0cb48778fb1c3fdc866fec2 (commit)
from fe8f0e7e8eb01c28632229d0a99c402c54baf015 (commit)
commit 2b74099909a1238ec0cb48778fb1c3fdc866fec2
Author: Nick Schermer <n...@xfce.org>
Date: Fri Feb 24 17:39:39 2012 +0100
Update template headers.
lib/tpl/docs/_xfceheader.css | 82 +++++++++++++-----------------------
lib/tpl/docs/main.php | 2 -
lib/tpl/docs/xfceheader.js | 38 -----------------
lib/tpl/xfce/_xfceheader.css | 37 +++++++++--------
lib/tpl/xfce/images/logosmall.png | Bin 7035 -> 4288 bytes
5 files changed, 50 insertions(+), 109 deletions(-)
diff --git a/lib/tpl/docs/_xfceheader.css b/lib/tpl/docs/_xfceheader.css
index 79d977a..e59b27a 100644
--- a/lib/tpl/docs/_xfceheader.css
+++ b/lib/tpl/docs/_xfceheader.css
@@ -1,67 +1,45 @@
-body {
- background-color: #eee;
- margin: 0;
- font-family: 'Helvetica Neue Light', HelveticaNeue-Light, 'Helvetica Neue',
Helvetica, Arial, sans-serif;
- font-size: 14px;
-}
+/* this file is used in various xfce subdomains! */
+
#xfce-header {
- position: absolute;
- color: #fff;
- left: 0;
- top: 0;
- width: 100%;
- background-color: #333;
- z-index: 1000;
- box-shadow: 0 0 8px rgba(0, 0, 0, 0.5);
- background: #333 url('images/logosmall.png') no-repeat 3px 50%;
-}
-#xfce-header h1, #xfce-header h4 {
- display: none;
-}
-#xfce-header div {
- margin-left: 100px;
-}
-#xfce-header.slide {
- transition: top 0.2s linear;
- transition-delay: 0.2s;
- -moz-transition: top 0.2s linear;
- -moz-transition-delay: 0.2s;
- -webkit-transition: top 0.2s linear;
- -webkit-transition-delay: 0.2s;
- -o-transition: top 0.2s linear;
- -o-transition-delay: 0.2s;
+ background: #333 url('img/logosmall.png') no-repeat 3px 50%;
+ padding-left: 75px;
+ box-shadow: 0 0 8px rgba(0, 0, 0, 0.5);
+
+ font-family: 'Helvetica Neue Light', HelveticaNeue-Light, 'Helvetica
Neue', Helvetica, Arial, sans-serif;
+ font-size: 14px;
}
#xfce-header ul {
- list-style: none;
- float: right;
- margin: 5px;
- padding: 0;
- line-height: 25px;
+ list-style: none;
+ float: right;
+ margin: 5px;
+ padding: 0;
}
#xfce-header ul li {
- float: left;
+ float: left;
}
#xfce-header a {
- color: #999;
- text-decoration: none;
- display: block;
- padding: 0 8px 0 8px;
-
- transition: color 0.2s linear;
- -moz-transition: color 0.2s linear;
- -webkit-transition: color 0.2s linear;
- -o-transition: color 0.2s linear;
+ color: #999;
+ text-decoration: none;
+ display: block;
+ padding: 0 8px 0 8px;
+ border: 0; /* for transifex */
+ line-height: 25px;
+
+ transition: color 0.2s linear;
+ -moz-transition: color 0.2s linear;
+ -webkit-transition: color 0.2s linear;
+ -o-transition: color 0.2s linear;
}
#xfce-header ul li a:hover {
- color: #fff;
- text-decoration: underline;
+ color: #fff;
+ text-decoration: underline;
}
#xfce-header .active {
- color: #fff;
+ color: #fff;
}
#xfce-header-clear {
- clear: both;
+ clear: both;
}
-#xfce-header-spacer {
- height: 35px; /* initial size, javascript corrects this */
+#xfce-header-title, #xfce-header-subtitle {
+ display: none;
}
diff --git a/lib/tpl/docs/main.php b/lib/tpl/docs/main.php
index f09d48a..ac8a29f 100644
--- a/lib/tpl/docs/main.php
+++ b/lib/tpl/docs/main.php
@@ -28,7 +28,6 @@ if (!defined('DOKU_INC')) die();
[<?php echo strip_tags($conf['title'])?>]
</title>
<?php tpl_metaheaders()?>
- <script type="text/javascript" src="/lib/tpl/docs/xfceheader.js"></script>
</head>
<body>
@@ -51,7 +50,6 @@ if (!defined('DOKU_INC')) die();
</div>
<div id="xfce-header-clear"></div>
</div>
-<div id="xfce-header-spacer"></div>
<?php html_msgarea()?>
<div class="header">
diff --git a/lib/tpl/docs/xfceheader.js b/lib/tpl/docs/xfceheader.js
deleted file mode 100644
index 19a0ffe..0000000
--- a/lib/tpl/docs/xfceheader.js
+++ /dev/null
@@ -1,38 +0,0 @@
-function slide(h) {
- if (typeof (window.pageYOffset) == 'number')
- o = window.pageYOffset;
- else if (document.body && document.body.scrollTop)
- o = document.body.scrollTop;
- else if (document.documentElement
- && document.documentElement.scrollTop)
- o = document.documentElement.scrollTop;
- else
- o = 0;
-
- var min_offset = h.clientHeight - 5;
- if (o > min_offset)
- o = min_offset;
-
- h.className = '';
- h.style.top = -o + "px";
-
- return o;
-}
-window.onload = function (e) {
- var h = document.getElementById('xfce-header');
- var o = slide (h);
-
- h.style.position = 'fixed';
- document.getElementById('xfce-header-spacer').style.height = h.clientHeight
+ 'px';
-
- window.onscroll = function (e) {
- o = slide (h);
- }
- h.onmouseover = function (e) {
- h.style.top = '0px';
- h.className = 'slide';
- }
- h.onmouseout = function (e) {
- h.style.top = -o + 'px';
- }
-}
diff --git a/lib/tpl/xfce/_xfceheader.css b/lib/tpl/xfce/_xfceheader.css
index b98a94b..e59b27a 100644
--- a/lib/tpl/xfce/_xfceheader.css
+++ b/lib/tpl/xfce/_xfceheader.css
@@ -1,38 +1,41 @@
/* this file is used in various xfce subdomains! */
#xfce-header {
- /*border-bottom: 2px #69f solid;*/
- background: #333 url('images/logosmall.png') no-repeat 6px 55%;
- padding-left: 120px;
- min-height: 45px;
+ background: #333 url('img/logosmall.png') no-repeat 3px 50%;
+ padding-left: 75px;
box-shadow: 0 0 8px rgba(0, 0, 0, 0.5);
+
+ font-family: 'Helvetica Neue Light', HelveticaNeue-Light, 'Helvetica
Neue', Helvetica, Arial, sans-serif;
+ font-size: 14px;
}
#xfce-header ul {
- float: right;
list-style: none;
- margin: 0;
- padding: 0 10px 0 0;
- background: #333;
+ float: right;
+ margin: 5px;
+ padding: 0;
}
#xfce-header ul li {
float: left;
- font-weight: bold;
- margin: 0;
}
#xfce-header a {
- color: #fff;
+ color: #999;
text-decoration: none;
display: block;
- float: right;
- padding: 0 10px 0 10px;
- line-height: 4em;
- border: 0;
+ padding: 0 8px 0 8px;
+ border: 0; /* for transifex */
+ line-height: 25px;
+
+ transition: color 0.2s linear;
+ -moz-transition: color 0.2s linear;
+ -webkit-transition: color 0.2s linear;
+ -o-transition: color 0.2s linear;
}
#xfce-header ul li a:hover {
- color: #69f;
+ color: #fff;
+ text-decoration: underline;
}
#xfce-header .active {
- color: #69f;
+ color: #fff;
}
#xfce-header-clear {
clear: both;
diff --git a/lib/tpl/xfce/images/logosmall.png
b/lib/tpl/xfce/images/logosmall.png
index 8b3a50c..5900c10 100644
Binary files a/lib/tpl/xfce/images/logosmall.png and
b/lib/tpl/xfce/images/logosmall.png differ
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
