Compare commits
No commits in common. "master" and "dev-branch" have entirely different histories.
master
...
dev-branch
18 changed files with 64 additions and 34 deletions
2
Gemfile
2
Gemfile
|
|
@ -1,6 +1,6 @@
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
gem 'jekyll', '4.2.0'
|
gem 'jekyll', '4.1.1'
|
||||||
|
|
||||||
group :jekyll_plugins do
|
group :jekyll_plugins do
|
||||||
gem 'jekyll-feed', '0.15.0'
|
gem 'jekyll-feed', '0.15.0'
|
||||||
|
|
|
||||||
30
Gemfile.lock
30
Gemfile.lock
|
|
@ -4,31 +4,31 @@ GEM
|
||||||
addressable (2.7.0)
|
addressable (2.7.0)
|
||||||
public_suffix (>= 2.0.2, < 5.0)
|
public_suffix (>= 2.0.2, < 5.0)
|
||||||
colorator (1.1.0)
|
colorator (1.1.0)
|
||||||
concurrent-ruby (1.1.9)
|
concurrent-ruby (1.1.7)
|
||||||
em-websocket (0.5.2)
|
em-websocket (0.5.2)
|
||||||
eventmachine (>= 0.12.9)
|
eventmachine (>= 0.12.9)
|
||||||
http_parser.rb (~> 0.6.0)
|
http_parser.rb (~> 0.6.0)
|
||||||
eventmachine (1.2.7)
|
eventmachine (1.2.7)
|
||||||
ffi (1.15.3)
|
ffi (1.13.1)
|
||||||
forwardable-extended (2.6.0)
|
forwardable-extended (2.6.0)
|
||||||
http_parser.rb (0.6.0)
|
http_parser.rb (0.6.0)
|
||||||
i18n (1.8.10)
|
i18n (1.8.5)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
jekyll (4.2.0)
|
jekyll (4.1.1)
|
||||||
addressable (~> 2.4)
|
addressable (~> 2.4)
|
||||||
colorator (~> 1.0)
|
colorator (~> 1.0)
|
||||||
em-websocket (~> 0.5)
|
em-websocket (~> 0.5)
|
||||||
i18n (~> 1.0)
|
i18n (~> 1.0)
|
||||||
jekyll-sass-converter (~> 2.0)
|
jekyll-sass-converter (~> 2.0)
|
||||||
jekyll-watch (~> 2.0)
|
jekyll-watch (~> 2.0)
|
||||||
kramdown (~> 2.3)
|
kramdown (~> 2.1)
|
||||||
kramdown-parser-gfm (~> 1.0)
|
kramdown-parser-gfm (~> 1.0)
|
||||||
liquid (~> 4.0)
|
liquid (~> 4.0)
|
||||||
mercenary (~> 0.4.0)
|
mercenary (~> 0.4.0)
|
||||||
pathutil (~> 0.9)
|
pathutil (~> 0.9)
|
||||||
rouge (~> 3.0)
|
rouge (~> 3.0)
|
||||||
safe_yaml (~> 1.0)
|
safe_yaml (~> 1.0)
|
||||||
terminal-table (~> 2.0)
|
terminal-table (~> 1.8)
|
||||||
jekyll-feed (0.15.0)
|
jekyll-feed (0.15.0)
|
||||||
jekyll (>= 3.7, < 5.0)
|
jekyll (>= 3.7, < 5.0)
|
||||||
jekyll-sass-converter (2.1.0)
|
jekyll-sass-converter (2.1.0)
|
||||||
|
|
@ -39,38 +39,38 @@ GEM
|
||||||
jekyll (>= 3.7, < 5.0)
|
jekyll (>= 3.7, < 5.0)
|
||||||
jekyll-watch (2.2.1)
|
jekyll-watch (2.2.1)
|
||||||
listen (~> 3.0)
|
listen (~> 3.0)
|
||||||
kramdown (2.3.1)
|
kramdown (2.3.0)
|
||||||
rexml
|
rexml
|
||||||
kramdown-parser-gfm (1.1.0)
|
kramdown-parser-gfm (1.1.0)
|
||||||
kramdown (~> 2.0)
|
kramdown (~> 2.0)
|
||||||
liquid (4.0.3)
|
liquid (4.0.3)
|
||||||
listen (3.5.1)
|
listen (3.2.1)
|
||||||
rb-fsevent (~> 0.10, >= 0.10.3)
|
rb-fsevent (~> 0.10, >= 0.10.3)
|
||||||
rb-inotify (~> 0.9, >= 0.9.10)
|
rb-inotify (~> 0.9, >= 0.9.10)
|
||||||
mercenary (0.4.0)
|
mercenary (0.4.0)
|
||||||
pathutil (0.16.2)
|
pathutil (0.16.2)
|
||||||
forwardable-extended (~> 2.6)
|
forwardable-extended (~> 2.6)
|
||||||
public_suffix (4.0.6)
|
public_suffix (4.0.6)
|
||||||
rb-fsevent (0.11.0)
|
rb-fsevent (0.10.4)
|
||||||
rb-inotify (0.10.1)
|
rb-inotify (0.10.1)
|
||||||
ffi (~> 1.0)
|
ffi (~> 1.0)
|
||||||
rexml (3.2.5)
|
rexml (3.2.4)
|
||||||
rouge (3.26.0)
|
rouge (3.23.0)
|
||||||
safe_yaml (1.0.5)
|
safe_yaml (1.0.5)
|
||||||
sassc (2.4.0)
|
sassc (2.4.0)
|
||||||
ffi (~> 1.9)
|
ffi (~> 1.9)
|
||||||
terminal-table (2.0.0)
|
terminal-table (1.8.0)
|
||||||
unicode-display_width (~> 1.1, >= 1.1.1)
|
unicode-display_width (~> 1.1, >= 1.1.1)
|
||||||
unicode-display_width (1.7.0)
|
unicode-display_width (1.7.0)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
x86_64-linux
|
ruby
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
jekyll (= 4.2.0)
|
jekyll (= 4.1.1)
|
||||||
jekyll-feed (= 0.15.0)
|
jekyll-feed (= 0.15.0)
|
||||||
jekyll-seo-tag (= 2.6.1)
|
jekyll-seo-tag (= 2.6.1)
|
||||||
jekyll-sitemap (= 1.4.0)
|
jekyll-sitemap (= 1.4.0)
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
2.2.19
|
2.1.4
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,52 @@
|
||||||
<!-- BEGIN contact.html -->
|
<!-- BEGIN contact.html -->
|
||||||
<div id="contact">
|
<div id="contact">
|
||||||
<h2>Maila oss!</h2>
|
<form action="{{ site.baseurl }}/contact-success/" method="post" class="contact-form">
|
||||||
<a href="mailto:momangens@gmail.com">momangens@gmail.com</a>
|
<div>
|
||||||
|
|
||||||
|
<input type="hidden" name="_to" value="{{ site.email }}" /><br />
|
||||||
|
<input type="text" name="_gotcha" style="display: none;" />
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label for="name">Namn:</label><br />
|
||||||
|
<input type="text" name="name" id="name" placeholder="Ditt fullständiga namn" class="contact" />
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label for="email">E-post:</label><br />
|
||||||
|
<input type="email" name="email" id="email" placeholder="Din e-post adress" required class="contact" />
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label for="persnr">Personnummer:</label><br />
|
||||||
|
<input type="text" name="persnr" id="persnr" placeholder="Ditt Personnummer (Fördelsedatum räcker)" class="contact" />
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label for="postnummer">Postnummer:</label><br />
|
||||||
|
<input type="text" name="postnummer" id="postnummer" placeholder="Ditt postnummer" class="contact" />
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label for="message">Dikt:</label><br />
|
||||||
|
<textarea name="message" id="message" placeholder="Skriv en dikt" required
|
||||||
|
class="contact textspace" rows="4"></textarea>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<input type="checkbox" name="consent" id="consent" required class="css-checkbox lrg klaus" /><label for="consent"
|
||||||
|
class="css-label lrg klaus">Jag godkänner denna
|
||||||
|
{% if page.url == '/privacy-policy/' %} sekretesspolicy.
|
||||||
|
{% else %} <a href="{{ site.baseurl }}/privacy-policy/">sekretesspolicy</a>
|
||||||
|
{% endif %}</label>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<input type="checkbox" name="news" id="news" class="css-checkbox lrg klaus" /><label for="news"
|
||||||
|
class="css-label lrg klaus">Skicka mig gärna nyheter!</label>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<input type="submit" value="Send Message" />
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<!-- END contact.html -->
|
<!-- END contact.html -->
|
||||||
|
|
@ -4,5 +4,4 @@ image: /images/momangers/andres.jpg
|
||||||
blurb_text:
|
blurb_text:
|
||||||
link:
|
link:
|
||||||
mopp_vecka:
|
mopp_vecka:
|
||||||
aktiv: false
|
|
||||||
---
|
---
|
||||||
|
|
@ -4,5 +4,4 @@ image:
|
||||||
blurb_text:
|
blurb_text:
|
||||||
link:
|
link:
|
||||||
mopp_vecka:
|
mopp_vecka:
|
||||||
aktiv: true
|
|
||||||
---
|
---
|
||||||
|
|
@ -4,5 +4,4 @@ image: /images/momangers/alma.jpg
|
||||||
blurb_text:
|
blurb_text:
|
||||||
link:
|
link:
|
||||||
mopp_vecka: 46
|
mopp_vecka: 46
|
||||||
aktiv: false
|
|
||||||
---
|
---
|
||||||
|
|
@ -4,5 +4,4 @@ image: /images/momangers/50167492-10218177083246349-3081317513628221440-n.jpg
|
||||||
blurb_text:
|
blurb_text:
|
||||||
link:
|
link:
|
||||||
mopp_vecka: 48
|
mopp_vecka: 48
|
||||||
aktiv: false
|
|
||||||
---
|
---
|
||||||
|
|
@ -4,5 +4,4 @@ image: /images/momangers/mona-magnussen-a7bdqjeg6m4-unsplash.jpg
|
||||||
blurb_text:
|
blurb_text:
|
||||||
link:
|
link:
|
||||||
mopp_vecka: 48
|
mopp_vecka: 48
|
||||||
aktiv: true
|
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,4 @@ image: /images/momangers/astrid.jpg
|
||||||
blurb_text:
|
blurb_text:
|
||||||
link:
|
link:
|
||||||
mopp_vecka: 46
|
mopp_vecka: 46
|
||||||
aktiv: false
|
|
||||||
---
|
---
|
||||||
|
|
@ -4,5 +4,4 @@ image: /images/momangers/ivar.jpg
|
||||||
blurb_text:
|
blurb_text:
|
||||||
link:
|
link:
|
||||||
mopp_vecka: 38
|
mopp_vecka: 38
|
||||||
aktiv: true
|
|
||||||
---
|
---
|
||||||
|
|
@ -4,5 +4,4 @@ image: /images/momangers/jean.jpg
|
||||||
blurb_text:
|
blurb_text:
|
||||||
link:
|
link:
|
||||||
mopp_vecka: 38
|
mopp_vecka: 38
|
||||||
aktiv: false
|
|
||||||
---
|
---
|
||||||
|
|
@ -4,5 +4,4 @@ image: /images/momangers/johanna.jpg
|
||||||
blurb_text:
|
blurb_text:
|
||||||
link:
|
link:
|
||||||
mopp_vecka: 40
|
mopp_vecka: 40
|
||||||
aktiv: false
|
|
||||||
---
|
---
|
||||||
|
|
@ -4,5 +4,4 @@ image: /images/momangers/karbin.jpg
|
||||||
blurb_text:
|
blurb_text:
|
||||||
link:
|
link:
|
||||||
mopp_vecka: 40
|
mopp_vecka: 40
|
||||||
aktiv: true
|
|
||||||
---
|
---
|
||||||
|
|
@ -4,5 +4,4 @@ image: /images/momangers/kulturkristian.jpg
|
||||||
blurb_text:
|
blurb_text:
|
||||||
link:
|
link:
|
||||||
mopp_vecka: 42
|
mopp_vecka: 42
|
||||||
aktiv: true
|
|
||||||
---
|
---
|
||||||
|
|
@ -4,5 +4,4 @@ image: /images/momangers/magnus.jpg
|
||||||
blurb_text:
|
blurb_text:
|
||||||
link:
|
link:
|
||||||
mopp_vecka: 42
|
mopp_vecka: 42
|
||||||
aktiv: true
|
|
||||||
---
|
---
|
||||||
|
|
@ -4,5 +4,4 @@ image: /images/momangers/molly.jpg
|
||||||
blurb_text:
|
blurb_text:
|
||||||
link:
|
link:
|
||||||
mopp_vecka: 44
|
mopp_vecka: 44
|
||||||
aktiv: false
|
|
||||||
---
|
---
|
||||||
|
|
@ -4,5 +4,4 @@ image: /images/momangers/set.jpg
|
||||||
blurb_text:
|
blurb_text:
|
||||||
link:
|
link:
|
||||||
mopp_vecka: 44
|
mopp_vecka: 44
|
||||||
aktiv: false
|
|
||||||
---
|
---
|
||||||
|
|
@ -35,7 +35,6 @@ image: /assets/img/logo%20galleri%20momangen.svg
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% for artist in site.momangers %}
|
{% for artist in site.momangers %}
|
||||||
{% if artist.aktiv == true %}
|
|
||||||
<div class="column">
|
<div class="column">
|
||||||
<a href="cloudcannon:collections/{{ artist.path }}" rel="nofollow" class="editor-link cms-editor-link">Redigera Medlem</a>
|
<a href="cloudcannon:collections/{{ artist.path }}" rel="nofollow" class="editor-link cms-editor-link">Redigera Medlem</a>
|
||||||
<div class="square-image" style="background-image: url('{{ artist.image }}')"></div>
|
<div class="square-image" style="background-image: url('{{ artist.image }}')"></div>
|
||||||
|
|
@ -44,5 +43,4 @@ image: /assets/img/logo%20galleri%20momangen.svg
|
||||||
{% if artist.link != null %}<a href="{{ artist.link }}" trarget="_blank" rel="noopener noreferrer nofollow">Mer info
|
{% if artist.link != null %}<a href="{{ artist.link }}" trarget="_blank" rel="noopener noreferrer nofollow">Mer info
|
||||||
här</a>{% endif %}</p>
|
här</a>{% endif %}</p>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue