summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/jrnl/migrations/0019_remove_entry_thumbnail.py17
-rw-r--r--app/jrnl/migrations/0020_auto_20180606_1058.py19
-rw-r--r--app/jrnl/migrations/0021_auto_20180606_1058.py19
-rw-r--r--design/sass/_homepage.scss2
4 files changed, 56 insertions, 1 deletions
diff --git a/app/jrnl/migrations/0019_remove_entry_thumbnail.py b/app/jrnl/migrations/0019_remove_entry_thumbnail.py
new file mode 100644
index 0000000..d964260
--- /dev/null
+++ b/app/jrnl/migrations/0019_remove_entry_thumbnail.py
@@ -0,0 +1,17 @@
+# Generated by Django 2.0.1 on 2018-06-06 10:58
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('jrnl', '0018_auto_20180303_1037'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='entry',
+ name='thumbnail',
+ ),
+ ]
diff --git a/app/jrnl/migrations/0020_auto_20180606_1058.py b/app/jrnl/migrations/0020_auto_20180606_1058.py
new file mode 100644
index 0000000..7575d4f
--- /dev/null
+++ b/app/jrnl/migrations/0020_auto_20180606_1058.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.0.1 on 2018-06-06 10:58
+
+from django.db import migrations, models
+import jrnl.models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('jrnl', '0019_remove_entry_thumbnail'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='entry',
+ name='image',
+ field=models.FileField(blank=True, help_text='should be 520 by 290', upload_to=jrnl.models.get_upload_path),
+ ),
+ ]
diff --git a/app/jrnl/migrations/0021_auto_20180606_1058.py b/app/jrnl/migrations/0021_auto_20180606_1058.py
new file mode 100644
index 0000000..ab42290
--- /dev/null
+++ b/app/jrnl/migrations/0021_auto_20180606_1058.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.0.1 on 2018-06-06 10:58
+
+from django.db import migrations, models
+import jrnl.models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('jrnl', '0020_auto_20180606_1058'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='entry',
+ name='image',
+ field=models.FileField(blank=True, help_text='should be 520 by 290', null=True, upload_to=jrnl.models.get_upload_path),
+ ),
+ ]
diff --git a/design/sass/_homepage.scss b/design/sass/_homepage.scss
index 96e88e1..db375ed 100644
--- a/design/sass/_homepage.scss
+++ b/design/sass/_homepage.scss
@@ -50,7 +50,7 @@
margin-bottom: 20px;
max-width: 100%;
}
- .odd, .even { margin-left: 0; margin-right: 0; padding-left: 0;}
+ .odd, .even { margin-left: 0; margin-right: 0; padding-left: 0; min-height: 270px;}
@include breakpoint(delta) {
margin-left: 0;
float: right;