Skip to content
This repository has been archived by the owner on Jun 20, 2022. It is now read-only.

Replace manuals accordion with gem accordion #1060

Merged
merged 4 commits into from
Feb 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ updates:
- dependency-name: slimmer
dependency-type: direct
# Framework gems
- dependency-name: jasmine
dependency-type: direct
- dependency-name: rails
dependency-type: direct
- dependency-name: rspec-rails
Expand Down
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ end

group :development, :test do
gem "govuk_test"
gem "jasmine"
gem "jasmine_selenium_runner"
gem "pry-byebug"
gem "rspec-rails"
gem "rubocop-govuk"
Expand Down
12 changes: 0 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,6 @@ GEM
domain_name (~> 0.5)
i18n (1.8.8)
concurrent-ruby (~> 1.0)
jasmine (3.6.0)
jasmine-core (~> 3.6.0)
phantomjs
rack (>= 1.2.1)
rake
jasmine-core (3.6.0)
jasmine_selenium_runner (3.0.0)
jasmine (~> 3.0)
selenium-webdriver (~> 3.8)
json (2.5.1)
json-schema (2.8.1)
addressable (>= 2.4)
Expand Down Expand Up @@ -180,7 +171,6 @@ GEM
parallel (1.19.2)
parser (2.7.2.0)
ast (~> 2.4.1)
phantomjs (2.1.1.0)
plek (4.0.0)
pry (0.13.1)
coderay (~> 1.1)
Expand Down Expand Up @@ -353,8 +343,6 @@ DEPENDENCIES
govuk_app_config
govuk_publishing_components
govuk_test
jasmine
jasmine_selenium_runner
launchy
plek
pry-byebug
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ If you are using the GDS development virtual machine then the application will b

The test suite includes testing against govuk-content-schemas, so you will need a copy of this repo on your file system. By default this should be in a sibling directory to your project. Alternatively, you can specify their location with the GOVUK_CONTENT_SCHEMAS_PATH environment variable.

jasmine tests are mounted at http://manuals-frontend.dev.gov.uk/specs

All tests can be run using `bundle exec rake` as well.

## Viewing a manual
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ require File.expand_path("config/application", __dir__)
Rails.application.load_tasks

Rake::Task[:default].clear if Rake::Task.task_defined?(:default)
task default: %i[lint spec jasmine:ci]
task default: %i[lint spec]
6 changes: 1 addition & 5 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
//= require govuk_publishing_components/lib
//= require govuk_publishing_components/components/accordion
//= require govuk_publishing_components/components/button
//= require govuk_publishing_components/components/feedback
//= require govuk_publishing_components/components/govspeak
//= require_tree ./modules

jQuery(function ($) {
'use strict'
GOVUK.primaryLinks.init('.primary-item')

$('.js-collapsible-collection').each(function () {
new GOVUK.CollapsibleCollection({ $el: $(this) }) // eslint-disable-line no-new
})
})
56 changes: 0 additions & 56 deletions app/assets/javascripts/modules/collapsible.js

This file was deleted.

195 changes: 0 additions & 195 deletions app/assets/javascripts/modules/collapsible_collection.js

This file was deleted.

16 changes: 0 additions & 16 deletions app/assets/stylesheets/_manuals-print.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ a {
// hide all the unnecessary things
.alpha-label,
.breadcrumb-trail,
.js-title-controls-wrap,
.print-page,
.secondary .feedback,
.in-manual-search {
Expand Down Expand Up @@ -55,18 +54,3 @@ a {
.govspeak {
width: 75%;
}

.js-openable {
margin-bottom: 30px;

h2 button {
font-family: "nta", Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-size: 18px;
line-height: 1.25;
font-weight: bold;
border: none;
padding-left: 0;
}
}
Loading