[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch master updated. d8278e3dfd7632f2a7b1165b9c6229297f7844de
Evergreen Git
git at git.evergreen-ils.org
Fri Oct 11 14:52:59 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via d8278e3dfd7632f2a7b1165b9c6229297f7844de (commit)
via 00a58d70ab5f94813decf11d3443e46f27318227 (commit)
from e797f7b0e94ab62b9f0d0c45c208a8fb4394b32e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d8278e3dfd7632f2a7b1165b9c6229297f7844de
Author: Dan Wells <dbw2 at calvin.edu>
Date: Fri Oct 4 11:34:04 2013 -0400
TPAC: Remove needless divs from results header bar
In the current state of the TPAC, these "div"ider elements were
completely invisible, yet nobody seemed to miss them. It wasn't
altogether clear what the divisions meant anyway, so rather than fix
them, let's just trim them out for now.
Also, get rid of a useless clearing div while we are at it. I could
not detect a valuable display difference in current Chrome, Firefox,
or IE9.
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 60ae498..03c59bf 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -668,14 +668,6 @@ div.format_icon {
.cached_list_div { height: 25px; }
-.results_header_div {
- float: left;
- width: 0px;
- border-left: 1px solid [% css_colors.accent_mediumdark %];
- border-right: 1px solid [% css_colors.accent_medium %];
- margin: 0px 13px;
-}
-
.results_header_lbl {
font-weight: bold;
float: left;
@@ -1808,7 +1800,7 @@ a.preflib_change {
#myopac_sum_fines {
display: none;
}
- .results_header_div, .results_header_lbl {
+ .results_header_lbl {
display: none;
}
.results_header_nav1 span.h1 {
diff --git a/Open-ILS/src/templates/opac/results.tt2 b/Open-ILS/src/templates/opac/results.tt2
index 520d429..5d54deb 100644
--- a/Open-ILS/src/templates/opac/results.tt2
+++ b/Open-ILS/src/templates/opac/results.tt2
@@ -38,11 +38,9 @@
[%- END %]
</div>
[% END %]
- <div class="results_header_div"></div>
<label class="results_header_lbl">[% l('Sort by') %]
[% INCLUDE "opac/parts/filtersort.tt2" value=CGI.param('sort') submit_on_change=1 %]
</label>
- <div class="results_header_div"></div>
<div class='results_header_sel' id='simple-detail-view-links'>
[% IF CGI.param('detail_record_view') %]
@@ -50,7 +48,6 @@
<a href="[% mkurl('', {detail_record_view => 1}) %]">[% l('Show More Details') %]</a>
[% END %]
</div>
- <div class="results_header_div"></div>
<label class="results_header_lbl">
<input type="checkbox" id="limit_to_available" name="modifier" value="available"
@@ -61,7 +58,6 @@
[% IF CGI.param('detail_record_view') %]
<input type="hidden" name="detail_record_view" value="1" />
[% END %]
- <div class="clear-both"></div>
</div>
</div>
</div>
commit 00a58d70ab5f94813decf11d3443e46f27318227
Author: Dan Wells <dbw2 at calvin.edu>
Date: Fri Oct 4 11:23:13 2013 -0400
TPAC: Redo some margins/padding for better collapse behavior
In the "results header", we have both buttons and form elements. In
order to have these elements collapse in an orderly fashion, they need
to be exactly the same size. To accomplish this, let's simplify and
redo a few of the element margins and padding.
At the very least, this will make the elements line up better
vertically when viewed at the normal screen width.
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index a7b65c3..60ae498 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -680,8 +680,23 @@ div.format_icon {
font-weight: bold;
float: left;
color: [% css_colors.text %];
+ /* this border is not visible, but it keeps these labels the same size
+ as the buttons */
+ border: 1px solid [% css_colors.accent_medium %];
background: [% css_colors.accent_medium %];
- margin: 0.5em 0.5em 0.5em 0em;
+ margin: 0.5em 0.3em;
+ padding: 0.3em;
+}
+/* we need a negative margin on the select to allow the containing <label>
+to determine the actual size of the element. By doing this, we can increase
+the odds that the buttons and the select will be the same size, and therefore
+collapse correctly when the window width decreases */
+.results_header_lbl select {
+ margin: -0.5em 0;
+}
+
+#limit_to_available {
+ vertical-align: middle;
}
.results_header_sel {
@@ -1218,7 +1233,6 @@ a.dash-link:hover { text-decoration: underline !important; }
.results_header_btns, .results_header_sel {
float:left;
- margin: 0.5em 0.5em 0.5em 0em;
}
/*
@@ -1236,7 +1250,7 @@ a.dash-link:hover { text-decoration: underline !important; }
border-radius: 5px;
border: 1px solid [% css_colors.primary %];
background: [% css_colors.primary_fade %];
- margin: 10px;
+ margin: 0.5em;
padding: 0.3em;
display: inline-block;
}
@@ -1259,11 +1273,6 @@ button.opac-button::-moz-focus-inner, input.opac-button::-moz-focus-inner {
border: 0;
}
-.results_header_btns a, #simple-detail-view-links a {
- vertical-align: middle;
- display: table-cell;
-}
-
.opac-button-header, #dash_wrapper .opac-button {
background: [% css_colors.control %];
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15);
@@ -1839,7 +1848,7 @@ a.preflib_change {
background-color: inherit;
}
.results_header_btns a {
- margin: 0px;
+ margin: 0.3em;
}
#main-content {
margin-left: 1px;
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/opac/css/style.css.tt2 | 37 +++++++++++++------------
Open-ILS/src/templates/opac/results.tt2 | 4 ---
2 files changed, 19 insertions(+), 22 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list