[Bps-public-commit] rt-extension-assets branch, 1.0/style, updated. c0a29423e3aacf6ff71c04597a866ca66d6d2f79
? sunnavy
sunnavy at bestpractical.com
Sun Jan 12 12:08:16 EST 2014
The branch, 1.0/style has been updated
via c0a29423e3aacf6ff71c04597a866ca66d6d2f79 (commit)
via c5e508a6408b27326ff598ba75c1d3b990d8e244 (commit)
via 2334f976937248afefc1676f9c8e5dfe681e5153 (commit)
from 13b1404911e4e94b24da99cda66ecfd11acfc5ef (commit)
Summary of changes:
html/Asset/Search/Bulk.html | 4 ++--
static/css/RTx-Assets.css | 18 +++++++++++++++---
2 files changed, 17 insertions(+), 5 deletions(-)
- Log -----------------------------------------------------------------
commit 2334f976937248afefc1676f9c8e5dfe681e5153
Author: sunnavy <sunnavy at bestpractical.com>
Date: Mon Jan 13 00:44:25 2014 +0800
like search page, widens to 2 columns for bulk update page too
diff --git a/html/Asset/Search/Bulk.html b/html/Asset/Search/Bulk.html
index 7beef09..388b750 100644
--- a/html/Asset/Search/Bulk.html
+++ b/html/Asset/Search/Bulk.html
@@ -73,7 +73,7 @@
CheckAll => 1, ClearAll => 1,
&>
-<&| /Widgets/TitleBox, title => loc("Basics"), class => "asset-basics", title_class => "inverse" &>
+<&| /Widgets/TitleBox, title => loc("Basics"), class => "asset-basics asset-bulk-basics", title_class => "inverse" &>
<table>
<tr class="asset-catalog">
<td class="label"><label for="UpdateCatalog"><&|/l&>Catalog</&></label></td>
@@ -125,7 +125,7 @@
% my $cfs = $catalog_obj->AssetCustomFields;
% $cfs->LimitToGrouping( 'RT::Asset' => $group);
% if ( $cfs->Count ) {
-<&| /Widgets/TitleBox, title => 'Edit ' . ($group? loc($group) : loc('Custom Fields')) &>
+<&| /Widgets/TitleBox, class=>'asset-bulk-grouping asset-bulk-cfs', title => 'Edit ' . ($group? loc($group) : loc('Custom Fields')) &>
<& /Elements/BulkCustomFields, CustomFields => $cfs, &>
</&>
% }
diff --git a/static/css/RTx-Assets.css b/static/css/RTx-Assets.css
index 07f040e..9f9970d 100644
--- a/static/css/RTx-Assets.css
+++ b/static/css/RTx-Assets.css
@@ -164,8 +164,9 @@
padding-left: 1em;
}
-/* On a wide screen, use two columns for search criteria */
+/* On a wide screen, use two columns for search/bulk criteria */
@media (min-width:1150px){
+ .asset-bulk-grouping.asset-bulk-cfs,
.asset-search-grouping.asset-search-cfs {
display: inline-block;
@@ -173,18 +174,21 @@
padding-right: 1em;
vertical-align: top;
}
+ .titlebox.asset-bulk-grouping.asset-bulk-cfs,
.titlebox.asset-search-grouping.asset-search-cfs {
display: block;
width: auto;
padding: inherit;
}
-
+ .asset-bulk-basics tr,
.asset-search-basics tr {
width: 49%;
display:inline-block;
white-space: nowrap;
}
+
+ .asset-bulk-basics tr>td,
.asset-search-basics tr>td {
display:inline-block;
width:10em;
commit c5e508a6408b27326ff598ba75c1d3b990d8e244
Author: sunnavy <sunnavy at bestpractical.com>
Date: Mon Jan 13 00:47:16 2014 +0800
don't position "User Summary" as "absolute right" for small screens.
by default(in RT's accordion.css), position css of "User Summary" link(used in
ShowRoleMembers) is:
{
position: absolute;
right: 0;
}
this could result in overlapping(with the content at the left side) when the
screen is not wide enough. I tried "float: right", but then it shadows the
following contents(like "Real Name Enoch Root") below it in small screens.
using "relative" position in small screens works(no overlapping or hidding),
though it doesn't look that good(since it's not at the right side).
diff --git a/static/css/RTx-Assets.css b/static/css/RTx-Assets.css
index 9f9970d..c6f7b1b 100644
--- a/static/css/RTx-Assets.css
+++ b/static/css/RTx-Assets.css
@@ -195,3 +195,11 @@
}
}
+
+ at media (max-width:1440px){
+ /* on a not-wide-enough screen, don't position "User Summary" link as "absolute" in case of overlapping */
+ #comp-Asset-Display .asset-people a.user-summary {
+ position: relative;
+ white-space: nowrap;
+ }
+}
commit c0a29423e3aacf6ff71c04597a866ca66d6d2f79
Author: sunnavy <sunnavy at bestpractical.com>
Date: Mon Jan 13 00:58:59 2014 +0800
edge case fix so we can use 2-columns in modify pages generally.
before, it works only on Chrome, now it also works on Safari/Firefox/IE10+.
old IE still doesn't work though.
diff --git a/static/css/RTx-Assets.css b/static/css/RTx-Assets.css
index c6f7b1b..1f59dcb 100644
--- a/static/css/RTx-Assets.css
+++ b/static/css/RTx-Assets.css
@@ -124,7 +124,7 @@
.edit-custom-fields tr,
#ModifyAsset .asset-basics tr {
display: inline-block;
- width: 50%;
+ width: 49%;
}
.edit-custom-fields tr td.cflabel,
-----------------------------------------------------------------------
More information about the Bps-public-commit
mailing list