bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Fixed conferences page

Browse Source
This commit is contained in:
Godwin 2016-12-25 11:23:10 -08:00
parent acecac312f
commit 20bacdcc2d
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/stylesheets/_application.scss
View File

@ -3863,6 +3863,7 @@ body.policy .policy-agreement ul {
.list-view { .list-view {
ul { ul {
list-style: none; list-style: none;
padding: 0;
&.break { &.break {
border-top: 0.25em solid $light-gray; border-top: 0.25em solid $light-gray;
@ -4714,11 +4715,19 @@ html[data-ontop] {
li { li {
display: table-row; display: table-row;
&.not-public {
background-color: lighten($yellow, 33%);
}
} }
.info, .img { .info, .img {
display: table-cell; display: table-cell;
} }
.info {
padding-left: 1em;
}
} }
.workshop-list { .workshop-list {

6
app/assets/stylesheets/_settings.scss
View File

@ -20,6 +20,12 @@ $mid-gray: #888;
// $red: #B24C63; // $red: #B24C63;
$red: #FF5A5F; $red: #FF5A5F;
$blue: $colour-1;
$pink: $colour-2;
$yellow: $colour-3;
$orange: $colour-4;
$green: $colour-5;
$link-colour: darken($colour-1, 13%); $link-colour: darken($colour-1, 13%);
@mixin default-box-shadow($direction: top, $distance: 1, $inset: false, $additional-shadow: false) { @mixin default-box-shadow($direction: top, $distance: 1, $inset: false, $additional-shadow: false) {

5
app/views/conferences/list.html.haml
View File

@ -21,12 +21,13 @@
%h3=_"articles.conferences.headings.types.#{type.to_s}", :t %h3=_"articles.conferences.headings.types.#{type.to_s}", :t
%ul %ul
- list.each do | conference | - list.each do | conference |
%li.conference{id: "conference-#{conference.id}", data: {a: conference.city.latitude, o: conference.city.longitude, y: conference.year, t: conference.conferencetype}} %li.conference{id: "conference-#{conference.id}", data: {a: conference.city.latitude, o: conference.city.longitude, y: conference.year, t: conference.conferencetype}, class: conference.is_public ? nil : 'not-public'}
.info .info
%h4.title= conference.title %h4.title= conference.title
.conference-details .conference-details
.location=location(conference.city) .location=location(conference.city)
.date= date_span(conference.start_date.to_date, conference.end_date.to_date) - if conference.start_date.present? && conference.end_date.present?
.date= date_span(conference.start_date.to_date, conference.end_date.to_date)
.actions .actions
= link_to (_'articles.workshops.info.read_more'), conference_path(conference.slug), class: ['button', 'conference-link', 'small'] = link_to (_'articles.workshops.info.read_more'), conference_path(conference.slug), class: ['button', 'conference-link', 'small']
- if logged_in? - if logged_in?

2
config/routes.rb
View File

@ -67,7 +67,7 @@ BikeBike::Application.routes.draw do
get '/humans.txt' => 'application#humans', as: :humans_txt get '/humans.txt' => 'application#humans', as: :humans_txt
# Error pages # Error pages
post '/js_error' => 'application#js_error' match '/js_error' => 'application#js_error', via: [:get, :post]
get '/error_403' => 'application#do_403' unless Rails.env.production? get '/error_403' => 'application#do_403' unless Rails.env.production?
get '/error_404' => 'application#error_404' unless Rails.env.production? get '/error_404' => 'application#error_404' unless Rails.env.production?
get '/error_500' => 'application#error_500' unless Rails.env.production? get '/error_500' => 'application#error_500' unless Rails.env.production?