summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--admin/admin_themes_manager.php1
-rw-r--r--base.css56
-rw-r--r--css_lib.php13
-rw-r--r--templates/admin_themes_manager.tpl8
-rw-r--r--templates/header_inc.tpl6
5 files changed, 51 insertions, 33 deletions
diff --git a/admin/admin_themes_manager.php b/admin/admin_themes_manager.php
index 04ccaf1..86a984f 100644
--- a/admin/admin_themes_manager.php
+++ b/admin/admin_themes_manager.php
@@ -21,6 +21,7 @@ if( $processForm ) {
$pref_toggles = array(
"disable_jstabs",
+ "disable_fat",
);
foreach ($pref_toggles as $toggle) {
diff --git a/base.css b/base.css
index c6be541..620c7cf 100644
--- a/base.css
+++ b/base.css
@@ -1,10 +1,10 @@
-/* $Header: /cvsroot/bitweaver/_bit_themes/Attic/base.css,v 1.5 2005/09/03 10:21:46 squareing Exp $ */
+/* $Header: /cvsroot/bitweaver/_bit_themes/Attic/base.css,v 1.6 2005/10/12 15:13:55 spiderr Exp $ */
/* essential and basic css settings */
body {background:#fff; margin:0; padding:0;}
table {border-collapse:collapse; border-spacing:0; padding:0; margin:0; width:100%;}
pre, code {font-family:monospace; font-size:12px; overflow:auto; text-align:left;}
#tikilayouttable {width:100%; padding:0; margin:0;}
-#bitleft {vertical-align:top; width:170px;}
+#bitleft {vertical-align:top; width:170px; overflow:hidden;}
#bitright {vertical-align:top; width:170px;}
#tikimain {vertical-align:top;}
#tikibottom {font:10px verdana,sans-serif; color:#999; text-align:center; clear:both;}
@@ -20,12 +20,16 @@ pre, code {font-family:monospace; font-size:12px; overflow:auto; text-align:le
.highlight {font-weight:bolder;}
a.create {font-style:italic}
a.skip {position:absolute; top:0; left:-999em;}
-a.skip:active, a.skip:focus {left:0em;}
+a.skip:active,
+a.skip:focus {left:0em;}
+a img {border:0;}
.quicktag {margin:1px;}
.selected {font-weight:bolder}
.floaticon {float:right;}
span.actionicon {float:right;}
td.actionicon {text-align:right;}
+.actionicon a,
+.floaticon a {padding:0 3px;}
.navbar,.comment,.footer {clear:both;}
.date,.footer,.pagination,small {color:#999;}
.panelsubmitrow {text-align:center;}
@@ -37,8 +41,8 @@ form,input,textarea,select{margin:0; padding:0;}
form {display:inline;}
textarea {width:100%;}
.row {clear:both;}
-.formlabel {float:left; width:20%; text-align:right;}
-.forminput {margin-left:21%;}
+.formlabel {float:left; width:14em; text-align:right;}
+.forminput {margin-left:14.5em;}
.formhelp {cursor:help;}
.closebutton {position:absolute; top:1px; right:1px;}
.submit {text-align:center; padding-bottom:10px;}
@@ -56,18 +60,6 @@ textarea {width:100%;}
/* annoyances and grievances */
.module textarea {width:auto;}
.comment .content {overflow:auto;}
-#bitleft .shoutbox,
-#bitright .shoutbox {width:160px; overflow:hidden;}
-html>body #bitleft .shoutbox,
-html>body #bitright .shoutbox {width:auto;}
- /* tabs */
-.tabsystem .tabcontainer {margin:0; padding:0; border:0; clear:both;}
-.tabsystem .tabcontainer ul,
-.tabsystem .tabcontainer li {margin:0; padding:0; border:0; list-style-type:none; display:inline;}
-.tabsystem .tabcontainer .tab,
-.tabsystem .tabcontainer .tab-active {position:relative; display:inline; float:left; z-index:1; white-space:nowrap;}
-.tabsystem .tabpage {clear:both;}
-h4 {margin:0; padding:0;}
/* lists */
ul,ol,dl {margin-top:0; margin-bottom:0;}
.module ol,.module ul,.menu ul {margin:0; padding:0}
@@ -84,12 +76,19 @@ li.error,li.success,li.note,li.warning {list-style:none;}
ul.toc li {list-style:none;}
li.treenode {list-style:none; clear:both; border-top:1px solid #999;}
ul.tree {margin:0;padding-left:20px;}
+ /* structures */
+.structurebar {clear:both;}
+.structurebar .path {display:block;}
+.gallerybar .path {display:block;}
+.navigation span {display:block; width:50%; float:left;}
+.navigation .right {text-align:right;}
/* css driven dropdown menus - horizontal */
-#nav,#nav a,#nav li,#nav ul {z-index:10000000;}
-.hor,.hor a,.hor li,.hor ul {z-index:100000;}
+#nav,#nav a,#nav li ul {z-index:10000;}
+.hor,.hor a,.hor li ul {z-index:1000;}
+.ver,.ver a,.ver li ul {z-index:1000;}
.hor,.hor ul {padding:0; margin:0; list-style:none;}
-.hor a {white-space:no-wrap; display:block;}
+.hor a {white-space:nowrap; display:block;}
.hor li {width:auto;}
.hor li li,.hor li ul {width:13em; display:block; text-align:left;}/*padding:0; margin:0; */
.hor .head {width:auto; padding:0 0.5em;}
@@ -99,7 +98,6 @@ ul.tree {margin:0;padding-left:20px;}
.hor .icon {position:absolute; left:28px; top:2px; vertical-align:middle; margin-left:-26px;}
.hor li li a {margin:0 0 0 2em;}
/* css driven dropdown menus - vertical */
-.ver,.ver a,.ver li,.ver ul {z-index:100000;}
.ver, .ver ul {padding:0; margin:0; list-style:none; float:left; width:13em;}
.ver li {position:relative;}
.ver li li {position:relative; float:left; width:13em;}
@@ -113,12 +111,14 @@ ul.tree {margin:0;padding-left:20px;}
.ver li:hover ul, .ver li li:hover ul, .ver li li li:hover ul, .ver li.ieHover ul, .ver li li.ieHover ul, .ver li li li.ieHover ul {left:auto;}
/* Support for MSIE select box hiding part of suckerfish */
.hor iframe,.ver iframe {position:absolute; left:0; top:0; z-index:-1; filter:progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0);}
- /* structures */
-.structurebar {clear:both;}
-.structurebar .path {display:block;}
-.gallerybar .path {display:block;}
-.navigation span {display:block; width:50%; float:left;}
-.navigation .right {text-align:right;}
+ /* tabs */
+.tabsystem .tabcontainer {margin:0; padding:0; border:0; clear:both;}
+.tabsystem .tabcontainer ul,
+.tabsystem .tabcontainer li {margin:0; padding:0; border:0; list-style-type:none; display:inline;}
+.tabsystem .tabcontainer .tab,
+.tabsystem .tabcontainer .tab-active {position:relative; display:inline; float:left; z-index:1; white-space:nowrap;}
+.tabsystem .tabpage {clear:both;}
+h4 {margin:0; padding:0;}
/* these settings are still in motion... */
a.external {background:transparent url("icons/external_link.png") no-repeat right; padding-right:1.3em;}
@@ -126,3 +126,5 @@ a.external {background:transparent url("icons/external_link.png") no-repeat r
.stickies textarea,.stickies input[type='text'] {background:#ffc;}
.stickynote .boxtitle {border-bottom: 1px solid #dda;}
.stickynote {background-color:#ffc; width:300px; padding:3px;}
+.phpbb a:hover img {border:none}
+.phpbb img {border:none}
diff --git a/css_lib.php b/css_lib.php
index b46e1a1..0f78006 100644
--- a/css_lib.php
+++ b/css_lib.php
@@ -120,7 +120,7 @@ class cssLib extends BitBase {
return $back;
}
-
+
// Load CSS2 styled file (@import aware)
//
// TODO: Will M$ windowz eat '/' as path delimiter?
@@ -135,11 +135,14 @@ class cssLib extends BitBase {
$lines = file($filename);
foreach ($lines as $line) {
- if (preg_match_all("/@import.*[\'|\"](.*)[\'|\"].*;/U", $line, $importfiles, PREG_SET_ORDER)) {
+ if (preg_match_all("/@import.*\([\'|\" ]*(.*)[\'|\" ]*\).*;/U", $line, $importfiles, PREG_SET_ORDER)) {
foreach ($importfiles as $file) {
- $import = $path.'/'.$file[1];
- $data .= $this->load_css2_file($import);
- $line = str_replace($file[0], "", $line);
+ $fileName = trim( $file[1] );
+ if( $fileName != '../../base.css' ) {
+ $import = $path.'/'.$fileName;
+ $data .= $this->load_css2_file($import);
+ $line = str_replace($file[0], "", $line);
+ }
}
}
diff --git a/templates/admin_themes_manager.tpl b/templates/admin_themes_manager.tpl
index bda984e..522302c 100644
--- a/templates/admin_themes_manager.tpl
+++ b/templates/admin_themes_manager.tpl
@@ -62,6 +62,14 @@
{/forminput}
</div>
+ <div class="row">
+ {formlabel label="Disable Fading" for="disable_fat"}
+ {forminput}
+ <input type="checkbox" name="disable_fat" value='y' id="disable_fat"{if $gBitSystem->isFeatureActive( 'disable_fat' )} checked="checked"{/if} />
+ {formhelp note="Disable the fading effect used when displaying any success, warning or error messages."}
+ {/forminput}
+ </div>
+
<div class="row submit">
<input type="submit" name="themeTabSubmit" value="{tr}Apply Settings{/tr}" />
</div>
diff --git a/templates/header_inc.tpl b/templates/header_inc.tpl
index 97d63aa..36e8193 100644
--- a/templates/header_inc.tpl
+++ b/templates/header_inc.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_themes/templates/header_inc.tpl,v 1.5 2005/08/11 13:03:48 squareing Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_themes/templates/header_inc.tpl,v 1.6 2005/10/12 15:13:58 spiderr Exp $ *}
{strip}
{if $gBitSystem->mStyles.styleSheet}
<link rel="stylesheet" title="{$style}" type="text/css" href="{$gBitSystem->mStyles.styleSheet}" media="all" />
@@ -16,6 +16,10 @@
{if $gBitSystemPrefs.disable_jstabs ne 'y'}
<script type="text/javascript" src="{$smarty.const.THEMES_PKG_URL}js/tabs/tabpane.js"></script>
{/if}
+
+{if $gBitSystemPrefs.disable_fat ne 'y'}
+ <script type="text/javascript" src="{$smarty.const.THEMES_PKG_URL}js/fat.js"></script>
+{/if}
{/strip}
{if $browserInfo.browser eq 'ie'}
generated by cgit v1.3 (git 2.53.0) at 2026-07-05 17:16:18 +0000