[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.6-363-g6b029b7
Thomas Sibley
trs at bestpractical.com
Mon Dec 6 15:01:03 EST 2010
The branch, 3.9-trunk has been updated
via 6b029b71232932722b59f7b8d8380604094639f7 (commit)
via 460622e6daf0efc1e2cfbb34d5783159f376f50f (commit)
from 7caefcbb211b43b281f766476187dc8b8027c4aa (commit)
Summary of changes:
share/html/Admin/Global/Theme.html | 16 ++++++----------
share/html/Elements/Header | 2 +-
share/html/NoAuth/css/aileron/nav.css | 4 ++++
share/html/NoAuth/css/base/theme-editor.css | 2 +-
share/html/NoAuth/css/web2/nav.css | 4 ++++
5 files changed, 16 insertions(+), 12 deletions(-)
- Log -----------------------------------------------------------------
commit 460622e6daf0efc1e2cfbb34d5783159f376f50f
Author: Thomas Sibley <trs at bestpractical.com>
Date: Mon Dec 6 13:57:02 2010 -0500
Remove a stray console.log() from debugging
diff --git a/share/html/Admin/Global/Theme.html b/share/html/Admin/Global/Theme.html
index 7f0d73a..8b080c9 100644
--- a/share/html/Admin/Global/Theme.html
+++ b/share/html/Admin/Global/Theme.html
@@ -145,7 +145,6 @@ jQuery(function($) {
var selector = (applying[name]).replace(specials, "\\$1");
//var rule = new RegExp('\\b'+selector+'\\s*\{.*?\}');
var rule = new RegExp('^'+selector+'\\s*\{.*?\}', "m");
- console.log(rule);
var newcss = "background: " + bg;
/* Don't set the text color on <body> as it affects too much */
commit 6b029b71232932722b59f7b8d8380604094639f7
Author: Thomas Sibley <trs at bestpractical.com>
Date: Mon Dec 6 14:58:04 2010 -0500
Fix the header selectors so it doesn't get the wrong nav on web2
This simplifies the background color setting by making the menus
transparent in the standard CSS and uses a newly added theme class on
<body> to only apply certain styles to Aileron.
Closes [rt3 #16160].
diff --git a/share/html/Admin/Global/Theme.html b/share/html/Admin/Global/Theme.html
index 8b080c9..1bb52c7 100644
--- a/share/html/Admin/Global/Theme.html
+++ b/share/html/Admin/Global/Theme.html
@@ -99,7 +99,7 @@
<h2>Custom CSS (Advanced)</h2>
<form method="POST">
- <textarea rows=20 id="user_css" name="user_css"><% $user_css %></textarea><br />
+ <textarea rows=20 id="user_css" name="user_css" wrap="off"><% $user_css %></textarea><br />
<input id="try" type="button" class="button" value="Try" />
<input id="reset" type="reset" value="Reset" type="submit" />
<input name="reset_css" value="Reset to default RT Theme" type="submit" />
@@ -110,7 +110,7 @@
<script type="text/javascript">
var section_css_mapping = {
'Page': ['body'],
- 'Header': ['div#quickbar', '#main-navigation #app-nav > li', '#main-navigation #app-nav > li > a'],
+ 'Header': ['div#quickbar', 'body.aileron #main-navigation #app-nav > li, body.aileron #main-navigation #app-nav > li > a, #prefs-menu > li, #prefs-menu > li > a, #logo .rtname'],
'Page title': ['div#header h1'],
'Page content': ['div#body'],
'Buttons': ['input[type="reset"], input[type="submit"], input[class="button"]'],
@@ -143,7 +143,6 @@ jQuery(function($) {
var specials = new RegExp("([.*+?|()\\[\\]{}\\\\])", "g");
for (var name in applying) {
var selector = (applying[name]).replace(specials, "\\$1");
- //var rule = new RegExp('\\b'+selector+'\\s*\{.*?\}');
var rule = new RegExp('^'+selector+'\\s*\{.*?\}', "m");
var newcss = "background: " + bg;
@@ -159,11 +158,10 @@ jQuery(function($) {
if (applying[name].match(/#header/))
newcss = "color: " + bg;
- /* Navigation wants border color too */
- if (applying[name].match(/#app-nav > li > a/))
- newcss += "; border-color: " + fg;
+ /* Nav doesn't need a background, but it wants text color */
+ if (applying[name].match(/#main-navigation/))
+ newcss = "color: " + fg;
- //css = css.replace(rule, applying[name]+" { "+newcss+" }");
css = css.replace(rule, applying[name]+" { "+newcss+" }");
}
}
@@ -242,8 +240,7 @@ body {}
/* Header */
div#quickbar {}
-#main-navigation #app-nav > li {}
-#main-navigation #app-nav > li > a {}
+body.aileron #main-navigation #app-nav > li, body.aileron #main-navigation #app-nav > li > a, #prefs-menu > li, #prefs-menu > li > a, #logo .rtname {}
/* Page title */
div#header h1 {}
diff --git a/share/html/Elements/Header b/share/html/Elements/Header
index 71e936c..c0e8605 100755
--- a/share/html/Elements/Header
+++ b/share/html/Elements/Header
@@ -80,7 +80,7 @@
% $m->callback( %ARGS, CallbackName => 'Head' );
</head>
- <body<% $id && qq[ id="comp-$id"] |n %>>
+ <body class="<% lc RT->Config->Get('WebDefaultStylesheet', $session{'CurrentUser'}) %>" <% $id && qq[id="comp-$id"] |n %>>
% if ($ShowBar) {
<& /Elements/Logo, %ARGS &>
diff --git a/share/html/NoAuth/css/aileron/nav.css b/share/html/NoAuth/css/aileron/nav.css
index 120d9ce..d9c4e93 100644
--- a/share/html/NoAuth/css/aileron/nav.css
+++ b/share/html/NoAuth/css/aileron/nav.css
@@ -93,6 +93,10 @@
border-left: none;
}
+#main-navigation #app-nav > li, #main-navigation #app-nav > li > a {
+ background-color: transparent;
+}
+
#page-navigation {
position: absolute;
top: 7.2em;
diff --git a/share/html/NoAuth/css/base/theme-editor.css b/share/html/NoAuth/css/base/theme-editor.css
index d7054ca..28dd570 100644
--- a/share/html/NoAuth/css/base/theme-editor.css
+++ b/share/html/NoAuth/css/base/theme-editor.css
@@ -63,7 +63,7 @@
}
#custom-css {
- float: right;
+ float: left;
width: 48%;
}
diff --git a/share/html/NoAuth/css/web2/nav.css b/share/html/NoAuth/css/web2/nav.css
index 2e1b299..ba6d751 100644
--- a/share/html/NoAuth/css/web2/nav.css
+++ b/share/html/NoAuth/css/web2/nav.css
@@ -74,6 +74,10 @@
top: -1px;
}
+#prefs-menu > li, #prefs-menu > li > a {
+ background-color: transparent;
+}
+
#prefs-menu.sf-menu a,
#prefs-menu .sf-menu a
{
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list