[Rt-commit] rt branch, 4.6/fix-multi-line-search-result-formats, created. rt-4.4.4-724-g4b1aae7b0a
Blaine Motsinger
blaine at bestpractical.com
Mon Jan 27 16:12:53 EST 2020
The branch, 4.6/fix-multi-line-search-result-formats has been created
at 4b1aae7b0a76904ff9d3aaf74b91ecd96894ab81 (commit)
- Log -----------------------------------------------------------------
commit 8ca094beb91ec348c96bbcd673a2dcbdcd112509
Author: Blaine Motsinger <blaine at bestpractical.com>
Date: Tue Jan 14 15:22:10 2020 -0600
Remove border from table row if multi-line
For the second line in multi-line rows within a table collection
we don't want borders. This commit restores similar styling from
4.4 for the new elevator themes so evenline and oddline sets aren't
divided by top and bottom borders.
diff --git a/share/static/css/elevator-light/misc.css b/share/static/css/elevator-light/misc.css
index f5e0d21cc0..3b0f99db21 100644
--- a/share/static/css/elevator-light/misc.css
+++ b/share/static/css/elevator-light/misc.css
@@ -129,6 +129,10 @@ svg.icon-helper {
background-color: rgba(0, 0, 0, 0.05);
}
+tr.evenline+tr.evenline td, tr.oddline+tr.oddline td {
+ border: none;
+}
+
.cke_toolgroup a.cke_button {
padding-left: 3px;
padding-right: 3px;
commit 45c0e919afa3834fa3569dfc9d295db996bcfd29
Author: Blaine Motsinger <blaine at bestpractical.com>
Date: Tue Jan 14 15:38:21 2020 -0600
Tighten padding for table row if multi-line
diff --git a/share/static/css/elevator-light/misc.css b/share/static/css/elevator-light/misc.css
index 3b0f99db21..ffbf37b7cb 100644
--- a/share/static/css/elevator-light/misc.css
+++ b/share/static/css/elevator-light/misc.css
@@ -129,8 +129,23 @@ svg.icon-helper {
background-color: rgba(0, 0, 0, 0.05);
}
+/* first line td in collection if two lines */
+tbody.list-item tr:first-of-type.oddline td, tbody.list-item tr:first-of-type.evenline td {
+ padding-top: 0.5rem;
+ padding-bottom: 0.16rem;
+}
+
+/* first line td in collection if one line
+ we re-set the padding bottom here to it's not too small (as was in 4.4) */
+tbody.list-item tr:only-of-type.oddline td, tbody.list-item tr:only-of-type.evenline td {
+ padding-bottom: 0.5rem;
+}
+
+/* second line td in collection */
tr.evenline+tr.evenline td, tr.oddline+tr.oddline td {
border: none;
+ padding-top: 0;
+ padding-bottom: 0.5rem;
}
.cke_toolgroup a.cke_button {
commit 233d55a3e323b5f02879ee62c8e24182f07a5d09
Author: Blaine Motsinger <blaine at bestpractical.com>
Date: Wed Jan 15 17:04:47 2020 -0600
Tighten padding for table heading if multi-line
diff --git a/share/static/css/elevator-light/misc.css b/share/static/css/elevator-light/misc.css
index ffbf37b7cb..195a83fb96 100644
--- a/share/static/css/elevator-light/misc.css
+++ b/share/static/css/elevator-light/misc.css
@@ -124,6 +124,10 @@ svg.icon-helper {
color: #666;
}
+tr.collection-as-table+tr.collection-as-table th, tr.collection-as-table+tr.collection-as-table th {
+ padding-top: 0;
+}
+
/* row colouring */
.oddline {
background-color: rgba(0, 0, 0, 0.05);
commit 4b1aae7b0a76904ff9d3aaf74b91ecd96894ab81
Author: Blaine Motsinger <blaine at bestpractical.com>
Date: Fri Jan 17 16:12:14 2020 -0600
Add style to Articles/index
diff --git a/share/html/Articles/Elements/NewestArticles b/share/html/Articles/Elements/NewestArticles
index f0fa4c7001..0322266ced 100644
--- a/share/html/Articles/Elements/NewestArticles
+++ b/share/html/Articles/Elements/NewestArticles
@@ -47,7 +47,7 @@
%# END BPS TAGGED BLOCK }}}
<& /Widgets/TitleBoxStart, title => loc("[_1] newest articles", $rows), bodyclass=> '' &>
-<div class="form-row">
+<div class="form-row article-headers">
<div class="col-md-auto label text-right">
<&|/l&>#</&>
</div>
@@ -65,10 +65,10 @@
% $i++;
<div class="<% $i%2 ? 'oddline' : 'evenline'%> form-row">
<div class="col-md-auto value text-right">
- <span class="current-value"><%$Article->Id%></span>
+ <span class="current-value font-weight-bold"><%$Article->Id%></span>
</div>
<div class="col-md-4 value text-left">
- <span class="current-value"><a href="<% RT->Config->Get('WebPath') %>/Articles/Article/Display.html?id=<%$Article->Id%>"><%$Article->Name || loc('(no name)')%></a></span>
+ <span class="current-value font-weight-bold"><a href="<% RT->Config->Get('WebPath') %>/Articles/Article/Display.html?id=<%$Article->Id%>"><%$Article->Name || loc('(no name)')%></a></span>
</div>
<div class="col-md-4 value text-left">
<span class="current-value"><%$Article->CreatorObj->Name%></span>
@@ -77,7 +77,7 @@
<span class="current-value">[<a href="<% RT->Config->Get('WebPath') %>/Articles/Article/Edit.html?id=<%$Article->Id%>"><&|/l&>Update</&></a>]</span>
</div>
</div>
-<div class="<% $i%2 ? 'oddline' : 'evenline'%> form-row">
+<div class="<% $i%2 ? 'oddline' : 'evenline'%> form-row article-summary">
<div class="col-md-11 col-md-offset-1">
<span class="current-value"><small><%$Article->Summary || loc('(no Summary)')%></small></span>
</div>
diff --git a/share/html/Articles/Elements/UpdatedArticles b/share/html/Articles/Elements/UpdatedArticles
index f69328033a..9fd2260bfc 100644
--- a/share/html/Articles/Elements/UpdatedArticles
+++ b/share/html/Articles/Elements/UpdatedArticles
@@ -47,7 +47,7 @@
%# END BPS TAGGED BLOCK }}}
<& /Widgets/TitleBoxStart, title => loc("[_1] most recently updated articles", $rows), bodyclass=> '' &>
-<div class="form-row">
+<div class="form-row article-headers">
<div class="col-md-auto label text-right">
<&|/l&>#</&>
</div>
@@ -66,10 +66,10 @@
% $i++;
<div class="<% $i%2 ? 'oddline' : 'evenline'%> form-row">
<div class="col-md-auto value text-right">
- <span class="current-value"><%$Article->Id%></span>
+ <span class="current-value font-weight-bold"><%$Article->Id%></span>
</div>
<div class="col-md-4 value text-left">
- <span class="current-value"><a href="<% RT->Config->Get('WebPath') %>/Articles/Article/Display.html?id=<%$Article->Id%>"><%$Article->Name || loc('(no name)')%></a></span>
+ <span class="current-value font-weight-bold"><a href="<% RT->Config->Get('WebPath') %>/Articles/Article/Display.html?id=<%$Article->Id%>"><%$Article->Name || loc('(no name)')%></a></span>
</div>
<div class="col-md-4 value text-left">
<span class="current-value"><%$Article->CreatorObj->Name%></span>
@@ -79,7 +79,7 @@
</div>
</div>
-<div class="<% $i%2 ? 'oddline' : 'evenline'%> form-row">
+<div class="<% $i%2 ? 'oddline' : 'evenline'%> form-row article-summary">
<div class="col-md-11 col-md-offset-1">
<span class="current-value"><small><%$Article->Summary || loc('(no Summary)')%></small></span>
</div>
diff --git a/share/static/css/elevator-light/articles.css b/share/static/css/elevator-light/articles.css
index 1e0d907eab..16e1eeb78b 100644
--- a/share/static/css/elevator-light/articles.css
+++ b/share/static/css/elevator-light/articles.css
@@ -1,3 +1,21 @@
#articles-needs-setup a {
text-decoration: underline;
}
+
+#comp-Articles .card-body .form-row {
+ margin-top: 0;
+ margin-bottom: 0;
+ padding: 0.5rem;
+}
+
+#comp-Articles .card-body .form-row:not(.article-summary):not(.article-headers) {
+ padding-bottom: 0.15rem;
+}
+
+#comp-Articles .card-body .article-summary {
+ padding-top: 0;
+}
+
+#comp-Articles .card-body .form-row.article-headers, #comp-Articles .card-body .form-row.article-summary {
+ border-bottom: 1px solid #dee2e6;
+}
-----------------------------------------------------------------------
More information about the rt-commit
mailing list