Skip to content
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
5 changes: 5 additions & 0 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/* set grey background colour */
body {
background-color: #EBE9E8;
}

/*override margins set by design system*/
/* reset bottom margin for last child paragraph */
p:last-child {
Expand Down
7 changes: 0 additions & 7 deletions app/controllers/examples_controller.rb

This file was deleted.

8 changes: 0 additions & 8 deletions app/views/examples/index.html.erb

This file was deleted.

4 changes: 2 additions & 2 deletions app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<body class="brand-bicameral">
<%= render 'layouts/header/header' %>
<main id="main-content">
<div class="block block-page">
<div class="container-sm">
<div class="container my-3">
<div class="block block-page">
<%#= render 'library_design/debug/debug' %>
<%= yield %>
</div>
Expand Down
227 changes: 0 additions & 227 deletions app/views/shared/_examples.html.erb

This file was deleted.

11 changes: 4 additions & 7 deletions app/views/welcome/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
<% content_for(:before_title) do %>
<%= link_to('UK Parliament', root_path) %> / <%= link_to('Open data', root_path) %><br/>
<div id="top"></div>
<% end %>

<%= render '/shared/search_bar' %>

<div class="row">
<div class="col reading-width">
<h2>About this website</h2>
<p>This website is under development and may be unavailable at times.</p>
<p>We're working on a replacement for <%= link_to 'Parliamentary Search', 'https://search.parliament.uk/search' %>
<p>We're working on a replacement
for <%= link_to 'Parliamentary Search', 'https://search.parliament.uk/search' %>
(available to users on the Parliamentary network)
and <%= link_to 'Search Parliamentary Material', 'https://search-material.parliament.uk/' %> (the public-facing
and <%= link_to 'Search Parliamentary Material', 'https://search-material.parliament.uk/' %> (the
public-facing
version of Parliamentary Search).</p>
<p>Details of what we are working on can be found on
our <%= link_to 'Trello Board', 'https://trello.com/b/hP5FLFHA/search-frontend' %>.</p>
Expand Down
12 changes: 7 additions & 5 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,17 @@
# Defines the root path route ("/")
root 'welcome#index'
get 'welcome' => 'welcome#index', as: :home
get 'examples' => 'examples#index', as: :examples

get 'search' => 'search#index'
get 'objects' => 'content_type_objects#show', as: 'object_show'

get 'errors/500' => 'errors#internal_server_error'
get 'errors/404' => 'errors#not_found'
get 'errors/401' => 'errors#not_authorized'



get 'meta' => 'meta#index', as: :meta_list # nothing here yet
get 'meta/cookies' => 'meta#cookies', as: :meta_cookies # nothing here yet
get 'examples' => 'meta#examples', as: :examples
get 'meta' => 'meta#index', as: :meta_list
get 'cookies' => 'meta#cookies', as: :meta_cookies
get 'coverage' => 'meta#coverage', as: :coverage
get 'backlog' => 'meta#backlog', as: :backlog
end