From 060f5afdf176e625bab43b7e26c73b6ccc4f1a22 Mon Sep 17 00:00:00 2001 From: Kelvin Chu Date: Fri, 29 Jan 2016 21:30:25 -0600 Subject: [PATCH] Fixed Bug with Chrome https://github.com/angular/material/issues/6841 --- .gitignore | 1 + main/.idea/workspace.xml | 96 ++++++++++++++++----------- main/main/settings.py | 2 +- main/static/css/styles.css | 5 ++ main/static/partials/dishes/dish.html | 3 +- 5 files changed, 66 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index 96374c4..d668dfb 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ $RECYCLE.BIN/ Network Trash Folder Temporary Items .apdisk +main/.idea/workspace.xml diff --git a/main/.idea/workspace.xml b/main/.idea/workspace.xml index 72b7191..34d42be 100644 --- a/main/.idea/workspace.xml +++ b/main/.idea/workspace.xml @@ -2,13 +2,11 @@ + + - - - - - + @@ -49,7 +47,7 @@ - + @@ -60,7 +58,7 @@ - + @@ -69,18 +67,38 @@ - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + @@ -143,7 +161,6 @@ @@ -195,6 +213,7 @@ + @@ -695,7 +714,6 @@ - @@ -1034,7 +1052,7 @@ - + @@ -1334,20 +1352,6 @@ - - - - - - - - - - - - - - @@ -1411,6 +1415,22 @@ + + + + + + + + + + + + + + + + @@ -1421,7 +1441,7 @@ - + @@ -1430,23 +1450,23 @@ - + - + - - + + - + - - + + diff --git a/main/main/settings.py b/main/main/settings.py index c7244c8..c18bfd7 100644 --- a/main/main/settings.py +++ b/main/main/settings.py @@ -22,7 +22,7 @@ SECRET_KEY = '2$-lf*xo-fuko^%*i^v7w99qqe2tu@!*a(gnqmcr+u3q84mlxs' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True +DEBUG = False ALLOWED_HOSTS = ['www.cravus.com', 'cravus.com', 'dev.cravus.com', '52.35.198.169'] diff --git a/main/static/css/styles.css b/main/static/css/styles.css index 5841e91..c2aae72 100644 --- a/main/static/css/styles.css +++ b/main/static/css/styles.css @@ -25,6 +25,11 @@ body { overflow-y: scroll; } +img { + min-height: 0; + min-width: 0; +} + h1 { font-family: 'Playfair Display', serif; font-weight: 900; diff --git a/main/static/partials/dishes/dish.html b/main/static/partials/dishes/dish.html index 782a201..c56934f 100644 --- a/main/static/partials/dishes/dish.html +++ b/main/static/partials/dishes/dish.html @@ -8,8 +8,7 @@ - Washed Out + Washed Out +{{ card.chef }}