pull/26/head
David Ray 2017-02-11 17:30:56 -05:00
commit ef4274756a
6 zmienionych plików z 33 dodań i 10 usunięć

Wyświetl plik

@ -0,0 +1,21 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.10.5 on 2017-02-11 22:29
from __future__ import unicode_literals
import django.core.validators
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('locations', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='locationpage',
name='lat_long',
field=models.CharField(help_text="Comma separated lat/long. (Ex. 64.144367, -21.939182) Right click Google Maps and click 'What's Here'", max_length=36, validators=[django.core.validators.RegexValidator(code='invalid_lat_long', message='Lat Long must be a comma separated numeric lat and long', regex='^(\\-?\\d+(\\.\\d+)?),\\s*(\\-?\\d+(\\.\\d+)?)$')]),
),
]

Wyświetl plik

@ -491,3 +491,8 @@ li.has-submenu a.allow-toggle {
content: "\00BB";
}
/* Mobile nav */
.navbar-toggle .icon-bar {
background-color: #fff;
}

Wyświetl plik

@ -1,5 +0,0 @@
.hero{
height: 600px;
background-size: cover;
background-position: center;
}

Wyświetl plik

@ -39,7 +39,6 @@
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
<script src="{% static 'js/bakery.js' %}"></script>
<!-- Theme JavaScript -->
<script src="{% static 'js/clean-blog.min.js' %}"></script>

Wyświetl plik

@ -31,10 +31,7 @@
<link href="https://fonts.googleapis.com/css?family=Alegreya:400,700|Lato:300,400,700,900" rel="stylesheet">
<!-- Theme CSS -->
{# <link href="css/clean-blog.min.css" rel="stylesheet">#}
<link rel="stylesheet" type="text/css" href="{% static 'css/main.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/main2.css' %}">
<link href='https://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800' rel='stylesheet' type='text/css'>

Wyświetl plik

@ -4,6 +4,12 @@
<div class="row">
<div class="col-lg-12">
<a href="#" class="logo">The Wagtail Bakery</a>
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#main-navigation" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<form action="/search" method="get" class="search" _lpchecked="1">
<input name="q" type="text" placeholder="Search the site" id="" aria-label="Search the site" autocomplete="off">
<a href="#" class="search-icon">
@ -12,7 +18,7 @@
</form>
{% block main_navigation %}
<nav>
<nav class="collapse navbar-collapse" id="main-navigation">
<ul class="nav nav-pills">
{% get_site_root as site_root %}
{% top_menu parent=site_root calling_page=self %}