diff --git a/opentech/apply/funds/tables.py b/opentech/apply/funds/tables.py index ded01709bb2164767fe242a4c24f59d3f399eba8..b4475fc0249db6a3f5338688c74cd39972e21b8d 100644 --- a/opentech/apply/funds/tables.py +++ b/opentech/apply/funds/tables.py @@ -19,7 +19,7 @@ from .widgets import Select2MultiCheckboxesWidget def make_row_class(record): - css_class = 'submission-meta__row' if record.next else 'all-submissions__parent' + css_class = 'submission-meta__row' if record.next else 'all-submissions-table__parent' css_class += '' if record.active else ' is-inactive' return css_class @@ -48,7 +48,7 @@ class SubmissionsTable(tables.Table): 'class': make_row_class, 'data-record-id': lambda record: record.id, } - attrs = {'class': 'all-submissions'} + attrs = {'class': 'all-submissions-table'} def render_user(self, value): return value.get_full_name() diff --git a/opentech/apply/funds/templates/funds/tables/table.html b/opentech/apply/funds/templates/funds/tables/table.html index 9a7848ff770c3d0dd7df0cfb57a6be91f56c75d5..a6f7eea2df12b4a9ff771a40e90bf7e2132a7f46 100644 --- a/opentech/apply/funds/templates/funds/tables/table.html +++ b/opentech/apply/funds/templates/funds/tables/table.html @@ -12,7 +12,7 @@ </tr> {% with submission=row.record %} - <tr class="all-submissions__child" data-parent-id="{{ submission.id }}"> + <tr class="all-submissions-table__child" data-parent-id="{{ submission.id }}"> <td colspan="{{ table.columns|length }}"> <table class="submission-meta"> <tr class="submission-meta__row"> @@ -48,7 +48,7 @@ {% if row.record.previous %} {# we have a linked application, re-render the header row #} - <tr class="all-submissions__child" data-parent-id="{{ row.record.id }}"> + <tr class="all-submissions-table__child" data-parent-id="{{ row.record.id }}"> <td colspan="{{ table.columns|length }}"> <table class="submission-meta"> <tr class="submission-meta__row"> diff --git a/opentech/static_src/src/javascript/apply/all-submissions-table.js b/opentech/static_src/src/javascript/apply/all-submissions-table.js index 71d6f2087b86be10e79e5b4bbb811a90661c6ec4..f98d014546012f9ff6030911ad36445591430963 100644 --- a/opentech/static_src/src/javascript/apply/all-submissions-table.js +++ b/opentech/static_src/src/javascript/apply/all-submissions-table.js @@ -3,7 +3,7 @@ 'use strict'; // add the toggle arrow before the submission titles - $('.all-submissions__parent td.title').prepend('<span class="all-submissions__toggle js-toggle-submission"><span class="arrow"></span></span>'); + $('.all-submissions-table__parent td.title').prepend('<span class="all-submissions-table__toggle js-toggle-submission"><span class="arrow"></span></span>'); // grab all the toggles const children = Array.prototype.slice.call( @@ -13,7 +13,7 @@ // show/hide the submission child rows children.forEach(function (child) { child.addEventListener('click', (e) => { - $(e.target).closest('.all-submissions__parent').toggleClass('is-expanded'); + $(e.target).closest('.all-submissions-table__parent').toggleClass('is-expanded'); }); }); diff --git a/opentech/static_src/src/sass/apply/abstracts/_variables.scss b/opentech/static_src/src/sass/apply/abstracts/_variables.scss index 62949ad6d81c7d68e67ae50daa0ff6b7b88ef653..dd696f978e042db6d19e5cadc9a3ec926dbf3847 100644 --- a/opentech/static_src/src/sass/apply/abstracts/_variables.scss +++ b/opentech/static_src/src/sass/apply/abstracts/_variables.scss @@ -117,3 +117,6 @@ $filter-dropdown: '.select2 .select2-selection.select2-selection--single'; // listing header/spacer height $listing-header-height: 75px; + +// Table breakpoint +$table-breakpoint: 'tablet-landscape'; diff --git a/opentech/static_src/src/sass/apply/components/_all-submissions.scss b/opentech/static_src/src/sass/apply/components/_all-submissions-table.scss similarity index 98% rename from opentech/static_src/src/sass/apply/components/_all-submissions.scss rename to opentech/static_src/src/sass/apply/components/_all-submissions-table.scss index ea72a28ba297d19475de991e4081269086dcd04b..015611bec661e7df33cb6021817b4296ddf4c4f1 100644 --- a/opentech/static_src/src/sass/apply/components/_all-submissions.scss +++ b/opentech/static_src/src/sass/apply/components/_all-submissions-table.scss @@ -1,7 +1,4 @@ -// also in _table.scss -$table-breakpoint: 'tablet-landscape'; - -.all-submissions { +.all-submissions-table { $root: &; font-size: 14px; diff --git a/opentech/static_src/src/sass/apply/components/_table.scss b/opentech/static_src/src/sass/apply/components/_table.scss index 122903dc690bd8ab10c3d27129004b92025864c0..3b5dfbe90b3b4048efab1c55d267c7a545dd5d47 100644 --- a/opentech/static_src/src/sass/apply/components/_table.scss +++ b/opentech/static_src/src/sass/apply/components/_table.scss @@ -1,6 +1,4 @@ -// also in _all-submissions.scss -$table-breakpoint: 'tablet-landscape'; - +// base table styles - specific ones in their own scss partial table { width: 100%; background-color: $color--white; diff --git a/opentech/static_src/src/sass/apply/main.scss b/opentech/static_src/src/sass/apply/main.scss index 930863ffbb535a0ea37fe0f721fda96870bd1a00..092fcff4bf6777eb68661ef3cc18c3407ec8f945 100644 --- a/opentech/static_src/src/sass/apply/main.scss +++ b/opentech/static_src/src/sass/apply/main.scss @@ -8,7 +8,7 @@ @import 'base/typography'; // Components -@import 'components/all-submissions'; +@import 'components/all-submissions-table'; @import 'components/admin-bar'; @import 'components/activity-feed'; @import 'components/comment';