From 7be0d5fef7ef2d08a576ebfeffdcc1edbc1a5429 Mon Sep 17 00:00:00 2001 From: chimchooree Date: Wed, 7 Oct 2020 16:32:13 -0500 Subject: [PATCH] article uses article css --- src/diary/entries/201003 | 2 -- src/diary/entries/raw/entries/200918 | 32 ++++++++++++++++++++++++++-- src/diary/entries/raw/entries/201003 | 2 -- src/index.py | 2 +- src/static/css/feature.css | 2 +- src/views/feature.tpl | 5 ++--- src/views/frame.tpl | 13 ++++++++++- src/views/logo-bar.tpl | 8 +++---- 8 files changed, 50 insertions(+), 16 deletions(-) diff --git a/src/diary/entries/201003 b/src/diary/entries/201003 index 0f27cc8..cf41824 100644 --- a/src/diary/entries/201003 +++ b/src/diary/entries/201003 @@ -15,5 +15,3 @@ bottle, css, git, html, regex, regular expressions, website
  • Pythex @ https://pythex.org/ is useful for checking whether your regular expression will catch your target strings
  • First command line git merge. I usually do it on the website. It's really simple - switch to the branch you're merging the second branch into, type 'git merge second-branch' (second-branch = name of the second branch obviously), and fix any conflicts.
    • -
    -
    diff --git a/src/diary/entries/raw/entries/200918 b/src/diary/entries/raw/entries/200918 index e145a64..ec8559b 100644 --- a/src/diary/entries/raw/entries/200918 +++ b/src/diary/entries/raw/entries/200918 @@ -1,6 +1,34 @@ -

    5 my favorite GDC talks

    +

    my favorite GDC talks

    september 18, 2020

    I really should be keeping a list of these with descriptions, so why not keep them in an article?

    -Work on it later.
    +Empathizing with Steam: How People Shop for Your Game by Chris Zukowski (2020) - tips for how to design your Steam store page based on Zukowski's screenshare and shopping diary observations of ordinary people shopping on Steam + +
    diff --git a/src/diary/entries/raw/entries/201003 b/src/diary/entries/raw/entries/201003 index 0f27cc8..cf41824 100644 --- a/src/diary/entries/raw/entries/201003 +++ b/src/diary/entries/raw/entries/201003 @@ -15,5 +15,3 @@ bottle, css, git, html, regex, regular expressions, website
  • Pythex @ https://pythex.org/ is useful for checking whether your regular expression will catch your target strings
  • First command line git merge. I usually do it on the website. It's really simple - switch to the branch you're merging the second branch into, type 'git merge second-branch' (second-branch = name of the second branch obviously), and fix any conflicts.
    • -
    -
    diff --git a/src/index.py b/src/index.py index bf1b076..4f93ada 100644 --- a/src/index.py +++ b/src/index.py @@ -140,7 +140,7 @@ def diary(page): @route('/diary/entries/') def entry(page): """diary entry""" - info = {'css': 'diary', 'title': 'blessfrey - developer diary', 'year': datetime.datetime.now(), 'entry': retrieve_article(page), 'latest': list_headlines(sort_files(gather_files())[0:5]), 'page': page} + info = {'css': 'feature', 'title': 'blessfrey - developer diary', 'year': datetime.datetime.now(), 'entry': retrieve_article(page), 'latest': list_headlines(sort_files(gather_files())[0:5]), 'page': page} abs_app_dir_path = os.path.dirname(os.path.realpath(__file__)) abs_views_path = os.path.join(abs_app_dir_path, 'views') TEMPLATE_PATH.insert(0, abs_views_path ) diff --git a/src/static/css/feature.css b/src/static/css/feature.css index 7bc5144..31cf078 100644 --- a/src/static/css/feature.css +++ b/src/static/css/feature.css @@ -150,7 +150,7 @@ mark { .diary-entry { grid-area: 3 / 2 / 7 / 3; - background-color: #Ff0000; + background-color: #ff0000; padding: 5px; } diff --git a/src/views/feature.tpl b/src/views/feature.tpl index 1a6c1b6..e0dae7e 100644 --- a/src/views/feature.tpl +++ b/src/views/feature.tpl @@ -1,7 +1,4 @@ % rebase('frame.tpl') - -
    -
    @@ -10,3 +7,5 @@
    % include diary-boxes.tpl + +
    diff --git a/src/views/frame.tpl b/src/views/frame.tpl index ea51896..8807186 100644 --- a/src/views/frame.tpl +++ b/src/views/frame.tpl @@ -1,15 +1,26 @@ + % include('header.tpl') + +
    + % include('logo-bar.tpl') + % include('nav.tpl') -
    + +
    + {{!base}} +
    + % include('footer.tpl') + + diff --git a/src/views/logo-bar.tpl b/src/views/logo-bar.tpl index f41d2d8..ea0e535 100644 --- a/src/views/logo-bar.tpl +++ b/src/views/logo-bar.tpl @@ -1,5 +1,5 @@ -
    - blessfrey.me
    -
    +
    - +