diff options
| -rw-r--r-- | app/jrnl/models.py | 4 | ||||
| -rw-r--r-- | app/photos/migrations/0010_auto_20160517_0906.py | 30 | ||||
| -rw-r--r-- | design/sass/_fonts.scss | 40 | ||||
| -rw-r--r-- | design/sass/_mixins.scss | 5 | ||||
| -rw-r--r-- | design/sass/_writing_details.scss | 28 | ||||
| -rw-r--r-- | design/templates/details/entry.html | 2 |
6 files changed, 60 insertions, 49 deletions
diff --git a/app/jrnl/models.py b/app/jrnl/models.py index 08d0721..21b0c8c 100644 --- a/app/jrnl/models.py +++ b/app/jrnl/models.py @@ -107,8 +107,8 @@ class Entry(models.Model): (1, 'double'), (2, 'single-dark'), (3, 'double-dark'), - (4, 'bigimg'), - (5, 'bigimg-dark'), + (4, 'single-black'), + (5, 'double-black'), ) template_name = models.IntegerField(choices=TEMPLATES, default=0) diff --git a/app/photos/migrations/0010_auto_20160517_0906.py b/app/photos/migrations/0010_auto_20160517_0906.py new file mode 100644 index 0000000..0adf4ff --- /dev/null +++ b/app/photos/migrations/0010_auto_20160517_0906.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9 on 2016-05-17 09:06 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('photos', '0009_auto_20160320_0907'), + ] + + operations = [ + migrations.AddField( + model_name='luximage', + name='facebook_link', + field=models.CharField(blank=True, max_length=300, null=True), + ), + migrations.AddField( + model_name='luximage', + name='twitter_link', + field=models.CharField(blank=True, max_length=300, null=True), + ), + migrations.AlterField( + model_name='luximage', + name='sizes', + field=models.ManyToManyField(blank=True, to='photos.LuxImageSize'), + ), + ] diff --git a/design/sass/_fonts.scss b/design/sass/_fonts.scss index 0721356..dfe632a 100644 --- a/design/sass/_fonts.scss +++ b/design/sass/_fonts.scss @@ -8,43 +8,3 @@ font-style: normal; } - -@font-face { - font-family: "robotoslab"; - src: url("robotoslab-regular-webfont.eot"); - src: url("robotoslab-regular-webfont.eot?#iefix") format("embedded-opentype"), url("robotoslab-regular-webfont.woff") format("woff"), url("robotoslab-regular-webfont.ttf") format("truetype"); - font-weight: normal; - font-style: normal; -} - - -@font-face { - font-family: "robotoslab-bold"; - src: url("robotoslab-bold-webfont.eot"); - src: url("robotoslab-bold-webfont.eot?#iefix") format("embedded-opentype"), url("robotoslab-bold-webfont.woff") format("woff"), url("robotoslab-bold-webfont.ttf") format("truetype"); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'latoregular'; - src: url('lato-regular-webfont.eot'); - src: url('lato-regular-webfont.eot?#iefix') format('embedded-opentype'), - url('lato-regular-webfont.woff2') format('woff2'), - url('lato-regular-webfont.woff') format('woff'), - url('lato-regular-webfont.ttf') format('truetype'); - font-weight: normal; - font-style: normal; - -} -@font-face { - font-family: 'latobold'; - src: url('lato-bold-webfont.eot'); - src: url('lato-bold-webfont.eot?#iefix') format('embedded-opentype'), - url('lato-bold-webfont.woff2') format('woff2'), - url('lato-bold-webfont.woff') format('woff'), - url('lato-bold-webfont.ttf') format('truetype'); - font-weight: normal; - font-style: normal; - -} diff --git a/design/sass/_mixins.scss b/design/sass/_mixins.scss index ca60c3c..29b424e 100644 --- a/design/sass/_mixins.scss +++ b/design/sass/_mixins.scss @@ -32,11 +32,12 @@ $body_font_light: #b3aeae; } @mixin fancy-sans { - font-family: latoregular, sans-serif; + font-family: Helvetica, sans-serif; } @mixin fancy-sans-bold { - font-family: latobold, sans-serif; + font-family: Helvetica, sans-serif; + font-weight: 600; } %clearfix { diff --git a/design/sass/_writing_details.scss b/design/sass/_writing_details.scss index bf4c33e..c34f0c3 100644 --- a/design/sass/_writing_details.scss +++ b/design/sass/_writing_details.scss @@ -91,8 +91,7 @@ line-height: 1.9; text-align: right; @include fancy_sans; - @include fontsize(11); - font-weight: bold; + @include fontsize(12); text-transform: uppercase; letter-spacing: .5px; color: #999; @@ -105,9 +104,30 @@ padding: 0 2px; @include fontsize(16); } -.dark .footnote-ref { - padding: 0px 3px 0 4px; +.dark, .black { + .footnote-ref { + padding: 0px 3px 0 4px; + } + figure.picfull { + border-color: #424040; + } + figcaption { + color: #8F8B8B; + } } +.black { + .post--article { + color: #9C9292; + } + .post--article img { + padding: none; + background: none; + } + #page-navigation a { + color: $body_font_light; + } +} + //### Inline Maps ### #detail-map-canvas { diff --git a/design/templates/details/entry.html b/design/templates/details/entry.html index 2b8ec51..05e2004 100644 --- a/design/templates/details/entry.html +++ b/design/templates/details/entry.html @@ -33,7 +33,7 @@ {%endblock%} {%block htmlclass%}{% with object.template_name as t %} -class="{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%endif%}{%if t == 2 or t == 3 %} dark{%endif%}"{%endwith%}{%endblock%} +class="{%if t == 1 or t == 3 or t == 5 %}double{%else%}single{%endif%}{%if t == 2 or t == 3 %} dark{%endif%}{%if t == 4 or t == 5 %} black{%endif%}"{%endwith%}{%endblock%} {% block primary %} |