summaryrefslogtreecommitdiff
path: root/rt/share/html
diff options
context:
space:
mode:
authorivan <ivan>2010-05-25 11:41:16 +0000
committerivan <ivan>2010-05-25 11:41:16 +0000
commit9e409d3a45beb56ac070e3e3056e020a2494684d (patch)
tree162c3bd250e6e5f97264d9ac5e7362fefe5c9b75 /rt/share/html
parent707609b707f3aeca79d1bd0c025861b1cdc1fd4f (diff)
merge in web2 changes from 3.8.7 to 3.8.8
Diffstat (limited to 'rt/share/html')
-rw-r--r--rt/share/html/NoAuth/css/freeside2.1/base.css7
-rw-r--r--rt/share/html/NoAuth/css/freeside2.1/boxes.css8
-rw-r--r--rt/share/html/NoAuth/css/freeside2.1/collection.css52
-rw-r--r--rt/share/html/NoAuth/css/freeside2.1/main.css1
-rw-r--r--rt/share/html/NoAuth/css/freeside2.1/misc.css27
-rw-r--r--rt/share/html/NoAuth/css/freeside2.1/msie.css7
-rw-r--r--rt/share/html/NoAuth/css/freeside2.1/portlets.css6
7 files changed, 73 insertions, 35 deletions
diff --git a/rt/share/html/NoAuth/css/freeside2.1/base.css b/rt/share/html/NoAuth/css/freeside2.1/base.css
index b98253af9..a38854fb5 100644
--- a/rt/share/html/NoAuth/css/freeside2.1/base.css
+++ b/rt/share/html/NoAuth/css/freeside2.1/base.css
@@ -45,13 +45,6 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-.hide { display: none; }
-.clear { display: none;}
-
-
-
-
-
a {
color: #000;
text-decoration: none;
diff --git a/rt/share/html/NoAuth/css/freeside2.1/boxes.css b/rt/share/html/NoAuth/css/freeside2.1/boxes.css
index 0f2f20c2b..fbd9af108 100644
--- a/rt/share/html/NoAuth/css/freeside2.1/boxes.css
+++ b/rt/share/html/NoAuth/css/freeside2.1/boxes.css
@@ -160,10 +160,6 @@
}
-.hidden {
- display: none;
-}
-
.titlebox .titlebox-title .widget a {
display: block;
margin: 0;
@@ -190,3 +186,7 @@
.titlebox.rolled-up .titlebox-title .widget a {
background-image: url(<%RT->Config->Get('WebPath')%>/NoAuth/images/css/rolldown-arrow.gif);
}
+
+.titlebox hr.clear {
+ display: none;
+}
diff --git a/rt/share/html/NoAuth/css/freeside2.1/collection.css b/rt/share/html/NoAuth/css/freeside2.1/collection.css
new file mode 100644
index 000000000..cbc8cefd7
--- /dev/null
+++ b/rt/share/html/NoAuth/css/freeside2.1/collection.css
@@ -0,0 +1,52 @@
+%# BEGIN BPS TAGGED BLOCK {{{
+%#
+%# COPYRIGHT:
+%#
+%# This software is Copyright (c) 1996-2009 Best Practical Solutions, LLC
+%# <jesse@bestpractical.com>
+%#
+%# (Except where explicitly superseded by other copyright notices)
+%#
+%#
+%# LICENSE:
+%#
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%#
+%# This work is distributed in the hope that it will be useful, but
+%# WITHOUT ANY WARRANTY; without even the implied warranty of
+%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+%# General Public License for more details.
+%#
+%# You should have received a copy of the GNU General Public License
+%# along with this program; if not, write to the Free Software
+%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+%# 02110-1301 or visit their web page on the internet at
+%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
+%#
+%#
+%# CONTRIBUTION SUBMISSION POLICY:
+%#
+%# (The following paragraph is not intended to limit the rights granted
+%# to you to modify and distribute this software under the terms of
+%# the GNU General Public License and is only of importance to you if
+%# you choose to contribute your changes and enhancements to the
+%# community by submitting them to Best Practical Solutions, LLC.)
+%#
+%# By intentionally submitting any modifications, corrections or
+%# derivatives to this work, or any other work intended for use with
+%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+%# you are the copyright holder for those contributions and you grant
+%# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable,
+%# royalty-free, perpetual, license to use, copy, create derivative
+%# works based on those contributions, and sublicense and distribute
+%# those contributions and any derivatives thereof.
+%#
+%# END BPS TAGGED BLOCK }}}
+
+table.collection td:first-child, table.collection th:first-child {
+ padding-left: 1em;
+}
+
diff --git a/rt/share/html/NoAuth/css/freeside2.1/main.css b/rt/share/html/NoAuth/css/freeside2.1/main.css
index 09b7f4ba2..69e7f44e2 100644
--- a/rt/share/html/NoAuth/css/freeside2.1/main.css
+++ b/rt/share/html/NoAuth/css/freeside2.1/main.css
@@ -62,6 +62,7 @@
@import "ticket.css";
@import "tools.css";
@import "admin.css";
+@import "collection.css";
@import "misc.css";
@import "freeside.css";
diff --git a/rt/share/html/NoAuth/css/freeside2.1/misc.css b/rt/share/html/NoAuth/css/freeside2.1/misc.css
index eef5f4876..80d7ce0b4 100644
--- a/rt/share/html/NoAuth/css/freeside2.1/misc.css
+++ b/rt/share/html/NoAuth/css/freeside2.1/misc.css
@@ -45,6 +45,9 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
+
+@import "../base/misc.css";
+
#body.calpopup {
margin-left: 1em;
margin-top: 1em;
@@ -71,29 +74,6 @@
font-size: 1.5em;
}
-div.autocomplete {
- position: absolute;
- background-color: white;
- border: 1px solid #888;
- margin: 0px;
- padding: 0px;
-}
-div.autocomplete ul {
- list-style-type: none;
- margin: 0px;
- padding: 0px;
-}
-div.autocomplete ul li.selected {
- background-color: #0088cc;
- color: #eee;
-}
-div.autocomplete ul li {
- list-style-type: none;
- display: block;
- margin: 0;
- padding: 2px;
-}
-
.comment {
padding-left: 0.5em;
color: #999;
@@ -105,4 +85,3 @@ div.autocomplete ul li {
margin-top: 1em;
overflow: auto;
}
-
diff --git a/rt/share/html/NoAuth/css/freeside2.1/msie.css b/rt/share/html/NoAuth/css/freeside2.1/msie.css
index 184ac1df5..2297c304a 100644
--- a/rt/share/html/NoAuth/css/freeside2.1/msie.css
+++ b/rt/share/html/NoAuth/css/freeside2.1/msie.css
@@ -237,3 +237,10 @@ table.queue-summary td, td.collection-as-table {
#pick-criteria td.operator {
width: 7.5em;
}
+
+.plain-text-white-space {
+ word-wrap: break-word; /* Internet Explorer 5.5+ */
+ white-space: pre; /* IE only hack to re-specify in addition to
+ word-wrap */
+}
+
diff --git a/rt/share/html/NoAuth/css/freeside2.1/portlets.css b/rt/share/html/NoAuth/css/freeside2.1/portlets.css
index 947f49db2..d96d5a9f0 100644
--- a/rt/share/html/NoAuth/css/freeside2.1/portlets.css
+++ b/rt/share/html/NoAuth/css/freeside2.1/portlets.css
@@ -63,3 +63,9 @@ table.dashboard {
}
+.reminders blockquote {
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
+ margin-left: 1em;
+ margin-right: 1em;
+}