Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKate Butler <kate@innocraft.com>2019-08-14 02:43:37 +0300
committerThomas Steur <tsteur@users.noreply.github.com>2019-08-14 02:43:37 +0300
commit85932196aa30e93cc0c28d4445b081b7f710c8ae (patch)
tree2b8336caa64d7ca5d5893d27625e4b63c3982ef4 /plugins
parentf71a9f23b80bdcf93b0b5762b405888b083277ed (diff)
Freeze left-hand column of data table (#14594)
* Freeze left-hand column of data table * Freeze left-hand column of datatable * Don't use position-absolute on first th as it messes with column placement. * Use a spacer column to prevent label column from overlapping with first value column * Set margin of second td * Use position:sticky * Fix missing border in Safari/Firefox * Cross-browser fixes * Increase space available for first data column * Don't put dataTableScroller around non-HTML table vizs * Only apply negative margin/width to datatables in widgets * Reduce border radius to adjust for border-collapse: separate * Updated reference screenshots * UI test fixes * Don't let live widget overflow dashboard card * Updated reference images * Reduce left margin to make data action icons visible on smaller screens * Update reference images * Back out change to TestSetupFixture (should not have been committed on this branch) to avoid merge conflicts * Update UI screenshots
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png4
-rw-r--r--plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png4
-rw-r--r--plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png4
-rw-r--r--plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png4
-rw-r--r--plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png4
-rw-r--r--plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png4
-rw-r--r--plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png4
-rw-r--r--plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png4
-rw-r--r--plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png4
-rw-r--r--plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png4
-rw-r--r--plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png4
-rw-r--r--plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png4
-rw-r--r--plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png4
-rw-r--r--plugins/CoreHome/javascripts/dataTable.js2
-rw-r--r--plugins/CoreHome/stylesheets/dataTable/_dataTable.less28
-rw-r--r--plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png4
-rw-r--r--plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig2
-rw-r--r--plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png4
-rw-r--r--plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png4
-rw-r--r--plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png4
-rw-r--r--plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_create_new.png4
-rw-r--r--plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png4
-rw-r--r--plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png4
-rw-r--r--plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png4
-rw-r--r--plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png4
-rw-r--r--plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png4
-rw-r--r--plugins/Live/stylesheets/live.less5
-rw-r--r--plugins/Morpheus/stylesheets/main.less5
-rw-r--r--plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png4
-rw-r--r--plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png4
-rw-r--r--plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png4
-rw-r--r--plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png4
-rw-r--r--plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png4
-rw-r--r--plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png4
-rw-r--r--plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png4
-rw-r--r--plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png4
36 files changed, 91 insertions, 75 deletions
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png
index 3cbff04255..4f1e0fc4ae 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_auto_expand.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:59b43d1a1cbe691a3fe1b49da4a34ab58961d713e6ae42bc64ca3d39b0f33916
-size 369093
+oid sha256:6bbb83ed6c93fff400bc059649b000d8a8434d1bee5a03c9d60b06f08351ca44
+size 373126
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png
index 2bd9e6e86a..823d788aa2 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0b3860e49a664aa78b7fe4ff2a0ef143384978c1629e5e4e388211b6a55fd598
-size 344995
+oid sha256:19c00677ca3e15f163b7e59886d1d1349717918848dc105a94f8f49c51d593a9
+size 349049
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png
index 0b8374a25f..dcaabb4970 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a1b733691796aa798dbc1d0f3cf5a0d62305534cb2217d8c369ba0fc6c2fbf8f
-size 79145
+oid sha256:198000cebc6a53a3b9310fbf33a441fe70190dd86a573c28694f3e08656df483
+size 79732
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png
index ef7e61de7f..87a4c94bad 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e6fd58c0c413b6278cd8961f9079ffcd91620fa03bc919c9d4ee4d517f821d6a
-size 462681
+oid sha256:58f11c3535ffa459122e849ebd5c9c5d2d5207754f7a6c0897de88ccfea64356
+size 467791
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png
index 9742d1466b..91357e2854 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0715ec0cbef204c3f9951a245412ca1738e115caf73afafe57b0990937962e6c
-size 344443
+oid sha256:24a3a1a0cfe8f8b3a1258c4a09523f9204301d3458d94d822cb6b7a293615fcf
+size 348489
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png
index 57c9cfdd94..23278dc015 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5e8cc7d8d3b934da0270bc4840d38644308c9b8e90ef5063252043dd903065f4
-size 66915
+oid sha256:092f50f1d9b32b57ee047e3c6b8235007ac36e35f5f4a0f2e10bb875bfb44110
+size 67302
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png
index b5c95b8949..2bfd563211 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a42f9314c844b6e6d02f2cd50f260e66e6946187202ce5d04feda7b2e9bad33a
-size 80596
+oid sha256:eb076300fe4f89f96ed01e07d0a8af5637cff40d7de4c39255c2a31e493c4f12
+size 81492
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png
index da6ec998b6..50c2df9696 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b67aad0ad691ee233a659d6c4241e3250d99decc56d1d0741f60591deed34cc4
-size 59266
+oid sha256:730c0bd5c1e622c7fddedec312fbe74daecb21df021a15dc5e9dcabfcf717404
+size 59905
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png
index 746971a886..5e77179a22 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2d9c7900c4d3bafcc61f3edfaa7b33b1dedf7819df23ed249ec76e93cdc09c69
-size 59367
+oid sha256:75aed5872a02e45b9ece02d145819cf1c7434070a6dfbb3c9829f803fcd06322
+size 59910
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png
index 9fe60b3298..492c6f3b4f 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:577125cdd3e0723541131a93d80c425e20dbfe88751a8a680938d0cf5298fdc5
-size 66196
+oid sha256:c56217752d9be8b87d46287f62e21c1c87a94433124232c6db9e88a8e85ee532
+size 66616
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png
index d311af8b13..fc23b4e3d4 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_subtables_loaded.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:85ce60d44b62985a1aea855ef1dc4920c06c475186bca5753d2036ce3da6fbe4
-size 367292
+oid sha256:e734af53ed981781db46ee91fba9e0039c4d3c743b0dcd3c09d6dad3843ff9ea
+size 371468
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png
index da6ec998b6..50c2df9696 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b67aad0ad691ee233a659d6c4241e3250d99decc56d1d0741f60591deed34cc4
-size 59266
+oid sha256:730c0bd5c1e622c7fddedec312fbe74daecb21df021a15dc5e9dcabfcf717404
+size 59905
diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png
index 166f64e94b..6aeb2fab8b 100644
--- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png
+++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ab0d67591d7b480aa12898326e5fcff4eec56d3ade4766b7ab2e9438eaf53fc9
-size 66428
+oid sha256:752bb51c459aba94b8143e9d34c003a75c02dd87f5fb6c613b94ee6e716ecaed
+size 66900
diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js
index d59c691d3c..71dd8e78b7 100644
--- a/plugins/CoreHome/javascripts/dataTable.js
+++ b/plugins/CoreHome/javascripts/dataTable.js
@@ -1956,7 +1956,7 @@ $.extend(DataTable.prototype, UIControl.prototype, {
}
actions.height(tr.innerHeight() - 6);
- actions.css('marginLeft', (td.width() + 3 - actions.outerWidth()) + 'px');
+ actions.css('marginLeft', (td.width() - 3 - actions.outerWidth()) + 'px');
},
_findReportHeader: function (domElem) {
diff --git a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
index d15b3017a0..2fbf404861 100644
--- a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
+++ b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
@@ -4,8 +4,13 @@
width: 100%;
padding: 0;
border-spacing: 0;
+ border-collapse: separate;
margin: 0;
+ td {
+ border-radius: 1px;
+ }
+
td .ratio {
color: #999999;
display: inline-block;
@@ -79,8 +84,6 @@ body>.widget table.dataTable {
// for dataTables in report pages (not for widgets in the dashboard)
.theWidgetContent .card .card-content table.dataTable {
- margin-left: -20px;
- width: ~"calc(100% + 40px)";
th {
background: @theme-color-background-base !important;
@@ -115,8 +118,9 @@ table.dataTable th.columnSorted {
}
table.dataTable td {
- padding: 5px 1px 5px 12px;
+ padding: 5px 0px 5px 12px;
background: @theme-color-background-base;
+ z-index: 99;
}
table.dataTable td,
@@ -138,15 +142,16 @@ table.dataTable td.column {
font-weight: bold;
}
+table.dataTable th.label,
table.dataTable td.label,
table.subActionsDataTable td.label,
table.actionsDataTable td.label {
border-top: 0;
border-left: 0;
-}
-
-table.dataTable th.label {
- border-left: 0;
+ position: sticky; position: -webkit-sticky;
+ left: 0;
+ z-index: 1;
+ background-clip: padding-box;
}
.dataTableActions table.dataTable th.label {
@@ -606,6 +611,15 @@ td.cellSubDataTable .loadingPiwik {
}
}
+div.dataTableScroller {
+ overflow-x: scroll;
+}
+
+.theWidgetContent .card .card-content div.dataTableScroller {
+ margin-left: -20px;
+ width: ~"calc(100% + 40px)";
+}
+
@media only screen and (min-width: 993px) {
#dashboardWidgetsArea .widget,
.theWidgetContent > div:not(#dashboard) {
diff --git a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png
index dde8e638af..e3597476ae 100644
--- a/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png
+++ b/plugins/CorePluginsAdmin/tests/UI/expected-screenshots/TagManagerTeaser_admin_page_disable.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:c797770dc3f544c6e7b283aa99e95f0e08d7d662f68dd4abed7f5c01e07342c0
-size 183619
+oid sha256:49fb0952683aa14fe7ea5527efb195965cd9ee4e199a37f17aa79515e78d05ba
+size 183663
diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
index c4b4659e03..38c2101168 100644
--- a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
+++ b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
@@ -6,6 +6,7 @@
{{ error.message }}
{% else %}
{%- if not showingEmbeddedSubtable -%}
+ <div class="dataTableScroller">
<table cellspacing="0" class="dataTable">
{% include "@CoreHome/_dataTableHead.twig" %}
@@ -67,5 +68,6 @@
{%- if not showingEmbeddedSubtable -%}
</tbody>
</table>
+ </div>
{%- endif -%}
{% endif %} \ No newline at end of file
diff --git a/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png b/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png
index 9b51d28c58..c59655a4d7 100644
--- a/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png
+++ b/plugins/DBStats/tests/UI/expected-screenshots/DBStats_admin_page.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8be357ccd6d705b66db4900b032de3560c74270c9080918642d717f4ca4859e7
-size 225655
+oid sha256:862978936eed6c7e784b2ebcd109a713672cc1af22073c281e8072d4422cbfc9
+size 226310
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png
index 1e216a6e86..edc2881b82 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_create_new.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:344802172106c35b46a77d251179d8544bfb2a26fd7c98d47c82384d4fd2ea01
-size 285759
+oid sha256:3a10ff573f2a4b633692a22df233ec8ace15eaf42dddee3f996b8dabbe9f3674
+size 285814
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
index 72951248e2..bb44b2614d 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f99d90d1ce961e5818550b36ceb4c9c505f6df2d5069f1a14fe16634baa99708
-size 468260
+oid sha256:878ad5bdecee2ca6f8e74a8928a843a51cb88a4f43e2b76628760b44c89c4ac8
+size 468479
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_create_new.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_create_new.png
index bc839de1ad..270791f1be 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_create_new.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_create_new.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a2e97b24e3be6f1c0b091374158aac8ca036caf522348387b41fb2027da109cd
-size 29547
+oid sha256:bb5194f11b87fd69a77f5a88bf6ef6693dd8813f52ebc7bcd0a8d20ff9a5cd4a
+size 28681
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
index 4b14536d4c..30c5a2bc3e 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8ae170249cc95b9bd6a09a1e64f98f3d627a87f7369c59bfb319d55d3075b557
-size 708401
+oid sha256:7d3dcff7407580364995a6e9f5ba5c4a27bb7562f377e7477ece82710ffa5412
+size 693781
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png
index 4b14536d4c..30c5a2bc3e 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8ae170249cc95b9bd6a09a1e64f98f3d627a87f7369c59bfb319d55d3075b557
-size 708401
+oid sha256:7d3dcff7407580364995a6e9f5ba5c4a27bb7562f377e7477ece82710ffa5412
+size 693781
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png
index 53de6d6c79..324878e219 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_reset.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:8bd534a1851f22337f0c6019f2c32927497c4c35a349263bc26b8f8bc8959101
-size 281739
+oid sha256:d3d3398c5dae97244dc03e25a7892ffa43e0a70f0c7255d74df0a82069916d48
+size 281774
diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png
index a8f024921f..fee46a0234 100644
--- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png
+++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_widget_add_widget.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:142a123c23f41ca5c52421f8345068be77b3d7954cb166ee26a44aab833fe186
-size 199275
+oid sha256:60bfe747fc4173fe17e17c25c3fe2a59df1f9ef5d11af14d16ad253dee89878b
+size 200647
diff --git a/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png b/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png
index bb13573859..f670d55409 100644
--- a/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png
+++ b/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:546948a9240b8ec45acbd53f10d496e5a5568930c9894857e7db63f42f98a8db
-size 151898
+oid sha256:2bc504a2c6e1ea9a920dd044b094ba81ab4b40f023e74d98b3ea7a6bfe9283a7
+size 152748
diff --git a/plugins/Live/stylesheets/live.less b/plugins/Live/stylesheets/live.less
index 56adfd2b12..eb9d64cdb3 100644
--- a/plugins/Live/stylesheets/live.less
+++ b/plugins/Live/stylesheets/live.less
@@ -89,6 +89,11 @@
}
}
+.theWidgetContent .card .card-content #visitsTotal {
+ margin-left: -20px;
+ width: ~"calc(100% + 40px)";
+}
+
.visitsLiveFooter img {
vertical-align: middle;
}
diff --git a/plugins/Morpheus/stylesheets/main.less b/plugins/Morpheus/stylesheets/main.less
index 950e06de43..b9175b225e 100644
--- a/plugins/Morpheus/stylesheets/main.less
+++ b/plugins/Morpheus/stylesheets/main.less
@@ -405,11 +405,6 @@ table.dataTable {
border-left: 0;
}
- &.label + td.column {
- // first column after label should have a bit less padding
- padding-left: 10px;
- }
-
&.label .label {
text-align: left;
}
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png
index ff43189240..d1a157df0a 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:b402362358d18a8f3538dbc0f0dfb79e58e5f59909a8eba9b2ea2bb86d71e1be
-size 275226
+oid sha256:d1e5b0449e989a4286f4e7fb496c210995bda8c2812ca4024d915bfdac17589b
+size 276562
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png
index 776befae69..7743f398a4 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_changed_sort_order.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7c4008d5e0275fa56a2ca44388b5ebf364f64523b21f338d6a0b6488d7acc8ea
-size 55533
+oid sha256:8033854fba0b193e69c7dd2d43f5c49782448a71ef8d729765ea2dc72d68df30
+size 55791
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png
index a8fe2942b1..31cfab6200 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_page_1.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4dafcc74096e43038be56866826fa3358501daff5e57167b8b917da8f6e2110f
-size 72088
+oid sha256:9fcb7a08c93b58097b1d466e0de99d4e8e8187dd119ee917ecd6a17b20617c0d
+size 72399
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png
index 5681f759ed..3f8ad7fa91 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ddbb6ab820a4299b0c3827604fa8935e79ab28f8d34285beff345300d252cce6
-size 239563
+oid sha256:61985bb6c6236078211f5acb5b44999475983ff3dd5caa2ddd54f0dc1d650500
+size 240821
diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png
index 8e20d103d4..eb335c1078 100644
--- a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png
+++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_search.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:e1d8bca46844c07adf57d963e98ae516ba364e223d146fa3f95f74c22ab3d969
-size 55498
+oid sha256:0d314c7b645eb175d69efff04e7b17db5cafbc9d0c56e19f9cbdb889dd453cc4
+size 55765
diff --git a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png
index 6a05cd6cb2..f0c5f47b1f 100644
--- a/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png
+++ b/plugins/SegmentEditor/tests/UI/expected-screenshots/SegmentSelectorEditorTest_complex_segment.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:950ba8c5dbb9c4269ef39ecac60b78d79ddb2866394c120fdad4c41e41fc688e
-size 127934
+oid sha256:591668b51fa87ed9881259f6c5ffe07d2fb5e32fb29e692f45af5e5d7cc22cac
+size 128478
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png
index f33b3b6d6e..15b4f60148 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_logme_verified.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:a81e25e9ff0ebc7b6d35e93a527e4df55ad541595a5a486ca93a5ff0a43408ac
-size 184027
+oid sha256:76eff2ded2eba2516c27ac9bdac6108f19c5d17a0b34e1dc5472789b06eaa4a8
+size 184063
diff --git a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png
index 0157f8753b..fe85f01b3c 100644
--- a/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png
+++ b/plugins/TwoFactorAuth/tests/UI/expected-screenshots/TwoFactorAuth_twofa_forced_step4.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:01e9da77401b28325f924028c6cb72246b3945c27512a3df7929ee5bed97f81f
-size 183081
+oid sha256:9a36ea8f1593f9aac6b00a5a1a50c983f25f826288abb8720b76b706e08ba062
+size 183118