From 94e0c45adefa6854482cf33a8ada42a24afc8923 Mon Sep 17 00:00:00 2001 From: Set Hallstrom Date: Thu, 28 Feb 2019 18:30:03 +0100 Subject: [PATCH 1/7] trying to remove olugins --- Gemfile | 8 ++++---- _posts/_defaults.md | 7 ------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index b11f2a2..8f84ffa 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source 'https://rubygems.org' gem 'jekyll', '3.8.5' -gem 'thin' +# gem 'thin' -group :jekyll_plugins do - gem "jekyll-paginate-v2", "~> 1.7" -end \ No newline at end of file +# group :jekyll_plugins do +# gem "jekyll-paginate-v2", "~> 1.7" +# end \ No newline at end of file diff --git a/_posts/_defaults.md b/_posts/_defaults.md index 3edff8d..6fcb84e 100644 --- a/_posts/_defaults.md +++ b/_posts/_defaults.md @@ -11,12 +11,5 @@ uid: '' cover: '' download: '' link: '' -image_id: [1, 2] image: - 1: - url: '' - title: '' - 2: - url: '' - title: '' --- \ No newline at end of file From b173018a27300ea522e60ea2f74e894d9404a54a Mon Sep 17 00:00:00 2001 From: Set Hallstrom Date: Thu, 28 Feb 2019 18:31:52 +0100 Subject: [PATCH 2/7] gemlock fix? --- Gemfile | 2 +- Gemfile.lock | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 8f84ffa..081f4ab 100644 --- a/Gemfile +++ b/Gemfile @@ -5,4 +5,4 @@ gem 'jekyll', '3.8.5' # group :jekyll_plugins do # gem "jekyll-paginate-v2", "~> 1.7" -# end \ No newline at end of file +# endbund \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 7692d85..97fc7c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,7 +5,6 @@ GEM public_suffix (>= 2.0.2, < 4.0) colorator (1.1.0) concurrent-ruby (1.1.4) - daemons (1.3.1) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) @@ -28,8 +27,6 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-paginate-v2 (1.9.4) - jekyll (~> 3.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) jekyll-watch (2.1.2) @@ -44,7 +41,6 @@ GEM pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (3.0.3) - rack (2.0.6) rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) @@ -56,18 +52,12 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - thin (1.7.2) - daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0, >= 1.0.4) - rack (>= 1, < 3) PLATFORMS ruby DEPENDENCIES jekyll (= 3.8.5) - jekyll-paginate-v2 (~> 1.7) - thin BUNDLED WITH 2.0.1 From 855a4922b14101721fec8818ed05c38986660695 Mon Sep 17 00:00:00 2001 From: Set Hallstrom Date: Tue, 12 Mar 2019 18:12:16 +0000 Subject: [PATCH 3/7] Updated 2 files via CloudCannon --- _staff_members/set-copy.md | 9 +++++++++ assets/fonts/IBMPlexSansCondensed-Bold.ttf | Bin 2 files changed, 9 insertions(+) create mode 100644 _staff_members/set-copy.md mode change 100755 => 100644 assets/fonts/IBMPlexSansCondensed-Bold.ttf diff --git a/_staff_members/set-copy.md b/_staff_members/set-copy.md new file mode 100644 index 0000000..153ce40 --- /dev/null +++ b/_staff_members/set-copy.md @@ -0,0 +1,9 @@ +--- +name: Set Sakrecoer +position: 'Co-Founder' +image_path: /assets/img/staff/set.png +url_staff: 'https://sakrecoer.com' +email: 'set@basspistol.com' +gpg: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x92401D3F102A0208' +blurb: 'Multi-tasking humanoïd.' +--- \ No newline at end of file diff --git a/assets/fonts/IBMPlexSansCondensed-Bold.ttf b/assets/fonts/IBMPlexSansCondensed-Bold.ttf old mode 100755 new mode 100644 From 7f0b0b9e6fc7bd2c4d252b7b6fcba74790121397 Mon Sep 17 00:00:00 2001 From: Set Hallstrom Date: Tue, 12 Mar 2019 18:13:17 +0000 Subject: [PATCH 4/7] Updated '_staff_members/set-copy.md' via CloudCannon --- _staff_members/set-copy.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/_staff_members/set-copy.md b/_staff_members/set-copy.md index 153ce40..64a664c 100644 --- a/_staff_members/set-copy.md +++ b/_staff_members/set-copy.md @@ -1,9 +1,9 @@ --- -name: Set Sakrecoer -position: 'Co-Founder' -image_path: /assets/img/staff/set.png -url_staff: 'https://sakrecoer.com' -email: 'set@basspistol.com' -gpg: 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x92401D3F102A0208' -blurb: 'Multi-tasking humanoïd.' +name: +position: +image_path: +url_staff: +email: +gpg: +blurb: --- \ No newline at end of file From 1ecddd58fe0745e102b0711447c2bc67a56c97e2 Mon Sep 17 00:00:00 2001 From: Set Hallstrom Date: Tue, 12 Mar 2019 18:13:30 +0000 Subject: [PATCH 5/7] Moved '_staff_members/set-copy.md' to '_staff_members/_defaults.md' via CloudCannon --- _staff_members/{set-copy.md => _defaults.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename _staff_members/{set-copy.md => _defaults.md} (100%) diff --git a/_staff_members/set-copy.md b/_staff_members/_defaults.md similarity index 100% rename from _staff_members/set-copy.md rename to _staff_members/_defaults.md From 2a9ef12763baebb43929b962687fcbf83b204332 Mon Sep 17 00:00:00 2001 From: Set Hallstrom Date: Tue, 12 Mar 2019 19:23:29 +0100 Subject: [PATCH 6/7] fixing broken deps --- Gemfile | 6 +++--- Gemfile.lock | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 081f4ab..08c5612 100644 --- a/Gemfile +++ b/Gemfile @@ -3,6 +3,6 @@ source 'https://rubygems.org' gem 'jekyll', '3.8.5' # gem 'thin' -# group :jekyll_plugins do -# gem "jekyll-paginate-v2", "~> 1.7" -# endbund \ No newline at end of file +group :jekyll_plugins do + gem "jekyll-paginate-v2", "~> 1.7" +end \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 97fc7c0..144495b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,7 +4,7 @@ GEM addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) colorator (1.1.0) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) @@ -27,12 +27,14 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) + jekyll-paginate-v2 (1.9.4) + jekyll (~> 3.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) jekyll-watch (2.1.2) listen (~> 3.0) kramdown (1.17.0) - liquid (4.0.1) + liquid (4.0.3) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -58,6 +60,7 @@ PLATFORMS DEPENDENCIES jekyll (= 3.8.5) + jekyll-paginate-v2 (~> 1.7) BUNDLED WITH 2.0.1 From a7d10f5f3e31af11b6175c9493973f688efa89b3 Mon Sep 17 00:00:00 2001 From: Set Hallstrom Date: Tue, 12 Mar 2019 22:24:44 +0100 Subject: [PATCH 7/7] name convention --- _data/artists.yml | 22 +++++++++++----------- artists/index.html | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/_data/artists.yml b/_data/artists.yml index 2180a10..4a412b8 100644 --- a/_data/artists.yml +++ b/_data/artists.yml @@ -1,6 +1,6 @@ # - id: franky # mb: 'de2a996e-513c-4474-b03c-63b9566f1475' -# avatar: /assets/img/thumb/frankyfresco.jpg +# image: /assets/img/thumb/frankyfresco.jpg # photo: # display_name: 'Franky Fresco' # web: https://frankyfresco.com @@ -8,7 +8,7 @@ # email: frankyfresco@basspistol.com - id: holyhertz mb: '89d471b5-88a6-4330-a76c-6c3d7ca98e33' - avatar: /assets/img/thumb/holyhertz2019.jpg + image: /assets/img/thumb/holyhertz2019.jpg photo: display_name: 'Holyhertz' web: https://soundcloud.com/holyhertz @@ -16,7 +16,7 @@ email: holyhertz@basspistol.com # - id: jokko # mb: -# avatar: /assets/img/thumb/jokko.jpg +# image: /assets/img/thumb/jokko.jpg # photo: # display_name: 'Jokko' # web: https://soundcloud.com/jokkomusic @@ -24,7 +24,7 @@ # email: jokko@basspistol.com # - id: max # mb: 'd12105e6-ec94-48bd-bbd9-39786208f231' -# avatar: /assets/img/thumb/max.jpg +# image: /assets/img/thumb/max.jpg # photo: # display_name: 'Max Park' # web: @@ -32,7 +32,7 @@ # email: max@basspistol.com # - id: publicservice # mb: -# avatar: /assets/img/thumb/publicservice.jpg +# image: /assets/img/thumb/publicservice.jpg # photo: # display_name: 'Public Service' # web: @@ -40,7 +40,7 @@ # email: publicservice@basspistol.com - id: sakrecoer mb: 'a2899399-d1d5-462f-9d56-ec1ea78cc4b6' - avatar: /assets/img/thumb/sakrecoer.jpg + image: /assets/img/thumb/sakrecoer.jpg photo: display_name: 'Sakrecoer Fam' web: https://sakrecoer.com @@ -48,7 +48,7 @@ email: sakrecoer@basspistol.com - id: synapset mb: 'a0dd2f36-1681-4bc0-970e-06a0450e16ec' - avatar: /assets/img/thumb/synapset.jpg + image: /assets/img/thumb/synapset.jpg photo: display_name: 'Synapsset' web: https://basspistol.com/albums/musical-tourism @@ -56,7 +56,7 @@ email: synapset@basspistol.com # - id: sweatsky # mb: -# avatar: /assets/img/thumb/sweatsky.jpg +# image: /assets/img/thumb/sweatsky.jpg # photo: # display_name: 'Sweatsky' # web: https://soundcloud.com/sweatsky @@ -64,7 +64,7 @@ # email: sweatsky@basspistol.com - id: tikov mb: '1313ee01-590c-4fcf-a149-7f4d2a16d550' - avatar: /assets/img/thumb/tikov.jpg + image: /assets/img/thumb/tikov.jpg photo: display_name: 'Dr. Tikov' web: http://tikov.com @@ -72,7 +72,7 @@ email: tikov@basspistol.com - id: tfb mb: '3e250a22-ed45-41f7-ab07-ac8f7b4cf1c7' - avatar: /assets/img/thumb/tfb.jpg + image: /assets/img/thumb/tfb.jpg photo: display_name: 'The FragleBay' web: https://fraglebay.tumblr.com @@ -80,7 +80,7 @@ email: tfb@basspistol.com - id: setto mb: '31e8e456-0589-47eb-9334-20872851cd3e' - avatar: /assets/img/thumb/setto.jpg + image: /assets/img/thumb/setto.jpg photo: display_name: 'εΎ’ Setto γ‚»γƒƒγƒˆ' web: https://setto.basspistol.com diff --git a/artists/index.html b/artists/index.html index fd4c9b9..7e6614e 100644 --- a/artists/index.html +++ b/artists/index.html @@ -24,7 +24,7 @@ thumb: artists.jpg {% assign sorted = site.data.artists | sort: 'id' %} {% for artist in sorted %}
-
+

{{ artist.display_name }}

{% endfor %}