From cfe007ebb1737749d23f32d1bc9e7c69f23f7997 Mon Sep 17 00:00:00 2001 From: Ans Date: Wed, 3 Apr 2024 16:04:33 -0400 Subject: [PATCH] Ask: Remove `inset-row`, `video_player-row`, `content_sidebar` --- .../jinja2/ask-cfpb/ask-answer-content.html | 2 +- cfgov/ask_cfpb/tests/test_blocks.py | 8 +++---- cfgov/unprocessed/css/on-demand/ask.less | 24 +++---------------- 3 files changed, 8 insertions(+), 26 deletions(-) diff --git a/cfgov/ask_cfpb/jinja2/ask-cfpb/ask-answer-content.html b/cfgov/ask_cfpb/jinja2/ask-cfpb/ask-answer-content.html index 58151935ab8..d7e1cb84811 100644 --- a/cfgov/ask_cfpb/jinja2/ask-cfpb/ask-answer-content.html +++ b/cfgov/ask_cfpb/jinja2/ask-cfpb/ask-answer-content.html @@ -15,7 +15,7 @@ {% for block in value %} {% set after_tip = value[loop.index - 2].block_type == 'tip' if loop.index > 1 else False %} {% if not after_tip %} -
diff --git a/cfgov/ask_cfpb/tests/test_blocks.py b/cfgov/ask_cfpb/tests/test_blocks.py index e1f0321dcb3..2b5567d2554 100644 --- a/cfgov/ask_cfpb/tests/test_blocks.py +++ b/cfgov/ask_cfpb/tests/test_blocks.py @@ -27,7 +27,7 @@ def test_content_block_applies_wrapper_to_tip(self): block = AskAnswerContent() value = block.to_python([self.tip_data]) html = block.render(value) - expected_html = '
{}
'.format( + expected_html = '
{}
'.format( self.expected_tip_html ) self.assertHTMLEqual(html, expected_html) @@ -36,7 +36,7 @@ def test_content_block_applies_wrapper_to_tip_and_next_block(self): block = AskAnswerContent() value = block.to_python([self.tip_data, self.text_data]) html = block.render(value) - expected_html = '
{}{}
'.format( + expected_html = '
{}{}
'.format( self.expected_tip_html, self.expected_text_html ) self.assertHTMLEqual(html, expected_html) @@ -45,10 +45,10 @@ def test_content_block_does_not_apply_wrapper_without_tip(self): block = AskAnswerContent() value = block.to_python([self.text_data]) html = block.render(value) - expected_html = '
{}
'.format( + expected_html = '
{}
'.format( self.expected_text_html ) - self.assertNotIn('
', html) + self.assertNotIn('
', html) self.assertHTMLEqual(html, expected_html) diff --git a/cfgov/unprocessed/css/on-demand/ask.less b/cfgov/unprocessed/css/on-demand/ask.less index 38b07df99a5..0cfac278538 100644 --- a/cfgov/unprocessed/css/on-demand/ask.less +++ b/cfgov/unprocessed/css/on-demand/ask.less @@ -128,16 +128,6 @@ max-width: 41.875rem; } - .respond-to-min(@bp-lg-min, { - .content_sidebar { - padding-top: 0; - } - }); - - .o-expandable_cue-close { - display: none; - } - .answer-text { h2, h3, @@ -148,7 +138,6 @@ margin-top: unit(@grid_gutter-width / 2 / @base-font-size-px, em); } - .video_player-row + .row, .row + .row > .o-table:first-child, .row + .row > .o-video-player:first-child { margin-top: unit(@grid_gutter-width / @base-font-size-px, em); @@ -162,10 +151,11 @@ margin-top: unit(@grid_gutter-width / @size-iii, em); } - .row + .row:not(.inset-row) h4 { + .row + .row h4 { margin-top: unit(@grid_gutter-width / @size-iv, em); } + // Large desktop size. .respond-to-min(@bp-lg-min, { .row + .row h2 { margin-top: unit( @grid_gutter-width * 1.5 / @size-ii, em ); @@ -173,16 +163,8 @@ }); } + // Mobile only. .respond-to-max(@bp-xs-max, { - .inset-row { - display: flex; - flex-direction: column-reverse; - - .m-inset { - margin-top: unit( @grid_gutter-width / @base-font-size-px, em ); - } - } - .related-questions { margin: unit( @grid_gutter-width / @base-font-size-px, em ) 0; }