diff options
| author | Sarah German <sgerman@gitlab.com> | 2024-01-19 23:40:44 +0300 |
|---|---|---|
| committer | Sarah German <sgerman@gitlab.com> | 2024-01-19 23:40:44 +0300 |
| commit | 51cf665d91890bb8d0e3a0b6480f16c382bd9265 (patch) | |
| tree | 180c294a856b5c131a35791087f2c88aa12a90f9 | |
| parent | 568b2f09326250170aefc2ed4929fe83d84ef078 (diff) | |
Adjust styles and collapse by default1751-consolidate-feature-details
| -rw-r--r-- | content/assets/stylesheets/_typography.scss | 7 | ||||
| -rw-r--r-- | lib/filters/introduced_in.rb | 21 |
2 files changed, 12 insertions, 16 deletions
diff --git a/content/assets/stylesheets/_typography.scss b/content/assets/stylesheets/_typography.scss index c9bdb120..530f13eb 100644 --- a/content/assets/stylesheets/_typography.scss +++ b/content/assets/stylesheets/_typography.scss @@ -176,13 +176,14 @@ border-left: 2px solid $color-tanuki-light; padding-left: 0.75rem; margin-bottom: 1.5rem; + font-size: 0.875rem; + line-height: 1.65rem; ul, li, p { - font-size: 0.875rem; - margin-bottom: 0; - padding-bottom: 0.25rem; + margin: 0; + padding-bottom: 0; } } diff --git a/lib/filters/introduced_in.rb b/lib/filters/introduced_in.rb index 1e861ff6..3f81b0e4 100644 --- a/lib/filters/introduced_in.rb +++ b/lib/filters/introduced_in.rb @@ -43,19 +43,14 @@ class IntroducedInFilter < Nanoc::Filter def generate(content) @incremental_id += 1 - # If the content is a list of items, collapse the content. - if content.match?(%r{<ul>}i) - <<~HTML - <div class="introduced-in gl-mb-5"> - <div class="gl-mb-3">Feature availability<button class="text-expander" type="button" data-toggle="collapse" data-target="#release_version_notes_#{@incremental_id}" aria-expanded="false" aria-controls="release_version_notes_#{@incremental_id}" aria-label="Version history"></button> - </div> - <div class="introduced-in-content collapse" id="release_version_notes_#{@incremental_id}"> - #{content} - </div> + <<~HTML + <div class="introduced-in gl-mb-5"> + <div class="gl-mb-3">Feature availability<button class="text-expander" type="button" data-toggle="collapse" data-target="#release_version_notes_#{@incremental_id}" aria-expanded="false" aria-controls="release_version_notes_#{@incremental_id}" aria-label="Version history"></button> </div> - HTML - else - %(<div class="introduced-in">#{content}</div>) - end + <div class="introduced-in-content collapse" id="release_version_notes_#{@incremental_id}"> + #{content} + </div> + </div> + HTML end end |