[Rt-commit] rt branch, menuing, updated. rt-3.9.4-360-g4d89768
Jesse Vincent
jesse at bestpractical.com
Wed Nov 3 15:14:22 EDT 2010
The branch, menuing has been updated
via 4d8976872eb90b9d7b53f1bd931d86e03f085abf (commit)
via 7b948168fe1938fb525304a7c25b538a6f6f56a8 (commit)
via ca7d0bd131561eea8477f1d792c1418baa296409 (commit)
via 7f560953d0616b8c8f9eab79a2247c34c79ad462 (commit)
via 440d930e95a3a0a4989d1205ea16b1ff4549af67 (commit)
via 92f36220e0c4d0a767eb5bbc842c2f7655c9769a (commit)
via 416a273e7022857c5c47e5e7ce487dabcc286647 (commit)
via 9208b719ad7f728c81e2e56e851ad1bfc7d09f2d (commit)
via 1b142ed52f3c3c9012c98dede6bac8d7013b52ae (commit)
from 13b3078839b8dd35f2901f7bf6192d4bdc35c4ce (commit)
Summary of changes:
share/html/Elements/PageLayout | 5 -
share/html/NoAuth/css/{web2 => base}/admin.css | 0
.../html/NoAuth/css/{web2 => base}/collection.css | 0
share/html/NoAuth/css/{web2 => base}/forms.css | 0
share/html/NoAuth/css/{web2 => base}/login.css | 0
share/html/NoAuth/css/base/main.css | 15 +++-
share/html/NoAuth/css/{web2 => base}/portlets.css | 7 --
share/html/NoAuth/css/{web2 => base}/tools.css | 0
share/html/NoAuth/css/{web2 => base}/yui-fonts.css | 0
share/html/NoAuth/css/web2/InHeader | 5 +
share/html/NoAuth/css/web2/layout.css | 69 +----------------
share/html/NoAuth/css/web2/main.css | 9 --
share/html/NoAuth/css/web2/nav.css | 79 ++++++++++++++++---
13 files changed, 86 insertions(+), 103 deletions(-)
rename share/html/NoAuth/css/{web2 => base}/admin.css (100%)
rename share/html/NoAuth/css/{web2 => base}/collection.css (100%)
rename share/html/NoAuth/css/{web2 => base}/forms.css (100%)
rename share/html/NoAuth/css/{web2 => base}/login.css (100%)
rename share/html/NoAuth/css/{web2 => base}/portlets.css (94%)
rename share/html/NoAuth/css/{web2 => base}/tools.css (100%)
rename share/html/NoAuth/css/{web2 => base}/yui-fonts.css (100%)
- Log -----------------------------------------------------------------
commit 1b142ed52f3c3c9012c98dede6bac8d7013b52ae
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Nov 3 14:38:28 2010 -0400
move superfishification into the css theme
diff --git a/share/html/Elements/PageLayout b/share/html/Elements/PageLayout
index b85ecb5..d64f467 100755
--- a/share/html/Elements/PageLayout
+++ b/share/html/Elements/PageLayout
@@ -50,11 +50,6 @@
<div id="page-navigation"><& /Elements/Menu, menu => PageMenu(), id => 'page-menu', 'parent_id' => 'page' &></div>
% }
<div id="topactions"><& /Elements/WidgetBar, menu => PageWidgets() &></div>
-<script type="text/javascript">
-jQuery(document).ready(function(){ jQuery("#app-nav").superfish(); });
-jQuery(document).ready(function(){ jQuery("#page-menu").superfish(); });
-jQuery(document).ready(function(){ jQuery("#actions-menu").superfish(); });
-</script>
<div id="body">
% $m->callback( %ARGS, CallbackName => 'BeforeBody' );
% $m->flush_buffer(); # we've got the page laid out, let's flush the buffer;
diff --git a/share/html/NoAuth/css/web2/InHeader b/share/html/NoAuth/css/web2/InHeader
index a305c62..9127892 100644
--- a/share/html/NoAuth/css/web2/InHeader
+++ b/share/html/NoAuth/css/web2/InHeader
@@ -52,3 +52,8 @@
<!--[if lt IE 7]>
<link rel="stylesheet" href="<%RT->Config->Get('WebPath')%>/NoAuth/css/web2/msie6.css" type="text/css" media="all" />
<![endif]-->
+<script type="text/javascript">
+jQuery(document).ready(function(){ jQuery("#app-nav").superfish(); });
+jQuery(document).ready(function(){ jQuery("#page-menu").superfish(); });
+jQuery(document).ready(function(){ jQuery("#actions-menu").superfish(); });
+</script>
commit 9208b719ad7f728c81e2e56e851ad1bfc7d09f2d
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Nov 3 14:42:13 2010 -0400
move base form styles into base css for easier styling; reorder base css
to use included libaries before custom ones
diff --git a/share/html/NoAuth/css/web2/forms.css b/share/html/NoAuth/css/base/forms.css
similarity index 100%
rename from share/html/NoAuth/css/web2/forms.css
rename to share/html/NoAuth/css/base/forms.css
diff --git a/share/html/NoAuth/css/base/main.css b/share/html/NoAuth/css/base/main.css
index 9c63d85..595a740 100644
--- a/share/html/NoAuth/css/base/main.css
+++ b/share/html/NoAuth/css/base/main.css
@@ -48,15 +48,16 @@
% $m->callback(CallbackName => 'Begin');
@import "jquery-ui.css";
+ at import "superfish.css";
+ at import "superfish-navbar.css";
+ at import "superfish-vertical.css";
+ at import "tablesorter.css";
+ at import "forms.css";
@import "misc.css";
@import "ticket-form.css";
@import "rights-editor.css";
@import "theme-editor.css";
@import "ticket.css";
- at import "tablesorter.css";
- at import "superfish.css";
- at import "superfish-navbar.css";
- at import "superfish-vertical.css";
% $m->callback(CallbackName => 'End');
commit 416a273e7022857c5c47e5e7ce487dabcc286647
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Nov 3 14:46:00 2010 -0400
move "not logged in" to the left
diff --git a/share/html/NoAuth/css/web2/layout.css b/share/html/NoAuth/css/web2/layout.css
index e5c4991..0b25c43 100644
--- a/share/html/NoAuth/css/web2/layout.css
+++ b/share/html/NoAuth/css/web2/layout.css
@@ -211,8 +211,8 @@ div#quickbar {
}
div#quick-personal {
- float: right;
- margin-right: 1em;
+ float: left;
+ margin-left: 1em;
}
commit 92f36220e0c4d0a767eb5bbc842c2f7655c9769a
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Nov 3 14:50:06 2010 -0400
moved portlet css to base css class
diff --git a/share/html/NoAuth/css/base/main.css b/share/html/NoAuth/css/base/main.css
index 595a740..9890453 100644
--- a/share/html/NoAuth/css/base/main.css
+++ b/share/html/NoAuth/css/base/main.css
@@ -58,6 +58,7 @@
@import "rights-editor.css";
@import "theme-editor.css";
@import "ticket.css";
+ at import "portlets.css";
% $m->callback(CallbackName => 'End');
diff --git a/share/html/NoAuth/css/web2/portlets.css b/share/html/NoAuth/css/base/portlets.css
similarity index 100%
rename from share/html/NoAuth/css/web2/portlets.css
rename to share/html/NoAuth/css/base/portlets.css
commit 440d930e95a3a0a4989d1205ea16b1ff4549af67
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Nov 3 14:50:17 2010 -0400
removed some obsolete css
diff --git a/share/html/NoAuth/css/base/portlets.css b/share/html/NoAuth/css/base/portlets.css
index d88d74d..ef39f46 100644
--- a/share/html/NoAuth/css/base/portlets.css
+++ b/share/html/NoAuth/css/base/portlets.css
@@ -62,10 +62,3 @@ table.dashboard {
width: 100%;
}
-
-.reminders blockquote {
- margin-top: 0.5em;
- margin-bottom: 0.5em;
- margin-left: 1em;
- margin-right: 1em;
-}
commit 7f560953d0616b8c8f9eab79a2247c34c79ad462
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Nov 3 14:54:25 2010 -0400
further lifting of some style info to the "base" style
diff --git a/share/html/NoAuth/css/web2/admin.css b/share/html/NoAuth/css/base/admin.css
similarity index 100%
rename from share/html/NoAuth/css/web2/admin.css
rename to share/html/NoAuth/css/base/admin.css
diff --git a/share/html/NoAuth/css/base/main.css b/share/html/NoAuth/css/base/main.css
index 9890453..a0ea9ab 100644
--- a/share/html/NoAuth/css/base/main.css
+++ b/share/html/NoAuth/css/base/main.css
@@ -47,6 +47,7 @@
%# END BPS TAGGED BLOCK }}}
% $m->callback(CallbackName => 'Begin');
+ at import "yui-fonts.css";
@import "jquery-ui.css";
@import "superfish.css";
@import "superfish-navbar.css";
@@ -58,7 +59,9 @@
@import "rights-editor.css";
@import "theme-editor.css";
@import "ticket.css";
+ at import "admin.css";
@import "portlets.css";
+ at import "tools.css";
% $m->callback(CallbackName => 'End');
diff --git a/share/html/NoAuth/css/web2/tools.css b/share/html/NoAuth/css/base/tools.css
similarity index 100%
rename from share/html/NoAuth/css/web2/tools.css
rename to share/html/NoAuth/css/base/tools.css
diff --git a/share/html/NoAuth/css/web2/yui-fonts.css b/share/html/NoAuth/css/base/yui-fonts.css
similarity index 100%
rename from share/html/NoAuth/css/web2/yui-fonts.css
rename to share/html/NoAuth/css/base/yui-fonts.css
diff --git a/share/html/NoAuth/css/web2/main.css b/share/html/NoAuth/css/web2/main.css
index 16fce4c..5ae6dfe 100644
--- a/share/html/NoAuth/css/web2/main.css
+++ b/share/html/NoAuth/css/web2/main.css
@@ -49,21 +49,16 @@
@import "../base/main.css";
- at import "yui-fonts.css";
@import "base.css";
@import "layout.css";
@import "nav.css";
- at import "forms.css";
@import "boxes.css";
@import "login.css";
@import "ticket-lists.css";
@import "ticket-search.css";
- at import "portlets.css";
@import "ticket.css";
- at import "tools.css";
- at import "admin.css";
@import "collection.css";
@import "misc.css";
commit ca7d0bd131561eea8477f1d792c1418baa296409
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Nov 3 15:05:11 2010 -0400
move login css out to the base style
diff --git a/share/html/NoAuth/css/web2/login.css b/share/html/NoAuth/css/base/login.css
similarity index 100%
rename from share/html/NoAuth/css/web2/login.css
rename to share/html/NoAuth/css/base/login.css
diff --git a/share/html/NoAuth/css/base/main.css b/share/html/NoAuth/css/base/main.css
index a0ea9ab..2afd9f5 100644
--- a/share/html/NoAuth/css/base/main.css
+++ b/share/html/NoAuth/css/base/main.css
@@ -62,6 +62,7 @@
@import "admin.css";
@import "portlets.css";
@import "tools.css";
+ at import "login.css";
% $m->callback(CallbackName => 'End');
diff --git a/share/html/NoAuth/css/web2/main.css b/share/html/NoAuth/css/web2/main.css
index 5ae6dfe..24f44a8 100644
--- a/share/html/NoAuth/css/web2/main.css
+++ b/share/html/NoAuth/css/web2/main.css
@@ -50,12 +50,9 @@
@import "../base/main.css";
@import "base.css";
-
@import "layout.css";
@import "nav.css";
@import "boxes.css";
-
- at import "login.css";
@import "ticket-lists.css";
@import "ticket-search.css";
@import "ticket.css";
commit 7b948168fe1938fb525304a7c25b538a6f6f56a8
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Nov 3 15:08:41 2010 -0400
move navigation widgets to the main nav css stylings rather than the
layout style
diff --git a/share/html/NoAuth/css/web2/layout.css b/share/html/NoAuth/css/web2/layout.css
index 0b25c43..c589bd9 100644
--- a/share/html/NoAuth/css/web2/layout.css
+++ b/share/html/NoAuth/css/web2/layout.css
@@ -48,14 +48,10 @@
/* body */
body {
-
-
padding:0;
margin:0;
-
background: #547CCC url(<%RT->Config->Get('WebPath')%>/NoAuth/css/web2/images/background-gradient.png) top left repeat-x ;
font-family: arial, helvetica, sans-serif;
-
color: #000000;
}
@@ -81,75 +77,18 @@ div#body {
}
-#topactions {
- position: absolute;
- background: transparent;
- top: 3.2em;
- right: 0.7em;
- width: auto;
- min-width: 42em;
- font-size: 0.9em;
- z-index: 99;
-}
-
-#topactions form * {
- vertical-align: top;
-}
-
-#topactions button, #topactions select, #topactions input{
- padding-top: 0em;
- padding-bottom: 0em;
- width: 8em;
-
-}
-
-#topactions form {
- display: block;
-
-}
-
-#topactions #GotoTicket, #topactions #CreateTicketInQueue {
- text-align: right;
-
-}
-#topactions #simple-search {
- float: right;
-}
-
-#topactions #simple-search .field{
- margin-left: 1em;
- color: #787;
- }
-
-#topactions #simple-search .field:focus {
- color: #000;
- }
-
-#topactions #GotoTicket {
- text-align: right;
-
-}
-
div#footer {
position: absolute;
right: 0;
- text-align: right;
+ text-align: right;
font-size: 0.9em;
margin-top: 2em;
background: #fff;
margin-bottom: 0;
padding-left: 3em;
padding-right: 1em;
-
-
-
-
-
border-top: 2px solid #aaa;
border-left: 2px solid #aaa;
-
-
-
-moz-border-radius-topleft: 0.5em;
-webkit-border-top-left-radius: 0.5em;
-moz-border-radius-bottomleft: 0.5em;
@@ -157,7 +96,7 @@ div#footer {
}
div#footer #time {
-display: none ;
+ display: none ;
}
div#footer #bpscredits {
diff --git a/share/html/NoAuth/css/web2/nav.css b/share/html/NoAuth/css/web2/nav.css
index 0aa9611..cda72fd 100644
--- a/share/html/NoAuth/css/web2/nav.css
+++ b/share/html/NoAuth/css/web2/nav.css
@@ -45,6 +45,22 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
+.sf-menu {
+ width: 100%;
+}
+
+.sf-menu a {
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
+}
+.sf-menu li:hover {
+ background-color: #fff;
+}
+
+.sf-menu li, .sf-menu li li, .sf-menu li li li {
+ background-color: #eee;
+}
+
#main-navigation {
position: absolute;
top: 0;
@@ -61,26 +77,63 @@
z-index: 9995;
font-size: 0.8em;
}
-.sf-menu {
- width: 100%;
+
+#page-navigation .sf-menu li, #page-navigation .sf-menu li li, #page-navigation .sf-menu li li li {
+ background-color: #fff;
}
-.sf-menu a {
- padding-top: 0.5em;
- padding-bottom: 0.5em;
+#page-navigation .sf-menu a:visited, #page-navigation .sf-menu a {
+ border: none;
}
-.sf-menu li:hover {
- background-color: #fff;
+
+
+#topactions {
+ position: absolute;
+ background: transparent;
+ top: 3.2em;
+ right: 0.7em;
+ width: auto;
+ min-width: 42em;
+ font-size: 0.9em;
+ z-index: 99;
}
-.sf-menu li, .sf-menu li li, .sf-menu li li li {
- background-color: #eee;
+#topactions form * {
+ vertical-align: top;
}
-#page-navigation .sf-menu li, #page-navigation .sf-menu li li, #page-navigation .sf-menu li li li {
- background-color: #fff;
+#topactions button, #topactions select, #topactions input{
+ padding-top: 0em;
+ padding-bottom: 0em;
+ width: 8em;
+
}
-#page-navigation .sf-menu a:visited, #page-navigation .sf-menu a {
- border: none;
+#topactions form {
+ display: block;
+
+}
+
+#topactions #GotoTicket, #topactions #CreateTicketInQueue {
+ text-align: right;
+
+}
+#topactions #simple-search {
+ float: right;
+}
+
+#topactions #simple-search .field{
+ margin-left: 1em;
+ color: #787;
+ }
+
+#topactions #simple-search .field:focus {
+ color: #000;
+ }
+
+#topactions #GotoTicket {
+ text-align: right;
+
}
+
+
commit 4d8976872eb90b9d7b53f1bd931d86e03f085abf
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Nov 3 15:12:11 2010 -0400
lifted collection.css to base style
diff --git a/share/html/NoAuth/css/web2/collection.css b/share/html/NoAuth/css/base/collection.css
similarity index 100%
rename from share/html/NoAuth/css/web2/collection.css
rename to share/html/NoAuth/css/base/collection.css
diff --git a/share/html/NoAuth/css/base/main.css b/share/html/NoAuth/css/base/main.css
index 2afd9f5..7bd5ac8 100644
--- a/share/html/NoAuth/css/base/main.css
+++ b/share/html/NoAuth/css/base/main.css
@@ -53,6 +53,7 @@
@import "superfish-navbar.css";
@import "superfish-vertical.css";
@import "tablesorter.css";
+ at import "collection.css";
@import "forms.css";
@import "misc.css";
@import "ticket-form.css";
diff --git a/share/html/NoAuth/css/web2/main.css b/share/html/NoAuth/css/web2/main.css
index 24f44a8..79b5e50 100644
--- a/share/html/NoAuth/css/web2/main.css
+++ b/share/html/NoAuth/css/web2/main.css
@@ -56,7 +56,6 @@
@import "ticket-lists.css";
@import "ticket-search.css";
@import "ticket.css";
- at import "collection.css";
@import "misc.css";
% $m->callback(CallbackName => 'End');
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list