diff options
Diffstat (limited to 'design')
-rw-r--r-- | design/old/v6/_480.sass (renamed from design/sass/v6/_480.sass) | 0 | ||||
-rw-r--r-- | design/old/v6/_768.sass (renamed from design/sass/v6/_768.sass) | 0 | ||||
-rw-r--r-- | design/old/v6/_992.sass (renamed from design/sass/v6/_992.sass) | 0 | ||||
-rw-r--r-- | design/old/v6/_leaflet.scss (renamed from design/sass/v6/_leaflet.scss) | 0 | ||||
-rw-r--r-- | design/old/v6/_mixins.sass (renamed from design/sass/v6/_mixins.sass) | 0 | ||||
-rw-r--r-- | design/old/v6/_typography.sass (renamed from design/sass/v6/_typography.sass) | 0 | ||||
-rw-r--r-- | design/old/v6/ie.sass (renamed from design/sass/v6/ie.sass) | 0 | ||||
-rw-r--r-- | design/old/v6/stylesv6.sass (renamed from design/sass/v6/stylesv6.sass) | 0 | ||||
-rw-r--r-- | design/old/v8/_birds.scss (renamed from design/sass/v8/_birds.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_books.scss (renamed from design/sass/v8/_books.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_figments.scss (renamed from design/sass/v8/_figments.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_fonts.scss (renamed from design/sass/v8/_fonts.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_footer.scss (renamed from design/sass/v8/_footer.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_global.scss (renamed from design/sass/v8/_global.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_header.scss (renamed from design/sass/v8/_header.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_homepage.scss (renamed from design/sass/v8/_homepage.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_house.scss (renamed from design/sass/v8/_house.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_inbox.scss (renamed from design/sass/v8/_inbox.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_leaflet.scss (renamed from design/sass/v8/_leaflet.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_mailing-list.scss (renamed from design/sass/v8/_mailing-list.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_map.scss (renamed from design/sass/v8/_map.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_mixins.scss (renamed from design/sass/v8/_mixins.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_normalize.scss (renamed from design/sass/v8/_normalize.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_notes.scss (renamed from design/sass/v8/_notes.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_pagination.scss (renamed from design/sass/v8/_pagination.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_photos.scss (renamed from design/sass/v8/_photos.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_projects.scss (renamed from design/sass/v8/_projects.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_queries.scss (renamed from design/sass/v8/_queries.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_resume.scss (renamed from design/sass/v8/_resume.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_src.scss (renamed from design/sass/v8/_src.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_writing_archive.scss (renamed from design/sass/v8/_writing_archive.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/_writing_details.scss (renamed from design/sass/v8/_writing_details.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/iev8.scss (renamed from design/sass/v8/iev8.scss) | 0 | ||||
-rw-r--r-- | design/old/v8/screenv8.scss (renamed from design/sass/v8/screenv8.scss) | 0 | ||||
-rw-r--r-- | design/sass/_comments.scss | 65 | ||||
-rw-r--r-- | design/sass/_details.scss | 2 | ||||
-rw-r--r-- | design/sass/_fonts.scss | 1 | ||||
-rw-r--r-- | design/sass/_forms.scss | 50 | ||||
-rw-r--r-- | design/templates/base.html | 8 | ||||
-rw-r--r-- | design/templates/comments/form.html | 20 |
40 files changed, 77 insertions, 69 deletions
diff --git a/design/sass/v6/_480.sass b/design/old/v6/_480.sass index 3d426ca..3d426ca 100644 --- a/design/sass/v6/_480.sass +++ b/design/old/v6/_480.sass diff --git a/design/sass/v6/_768.sass b/design/old/v6/_768.sass index 9c4f8b8..9c4f8b8 100644 --- a/design/sass/v6/_768.sass +++ b/design/old/v6/_768.sass diff --git a/design/sass/v6/_992.sass b/design/old/v6/_992.sass index 9cb47a3..9cb47a3 100644 --- a/design/sass/v6/_992.sass +++ b/design/old/v6/_992.sass diff --git a/design/sass/v6/_leaflet.scss b/design/old/v6/_leaflet.scss index b65ffb8..b65ffb8 100644 --- a/design/sass/v6/_leaflet.scss +++ b/design/old/v6/_leaflet.scss diff --git a/design/sass/v6/_mixins.sass b/design/old/v6/_mixins.sass index cbc8bdc..cbc8bdc 100644 --- a/design/sass/v6/_mixins.sass +++ b/design/old/v6/_mixins.sass diff --git a/design/sass/v6/_typography.sass b/design/old/v6/_typography.sass index 64f25fc..64f25fc 100644 --- a/design/sass/v6/_typography.sass +++ b/design/old/v6/_typography.sass diff --git a/design/sass/v6/ie.sass b/design/old/v6/ie.sass index 8ba7172..8ba7172 100644 --- a/design/sass/v6/ie.sass +++ b/design/old/v6/ie.sass diff --git a/design/sass/v6/stylesv6.sass b/design/old/v6/stylesv6.sass index 41ed20f..41ed20f 100644 --- a/design/sass/v6/stylesv6.sass +++ b/design/old/v6/stylesv6.sass diff --git a/design/sass/v8/_birds.scss b/design/old/v8/_birds.scss index c50b22e..c50b22e 100644 --- a/design/sass/v8/_birds.scss +++ b/design/old/v8/_birds.scss diff --git a/design/sass/v8/_books.scss b/design/old/v8/_books.scss index db38624..db38624 100644 --- a/design/sass/v8/_books.scss +++ b/design/old/v8/_books.scss diff --git a/design/sass/v8/_figments.scss b/design/old/v8/_figments.scss index e834469..e834469 100644 --- a/design/sass/v8/_figments.scss +++ b/design/old/v8/_figments.scss diff --git a/design/sass/v8/_fonts.scss b/design/old/v8/_fonts.scss index dfe632a..dfe632a 100644 --- a/design/sass/v8/_fonts.scss +++ b/design/old/v8/_fonts.scss diff --git a/design/sass/v8/_footer.scss b/design/old/v8/_footer.scss index 9bfe4b7..9bfe4b7 100644 --- a/design/sass/v8/_footer.scss +++ b/design/old/v8/_footer.scss diff --git a/design/sass/v8/_global.scss b/design/old/v8/_global.scss index c5b7ca2..c5b7ca2 100644 --- a/design/sass/v8/_global.scss +++ b/design/old/v8/_global.scss diff --git a/design/sass/v8/_header.scss b/design/old/v8/_header.scss index 10174e3..10174e3 100644 --- a/design/sass/v8/_header.scss +++ b/design/old/v8/_header.scss diff --git a/design/sass/v8/_homepage.scss b/design/old/v8/_homepage.scss index db375ed..db375ed 100644 --- a/design/sass/v8/_homepage.scss +++ b/design/old/v8/_homepage.scss diff --git a/design/sass/v8/_house.scss b/design/old/v8/_house.scss index a0604b6..a0604b6 100644 --- a/design/sass/v8/_house.scss +++ b/design/old/v8/_house.scss diff --git a/design/sass/v8/_inbox.scss b/design/old/v8/_inbox.scss index c1801d9..c1801d9 100644 --- a/design/sass/v8/_inbox.scss +++ b/design/old/v8/_inbox.scss diff --git a/design/sass/v8/_leaflet.scss b/design/old/v8/_leaflet.scss index b65ffb8..b65ffb8 100644 --- a/design/sass/v8/_leaflet.scss +++ b/design/old/v8/_leaflet.scss diff --git a/design/sass/v8/_mailing-list.scss b/design/old/v8/_mailing-list.scss index 561c059..561c059 100644 --- a/design/sass/v8/_mailing-list.scss +++ b/design/old/v8/_mailing-list.scss diff --git a/design/sass/v8/_map.scss b/design/old/v8/_map.scss index f7d958b..f7d958b 100644 --- a/design/sass/v8/_map.scss +++ b/design/old/v8/_map.scss diff --git a/design/sass/v8/_mixins.scss b/design/old/v8/_mixins.scss index 0e29edf..0e29edf 100644 --- a/design/sass/v8/_mixins.scss +++ b/design/old/v8/_mixins.scss diff --git a/design/sass/v8/_normalize.scss b/design/old/v8/_normalize.scss index c451141..c451141 100644 --- a/design/sass/v8/_normalize.scss +++ b/design/old/v8/_normalize.scss diff --git a/design/sass/v8/_notes.scss b/design/old/v8/_notes.scss index ef49655..ef49655 100644 --- a/design/sass/v8/_notes.scss +++ b/design/old/v8/_notes.scss diff --git a/design/sass/v8/_pagination.scss b/design/old/v8/_pagination.scss index 404aeb7..404aeb7 100644 --- a/design/sass/v8/_pagination.scss +++ b/design/old/v8/_pagination.scss diff --git a/design/sass/v8/_photos.scss b/design/old/v8/_photos.scss index d152bf4..d152bf4 100644 --- a/design/sass/v8/_photos.scss +++ b/design/old/v8/_photos.scss diff --git a/design/sass/v8/_projects.scss b/design/old/v8/_projects.scss index 0bf4db2..0bf4db2 100644 --- a/design/sass/v8/_projects.scss +++ b/design/old/v8/_projects.scss diff --git a/design/sass/v8/_queries.scss b/design/old/v8/_queries.scss index db165ae..db165ae 100644 --- a/design/sass/v8/_queries.scss +++ b/design/old/v8/_queries.scss diff --git a/design/sass/v8/_resume.scss b/design/old/v8/_resume.scss index 37cc20e..37cc20e 100644 --- a/design/sass/v8/_resume.scss +++ b/design/old/v8/_resume.scss diff --git a/design/sass/v8/_src.scss b/design/old/v8/_src.scss index 2be4ef3..2be4ef3 100644 --- a/design/sass/v8/_src.scss +++ b/design/old/v8/_src.scss diff --git a/design/sass/v8/_writing_archive.scss b/design/old/v8/_writing_archive.scss index 69397b1..69397b1 100644 --- a/design/sass/v8/_writing_archive.scss +++ b/design/old/v8/_writing_archive.scss diff --git a/design/sass/v8/_writing_details.scss b/design/old/v8/_writing_details.scss index 9ba4015..9ba4015 100644 --- a/design/sass/v8/_writing_details.scss +++ b/design/old/v8/_writing_details.scss diff --git a/design/sass/v8/iev8.scss b/design/old/v8/iev8.scss index 574ab55..574ab55 100644 --- a/design/sass/v8/iev8.scss +++ b/design/old/v8/iev8.scss diff --git a/design/sass/v8/screenv8.scss b/design/old/v8/screenv8.scss index 71988d2..71988d2 100644 --- a/design/sass/v8/screenv8.scss +++ b/design/old/v8/screenv8.scss diff --git a/design/sass/_comments.scss b/design/sass/_comments.scss index 1e254d6..7abbe83 100644 --- a/design/sass/_comments.scss +++ b/design/sass/_comments.scss @@ -62,61 +62,28 @@ p { font-family: $fancy_serif; } -} -.comment--form--header { - margin-top: 2em; -} -.comment--form { - margin: 0 auto; - @include breakpoint(delta) { - margin-left: 20% - } - label { - display: block; - font-weight: 500; - letter-spacing: 1px; - font-family: "Helvetica Neue Light","Helvetica Neue",Helvetica,Arial,"Lucida Grande",sans-serif; - @include fontsize(13); - } - input, textarea { - padding: .25em; - border: #c5c5c5 1px solid; - border-radius: .125em; - color: darken($body_font_light, 20); - width: 100%; - @include breakpoint(gamma) { - width: 70%; - } - } input[type="submit"] { + display: inline-block; + @include fancy_sans; + @include fontsize(14); + font-weight: 600; width: auto; - color: white; - letter-spacing: 1px; - background: $orange; - font: bold .65em Verdana,sans-serif; text-transform: uppercase; - border: none; - border-radius: .25em; padding: 8px 12px 7px; } - blockquote { - margin: 3em 0; - p { - @include fontsize(18); - } + .submit { + @extend %clearfix; + display: block; + margin-right: 0; } - h2, h3 { text-align: left} -} -.comment--form--header-h1 { - @include breakpoint(delta) { - text-align: left; - margin-left: 30%; - @include fontsize(24); + .submit .btn { + float: right; + &:first-of-type { + margin-left: 5px; + } } } -.cform-arc { - @include breakpoint(delta) { - margin-left: 30%; - } +.comment--form--header { + margin-top: 2em; } - + diff --git a/design/sass/_details.scss b/design/sass/_details.scss index fe1d618..d5681c6 100644 --- a/design/sass/_details.scss +++ b/design/sass/_details.scss @@ -8,7 +8,7 @@ @include constrain_narrow; margin-top: 4rem; h1 { - font-family: mffweb, Georgia, 'Times New Roman', serif; + font-family: $fancy_serif; line-height: 1em; letter-spacing: -1px; @include fontsize(48); diff --git a/design/sass/_fonts.scss b/design/sass/_fonts.scss index 95fe2e2..77f6f7c 100644 --- a/design/sass/_fonts.scss +++ b/design/sass/_fonts.scss @@ -24,6 +24,7 @@ font-style: italic; } + @font-face { font-family: 'mffnweb'; src: url('/media/fonts/ffmn.woff2') format('woff2'); diff --git a/design/sass/_forms.scss b/design/sass/_forms.scss index 80e630c..2511a7d 100644 --- a/design/sass/_forms.scss +++ b/design/sass/_forms.scss @@ -52,3 +52,53 @@ .flex { display: flex; } + + +form fieldset { + margin: 1rem 0; + padding: 0; + border: none; + width: 100%; + position: relative; +} +form fieldset label { + position: absolute; + -webkit-transform: translate3d(10px, 100%); + -moz-transform: translate3d(10px, 100%); + -ms-transform: translate3d(10px, 100%); + -o-transform: translate3d(10px, 100%); + transform: translate3d(10px, 100%); + @include fontsize(14); + @include fancy_sans; + color: lighten($body_font_color, 25); + line-height: 14px; + top: .7rem; + left: .75rem; + z-index: 1; +} +input, .textarea-rounded textarea { + border: 1px solid #dedddd; + border-radius: 4px; + padding: 2.2rem 0 .75rem .75rem; + width: 99%; + @include fontsize(24); + @include fancy_sans; +} + +.btn { + @include fontsize(15); + display: inline-block; + border-radius: 4px; + -webkit-appearance: none; + text-decoration: none; + cursor: pointer; + background: $link_color; + color: #fff; + border: 1px solid $link_color; + padding: 7px 9px; + white-space: nowrap; + &:hover { + background: $link_color; + border: 1px solid $link_color; + } +} diff --git a/design/templates/base.html b/design/templates/base.html index 9c665ae..4c7ddac 100644 --- a/design/templates/base.html +++ b/design/templates/base.html @@ -9,9 +9,6 @@ <meta name="description" content="{% block metadescription %}Luxagraf: recording journeys around the world and just next door.{% endblock %}"> <meta name="author" content="Scott Gilbertson"> - <!--[if IE]> - <script src="/js/html5css3ie.min.js"></script> - <![endif]--> <link rel="alternate" type="application/rss+xml" title="Luxagraf RSS feed" @@ -19,11 +16,6 @@ {%block stylesheet%}<link rel="stylesheet" href="/media/screenv9.css" media="screen">{%endblock%} - <!--[if IE]> - <link rel="stylesheet" - href="/media/css/ie.css" - media="screen"> - <![endif]--> <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> <link rel="manifest" href="/manifest.webmanifest" /> {%block extrahead%}{%endblock%} diff --git a/design/templates/comments/form.html b/design/templates/comments/form.html index dcb83d4..6bc0edf 100644 --- a/design/templates/comments/form.html +++ b/design/templates/comments/form.html @@ -6,20 +6,18 @@ <input type="hidden" name="rder" value="{{ form.instance.content_object.get_absolute_url }}" /> {% for field in form %} {% if field.is_hidden %} - <div>{{ field }}</div> + {{ field }} {% else %} - {% if field.errors %}{{ field.errors }}{% endif %} - <p - {% if field.errors %} class="error"{% endif %} - {% ifequal field.name "honeypot" %} style="display:none;"{% endifequal %}> - {{ field.label_tag }} {{ field }} - </p> + <fieldset {% if field.errors %} class="error"{% endif %} {% ifequal field.name "honeypot" %} style="display:none;"{% endifequal %}> + {{ field.label_tag }} + {%ifequal field.name "comment"%}<div class="textarea-rounded">{{ field }}</div>{%else%}{{field}}{%endifequal%} + </fieldset> {% endif %} {% endfor %} - <p class="submit"> - <input type="submit" name="post" class="submit-post" value="{% trans "Post" %}" /> - <input type="submit" name="preview" class="submit-preview" value="{% trans "Preview" %}" /> - </p> + <div class="submit"> + <input type="submit" name="post" class="submit-post btn" value="{% trans "Post" %}" /> + <input type="submit" name="preview" class="submit-preview btn" value="{% trans "Preview" %}" /> + </div> </form> <p style="font-size: 95%;"><strong>All comments are moderated</strong>, so you won’t see it right away. And please remember Kurt Vonnegut's rule: “god damn it, you’ve got to be kind.” You can use Markdown or HTML to format your comments. The allowed tags are <code><b>, <i>, <em>, <strong>, <a></code>. To create a new paragraph hit return twice. </p> </div> |