Browse Source

Merge dev into bem

pull/22/head
Ned Zimmerman 8 years ago
parent
commit
c152c05a8c
  1. 2
      resources/assets/styles/common/_global.scss
  2. 6
      resources/assets/styles/components/_buttons.scss
  3. 2
      resources/views/partials/contact-form.blade.php
  4. 15
      resources/views/partials/front-page-catalog.blade.php

2
resources/assets/styles/common/_global.scss

@ -49,7 +49,7 @@ h2 {
--primary: $brand-primary;
--accent: $brand-accent;
--primary-fg: $white;
--secondary-fg: $white;
--accent-fg: $white;
--header-text: $black;
}

6
resources/assets/styles/components/_buttons.scss

@ -24,17 +24,17 @@
color: var(--primary, $brand-primary);
}
&.button-small {
&.button--small {
width: rem(150);
height: rem(40);
padding: rem(6.5);
}
&.button-wide {
&.button--wide {
width: 19.0625rem;
}
&.button-inverse {
&.button--outline {
background: $white;
color: var(--primary, $brand-primary);

2
resources/views/partials/contact-form.blade.php

@ -17,6 +17,6 @@
<p class="flex flex-row items-center @if(@$contact_form_response['field'] === 'message'){{ 'error' }}@endif">
<label class="clip" for="message">{{ __('Your message here', 'aldine' ) }}</label>
<textarea class="input-reset" type="text" placeholder="{{ __('Your message here', 'aldine' ) }}" name="message">@if($contact_form_response['status'] === 'error'){{ @esc_textarea($_POST['message']) }}@endif</textarea></p>
<p class="tc"><input class="button-reset button button-small button-inverse input-reset pointer" type="submit" value="{{ __('Send', 'aldine' ) }}" /></p>
<p class="tc"><input class="button-reset button button--small button--outline input-reset pointer" type="submit" value="{{ __('Send', 'aldine' ) }}" /></p>
</form>
</section>

15
resources/views/partials/front-page-catalog.blade.php

@ -0,0 +1,15 @@
<div id="latest-titles" class="latest-books">
<h3>{{ $latest_books_title }}</h3>
<div class="track">
<div class="books" data-total-pages="{{ $catalog_data['pages'] }}" @if($next_page <= $catalog_data['pages'])data-next-page="{{ $next_page }}"@endif>
@foreach($catalog_data['books'] as $book)
@include('partials.book', ['book' => $book])
@endforeach
</div>
@if($previous_page)<a class="previous" data-page="{{ $previous_page }}" href="{{ network_home_url("/page/$previous_page/#latest-titles") }}">@php(include get_theme_file_path() . '/dist/' . Aldine\svg_path('images/left-arrow.svg'))</a>@endif
@if($next_page <= $catalog_data['pages'])<a class="next" data-page="{{ $next_page }}" href="{{ network_home_url("/page/$next_page/#latest-titles") }}">@php(include get_theme_file_path() . '/dist/' . Aldine\svg_path('images/right-arrow.svg'))</a>@endif
</div>
<div class="catalog-link">
<a class="button button--outline button--wide" href="{{ network_home_url('/catalog/') }}">{{ __('View Complete Catalog', 'aldine') }}</a>
</div>
</div>
Loading…
Cancel
Save