From 37b1adc7a5ca4d807a68101d2979de56e582c452 Mon Sep 17 00:00:00 2001 From: Lucas Cimon Date: Thu, 8 Mar 2018 18:09:39 +0100 Subject: [PATCH] Adding support for AVATARS --- gen_statics_bundles.py | 5 +++-- ...TSHA1-b785cd8.css => bundle-SHORTSHA1-e07d6a1.css} | 6 ++++++ static/main.css | 6 ++++++ templates/base.html | 11 ++++++++++- 4 files changed, 25 insertions(+), 3 deletions(-) rename static/{bundle-SHORTSHA1-b785cd8.css => bundle-SHORTSHA1-e07d6a1.css} (99%) diff --git a/gen_statics_bundles.py b/gen_statics_bundles.py index 05dadd3..69baf13 100755 --- a/gen_statics_bundles.py +++ b/gen_statics_bundles.py @@ -15,7 +15,7 @@ def sed(filepath, pattern, value): f.truncate() -# Generating CSS bundle +print('Generating CSS bundle') short_hash = sha1(cat('static/main.css')).hexdigest()[:7] sed('templates/base.html', '-SHORTSHA1-[a-z0-9]+.css', '-SHORTSHA1-{}.css'.format(short_hash)) bundle_filename = 'bundle-SHORTSHA1-{}.css'.format(short_hash) @@ -24,7 +24,7 @@ with open('static/' + bundle_filename, 'wb') as bundle: bundle.write(cat('static/csslibs/solarized-highlight.css')) bundle.write(cat('static/main.css')) -# Generating JS bundle +print('Generating JS bundle') short_hash = sha1(cat('static/js/social.js') + cat('static/js/filter-tags.js')).hexdigest()[:7] sed('templates/base.html', '-SHORTSHA1-[a-z0-9]+.js', '-SHORTSHA1-{}.js'.format(short_hash)) for SHARE, MG_FILTER_TAGS in itertools.product(range(2), repeat=2): @@ -41,3 +41,4 @@ for SHARE, MG_FILTER_TAGS in itertools.product(range(2), repeat=2): bundle.write(cat('static/js/social.js')) if MG_FILTER_TAGS: bundle.write(cat('static/js/filter-tags.js')) + diff --git a/static/bundle-SHORTSHA1-b785cd8.css b/static/bundle-SHORTSHA1-e07d6a1.css similarity index 99% rename from static/bundle-SHORTSHA1-b785cd8.css rename to static/bundle-SHORTSHA1-e07d6a1.css index ae93d35..834a1ec 100644 --- a/static/bundle-SHORTSHA1-b785cd8.css +++ b/static/bundle-SHORTSHA1-e07d6a1.css @@ -389,6 +389,12 @@ a { .mg-cloud-tag-badge { color: #d14905; } +img.mg-avatar { + display: inline-block; + max-width: 48%; + padding: .3rem; +} + .mg-fadeable { max-height: 100vh; diff --git a/static/main.css b/static/main.css index 9a8c894..5a663f2 100644 --- a/static/main.css +++ b/static/main.css @@ -304,6 +304,12 @@ a { .mg-cloud-tag-badge { color: #d14905; } +img.mg-avatar { + display: inline-block; + max-width: 48%; + padding: .3rem; +} + .mg-fadeable { max-height: 100vh; diff --git a/templates/base.html b/templates/base.html index d063a38..f042e52 100644 --- a/templates/base.html +++ b/templates/base.html @@ -54,7 +54,7 @@ {% endif %} {% endblock %} - +