[Rt-commit] rt branch, 4.2/rudder, updated. rt-4.1.19-4-g60572e4
Jesse Vincent
jesse at bestpractical.com
Wed Aug 7 14:56:29 EDT 2013
The branch, 4.2/rudder has been updated
via 60572e432e7b157c5a5799b0e6ac2336460296a1 (commit)
via ab7eed87b2aa8f37932117ae5fd1a42bc08ac49f (commit)
via 41fa7b5a283b9cc8ed1a0db6ac29fe3165753a76 (commit)
from 61e7290e3eb878f691a56bdd27ff4d79af46a048 (commit)
Summary of changes:
share/html/Elements/Header | 1 -
share/static/css/base/main.css | 1 +
share/static/css/base/print.css | 184 ++++++++++++++++++++++++++++++++++++++++
share/static/css/print.css | 171 -------------------------------------
4 files changed, 185 insertions(+), 172 deletions(-)
create mode 100644 share/static/css/base/print.css
delete mode 100644 share/static/css/print.css
- Log -----------------------------------------------------------------
commit 41fa7b5a283b9cc8ed1a0db6ac29fe3165753a76
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Aug 7 14:18:03 2013 -0400
Move print stylesheet into base style rather than leaving it as an extra http request; use css media type to enable it.
diff --git a/share/html/Elements/Header b/share/html/Elements/Header
index 1c5e80e..fabf345 100644
--- a/share/html/Elements/Header
+++ b/share/html/Elements/Header
@@ -67,7 +67,6 @@
% for my $cssfile ( @css_files ) {
<link rel="stylesheet" href="<%RT->Config->Get('WebPath')%><% $cssfile %>" type="text/css" media="all" />
% }
-<link rel="stylesheet" href="<%RT->Config->Get('WebPath')%>/static/css/print.css" type="text/css" media="print" />
% for (keys %{$LinkRel || {}}) {
<link rel="<% $_ %>" href="<% RT->Config->Get('WebPath') . $LinkRel->{$_} %>" />
diff --git a/share/static/css/base/main.css b/share/static/css/base/main.css
index 7f8f605..1f6a2c4 100644
--- a/share/static/css/base/main.css
+++ b/share/static/css/base/main.css
@@ -25,3 +25,4 @@
@import "history-folding.css";
@import "history.css";
@import "charts.css";
+ at import "print.css";
diff --git a/share/static/css/print.css b/share/static/css/base/print.css
similarity index 99%
rename from share/static/css/print.css
rename to share/static/css/base/print.css
index b3c51b4..12b59e7 100644
--- a/share/static/css/print.css
+++ b/share/static/css/base/print.css
@@ -1,3 +1,5 @@
+ at media print {
+
* {
float: none;
position: static;
@@ -169,3 +171,5 @@ option[selected] {
font-weight: bold !important;
}
+
+}
commit ab7eed87b2aa8f37932117ae5fd1a42bc08ac49f
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Aug 7 14:19:03 2013 -0400
reindent print stylesheet
diff --git a/share/static/css/base/print.css b/share/static/css/base/print.css
index 12b59e7..1b9b7a8 100644
--- a/share/static/css/base/print.css
+++ b/share/static/css/base/print.css
@@ -1,175 +1,175 @@
@media print {
-
-* {
- float: none;
- position: static;
- background: transparent !important;
- overflow: visible !important;
-}
-
-body {
- margin: 0;
- padding: 0;
- font-size: 10pt;
- background: white !important;
-}
-
-div#body {
- margin: 0;
- margin-top: 0;
- padding: 0;
- border-style: none;
-}
-
-div#header h1 {
- margin-bottom: 1em;
- position: static;
- height: auto;
- width: auto;
- overflow: visible;
- color: black !important;
- padding: 0 !important;
-}
-
-#header {
- padding: 0 !important;
-}
-
-#quickbar,
-#app-nav,
-#page-menu,
-#main-navigation,
-#page-navigation,
-.titlebox-title .widget,
-.titlebox-title .right,
-.ticket-info-links .titlebox-content .create,
-.transaction .metadata .actions,
-.transaction .content .downloadattachment,
-#comp-Search-Results #body .refresh,
-.search-result-actions,
-#comp-Search-Chart .chart-meta,
-#footer,
-#topactions,
-#logo,
-form,
-div.summary + br
-{
- display: none;
-}
-
-/* Hide "Click to load" and "Loading" message. Loaded history is #id > .history */
-#deferred_ticket_history > .titlebox, #delayed_ticket_history > .titlebox {
- display: none;
-}
-
-a:link, a:visited {
- font-weight: bold !important;
-}
-
-div.transaction .metadata .type {
- display: none;
-}
-
-div.titlebox-title .left {
- border: 0 !important;
- color: black !important;
- margin: 0 !important;
- padding-left: 0 !important;
-}
-
-.titlebox.rolled-up .titlebox-title .left:after {
- content: " [-]";
- font-weight: normal;
-}
-
-div.titlebox-content {
- border: 0 !important;
- padding-top: 0.5em !important;
-}
-
-/* outer Ticket Metadata titlebox gets no padding, but inside ones do below */
-.summary .titlebox-content {
- padding: 0 !important;
-}
-
-div.summary .ticket-summary div.titlebox-content {
- padding: 0.5em 1em 1em 1em !important;
-}
-
-div.titlebox-title .left * {
- color: black !important;
-}
-
-div.messagebody a[href]:after {
- text-decoration: underline !important;
- content: " (" attr(href) ") ";
-}
-
-.messagebody {
- orphans: 2;
- widows: 2;
-}
-
-div.titlebox-title {
- page-break-after: avoid;
- border: 0 !important;
-}
-
-.history-container, div.transaction {
- border: 0 !important;
-}
-
-div.transaction {
- page-break-inside: avoid;
-}
-
-/* hide "Ticket metadata" */
-div.summary > div > div.titlebox > div.titlebox-title {
- display: none !important;
-}
-
-.value {
- font-weight: bold !important;
-}
-
-.label, .label a, .labeltop, .labeltop a {
- font-weight: normal !important;
-}
-
-div.titlebox {
- margin-bottom: 0;
-}
-
-/* for web2 and ballard*/
-
-div.titlebox {
- border: 0 !important;
-}
-
-div.history .titlebox-title {
- padding: 0 !important;
- margin: 0 !important;
-}
-
-/* for web2 */
-
-#page-action-menu {
- display: none;
-}
-
-/* form elements */
-input, select, option {
- background: white !important;
- border: 1px solid #666 !important;
-}
-
-option {
- border: none !important;
-}
-
-option[selected] {
- font-weight: bold !important;
-}
-
-
+
+ * {
+ float: none;
+ position: static;
+ background: transparent !important;
+ overflow: visible !important;
+ }
+
+ body {
+ margin: 0;
+ padding: 0;
+ font-size: 10pt;
+ background: white !important;
+ }
+
+ div#body {
+ margin: 0;
+ margin-top: 0;
+ padding: 0;
+ border-style: none;
+ }
+
+ div#header h1 {
+ margin-bottom: 1em;
+ position: static;
+ height: auto;
+ width: auto;
+ overflow: visible;
+ color: black !important;
+ padding: 0 !important;
+ }
+
+ #header {
+ padding: 0 !important;
+ }
+
+ #quickbar,
+ #app-nav,
+ #page-menu,
+ #main-navigation,
+ #page-navigation,
+ .titlebox-title .widget,
+ .titlebox-title .right,
+ .ticket-info-links .titlebox-content .create,
+ .transaction .metadata .actions,
+ .transaction .content .downloadattachment,
+ #comp-Search-Results #body .refresh,
+ .search-result-actions,
+ #comp-Search-Chart .chart-meta,
+ #footer,
+ #topactions,
+ #logo,
+ form,
+ div.summary + br
+ {
+ display: none;
+ }
+
+ /* Hide "Click to load" and "Loading" message. Loaded history is #id > .history */
+ #deferred_ticket_history > .titlebox, #delayed_ticket_history > .titlebox {
+ display: none;
+ }
+
+ a:link, a:visited {
+ font-weight: bold !important;
+ }
+
+ div.transaction .metadata .type {
+ display: none;
+ }
+
+ div.titlebox-title .left {
+ border: 0 !important;
+ color: black !important;
+ margin: 0 !important;
+ padding-left: 0 !important;
+ }
+
+ .titlebox.rolled-up .titlebox-title .left:after {
+ content: " [-]";
+ font-weight: normal;
+ }
+
+ div.titlebox-content {
+ border: 0 !important;
+ padding-top: 0.5em !important;
+ }
+
+ /* outer Ticket Metadata titlebox gets no padding, but inside ones do below */
+ .summary .titlebox-content {
+ padding: 0 !important;
+ }
+
+ div.summary .ticket-summary div.titlebox-content {
+ padding: 0.5em 1em 1em 1em !important;
+ }
+
+ div.titlebox-title .left * {
+ color: black !important;
+ }
+
+ div.messagebody a[href]:after {
+ text-decoration: underline !important;
+ content: " (" attr(href) ") ";
+ }
+
+ .messagebody {
+ orphans: 2;
+ widows: 2;
+ }
+
+ div.titlebox-title {
+ page-break-after: avoid;
+ border: 0 !important;
+ }
+
+ .history-container, div.transaction {
+ border: 0 !important;
+ }
+
+ div.transaction {
+ page-break-inside: avoid;
+ }
+
+ /* hide "Ticket metadata" */
+ div.summary > div > div.titlebox > div.titlebox-title {
+ display: none !important;
+ }
+
+ .value {
+ font-weight: bold !important;
+ }
+
+ .label, .label a, .labeltop, .labeltop a {
+ font-weight: normal !important;
+ }
+
+ div.titlebox {
+ margin-bottom: 0;
+ }
+
+ /* for web2 and ballard*/
+
+ div.titlebox {
+ border: 0 !important;
+ }
+
+ div.history .titlebox-title {
+ padding: 0 !important;
+ margin: 0 !important;
+ }
+
+ /* for web2 */
+
+ #page-action-menu {
+ display: none;
+ }
+
+ /* form elements */
+ input, select, option {
+ background: white !important;
+ border: 1px solid #666 !important;
+ }
+
+ option {
+ border: none !important;
+ }
+
+ option[selected] {
+ font-weight: bold !important;
+ }
+
+
}
commit 60572e432e7b157c5a5799b0e6ac2336460296a1
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Aug 7 14:55:53 2013 -0400
Print stylesheet updates to try to take a slightly lighter hand at tweaking things and still render a bit better
diff --git a/share/static/css/base/print.css b/share/static/css/base/print.css
index 1b9b7a8..ba9b848 100644
--- a/share/static/css/base/print.css
+++ b/share/static/css/base/print.css
@@ -1,9 +1,7 @@
@media print {
* {
- float: none;
position: static;
- background: transparent !important;
overflow: visible !important;
}
@@ -15,15 +13,21 @@
}
div#body {
- margin: 0;
- margin-top: 0;
- padding: 0;
- border-style: none;
+ background: transparent;
+ margin-top: 3em !important;
+ margin: 0 !important;
+ padding: 0 !important;
+ border-style: none !important;
+ border: none !important;
+ -webkit-border-radius: none !important;
+ -moz-border-radius: none !important;
+ border-radius: none !important;
}
div#header h1 {
- margin-bottom: 1em;
- position: static;
+ margin-bottom: 1em !important;
+ padding-left: 1em !important;
+ position: static !important;
height: auto;
width: auto;
overflow: visible;
@@ -33,6 +37,7 @@
#header {
padding: 0 !important;
+ background: transparent !important;
}
#quickbar,
@@ -43,15 +48,14 @@
.titlebox-title .widget,
.titlebox-title .right,
.ticket-info-links .titlebox-content .create,
- .transaction .metadata .actions,
- .transaction .content .downloadattachment,
+ div.transaction div.metadata span.actions,
+ div.transaction div.content div.downloadattachment,
#comp-Search-Results #body .refresh,
.search-result-actions,
#comp-Search-Chart .chart-meta,
#footer,
#topactions,
#logo,
- form,
div.summary + br
{
display: none;
@@ -75,6 +79,7 @@
color: black !important;
margin: 0 !important;
padding-left: 0 !important;
+ background-color: transparent !important;
}
.titlebox.rolled-up .titlebox-title .left:after {
@@ -82,14 +87,10 @@
font-weight: normal;
}
- div.titlebox-content {
- border: 0 !important;
- padding-top: 0.5em !important;
- }
/* outer Ticket Metadata titlebox gets no padding, but inside ones do below */
.summary .titlebox-content {
- padding: 0 !important;
+ background: transparent !important;
}
div.summary .ticket-summary div.titlebox-content {
@@ -98,13 +99,20 @@
div.titlebox-title .left * {
color: black !important;
+ background: transparent !important;
}
div.messagebody a[href]:after {
text-decoration: underline !important;
content: " (" attr(href) ") ";
}
-
+
+
+ div.results {
+ background: #ccc;
+
+ }
+
.messagebody {
orphans: 2;
widows: 2;
@@ -160,6 +168,7 @@
/* form elements */
input, select, option {
background: white !important;
+ color: black !important;
border: 1px solid #666 !important;
}
@@ -171,5 +180,5 @@
font-weight: bold !important;
}
-
+
}
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list