From 8e9dddde381014b20bb28062f0cfe5b4894c8562 Mon Sep 17 00:00:00 2001 From: John Cleaver Date: Thu, 17 Mar 2016 09:42:57 -0400 Subject: [PATCH 1/8] Fixed a missing Source. --- bundles.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles.json b/bundles.json index 1d2f66a..28dd9a9 100644 --- a/bundles.json +++ b/bundles.json @@ -219,7 +219,7 @@ { "id": 36, "name": "Eggplant", - "source": "", + "source": "Crops during Fall.", "bundles": [8] }, { From ce57976d858ed7fd264c288793985ac2e71c4e2a Mon Sep 17 00:00:00 2001 From: John Cleaver Date: Fri, 18 Mar 2016 16:21:30 -0400 Subject: [PATCH 2/8] Added Skills and Seasons. --- bundles.json | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/bundles.json b/bundles.json index 28dd9a9..9562272 100644 --- a/bundles.json +++ b/bundles.json @@ -502,5 +502,45 @@ "name": "Vault", "reward": "Bus Repair" } + ], + "seasons": [ + { + "id": 0, + "name": "Spring" + }, + { + "id": 1, + "name": "Summer" + }, + { + "id": 2, + "name": "Fall" + }, + { + "id": 3, + "name": "Winter" + } + ], + "skills": [ + { + "id": 0, + "name": "Farming" + }, + { + "id": 1, + "name": "Mining" + }, + { + "id": 2, + "name": "Foraging" + }, + { + "id": 3, + "name": "Fishing" + }, + { + "id": 4, + "name": "Combat" + } ] } From 87d8303cbdc18199d9356419d6785a8d24735969 Mon Sep 17 00:00:00 2001 From: John Cleaver Date: Fri, 18 Mar 2016 16:38:49 -0400 Subject: [PATCH 3/8] Changed season and skill IDs to be more natural. --- bundles.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bundles.json b/bundles.json index 9562272..6d13551 100644 --- a/bundles.json +++ b/bundles.json @@ -505,41 +505,41 @@ ], "seasons": [ { - "id": 0, + "id": "spring", "name": "Spring" }, { - "id": 1, + "id": "summer", "name": "Summer" }, { - "id": 2, + "id": "fall", "name": "Fall" }, { - "id": 3, + "id": "winter", "name": "Winter" } ], "skills": [ { - "id": 0, + "id": "farming", "name": "Farming" }, { - "id": 1, + "id": "mining", "name": "Mining" }, { - "id": 2, + "id": "foraging", "name": "Foraging" }, { - "id": 3, + "id": "fishing", "name": "Fishing" }, { - "id": 4, + "id": "combat", "name": "Combat" } ] From bb29a3234c9086c71fcddcd61e0b371152a97dd1 Mon Sep 17 00:00:00 2001 From: John Cleaver Date: Fri, 18 Mar 2016 17:43:50 -0400 Subject: [PATCH 4/8] Added Seasons and skills tabs. --- index.html | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/index.html b/index.html index 8105a31..11d180e 100644 --- a/index.html +++ b/index.html @@ -14,6 +14,8 @@
  • Alphabetical List
  • +
  • By Season
  • +
  • By Skill
  • About
  • @@ -64,8 +66,57 @@
    +
    +
    + + + +
    +
    + +
    +
    + + +
    From 7fc920647e0c1bd7f06f52980a1bb7e6eb6cf043 Mon Sep 17 00:00:00 2001 From: John Cleaver Date: Fri, 18 Mar 2016 18:04:22 -0400 Subject: [PATCH 5/8] Fixed HTML formatting. --- index.html | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/index.html b/index.html index 11d180e..5a08a7f 100644 --- a/index.html +++ b/index.html @@ -10,14 +10,11 @@

    Stardew Valley Community Center Checklist

    @@ -34,19 +31,25 @@ @@ -63,17 +92,46 @@
    -
    - +
    @@ -88,16 +146,47 @@
    - +
    +
    + +
    +
    @@ -115,16 +204,47 @@
    - +
    +
    + +
    +
    diff --git a/main.css b/main.css index 00850cb..b40e8c2 100644 --- a/main.css +++ b/main.css @@ -31,3 +31,67 @@ .list-group-item .glyphicon { margin-right: 5px; } + +.row-eq-height, .row-eq-height > div[class*='col-']{ + display: -webkit-box; + display: -moz-box; + display: -ms-flexbox; + display: -webkit-flex; + display: flex; + flex: 1 0 auto; + flex-wrap: wrap; +} + +.panel { + display: flex; + flex-direction:column; + align-content:stretch; + flex-grow: 1; +} + +.panel-body{ + display: flex; + flex-direction: column; + flex-grow: 1; +} + +.panel-body > p{ + flex-grow: 1; +} + +.panel-body > .button-area{ + display: flex; + flex-direction: row; + flex-wrap: wrap; +} + +.button-area > .btn{ + flex: 1 0 auto; + margin-top: 1rem; +} + +.panel-footer{ + display: flex; + flex-direction: column; + flex-wrap: wrap; +} + +.panel-footer-area{ + display: flex; + flex-direction: row; + flex: 1 0 auto; + justify-content: space-around; +} + +.footer-text-area{ + margin-left: 1rem; + flex: 1 0 auto; + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-around; +} + +.footer-text{ + flex-grow: 1; +} From 51b33b0ed31e4ee9ef21f2d81eda53f1bedc053c Mon Sep 17 00:00:00 2001 From: John Cleaver Date: Sun, 20 Mar 2016 22:26:08 -0400 Subject: [PATCH 8/8] Removed bundle name hardcode. --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index ff83689..9cbe7a9 100644 --- a/index.html +++ b/index.html @@ -51,7 +51,7 @@

    {{ item.source }}

    - +