betterplace-content 0.1.17 → 0.1.18

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4467072cf9affc5f5a2b62ad387557091d3af03b
4
- data.tar.gz: 9159665a47e8db2e1eb1fa7b98a07e696c2c79b5
3
+ metadata.gz: 94aee0ecc191e084f59504a73d810081e7b99da9
4
+ data.tar.gz: 22a391ee6766183fa21a2f3d79de6a6b45e70da6
5
5
  SHA512:
6
- metadata.gz: d63525504b6034b68cf2d26db4b0a943872a55564e3661457a455418db4c0763ed4086a63802660785845b335c498dd61dad6ac0d5d57e47439364619d8c3126
7
- data.tar.gz: 8f6778fc98bb437dedf7dfa981f2189ea162729d80b4b0cf1119acc9866b3d67f5ed0c573b77f8003a4efc0d9f49da6ebb245ef7f4b17dc8aa8a6265ce972b6a
6
+ metadata.gz: 57a89ddfb087109b127b54de47b7bf49f3a201c40b1ae6b6c09c0d81d0c4126a080c28d403638d612c6efea13756e54bc205b430c488151f4e95a2b3cd269ff4
7
+ data.tar.gz: 2a9e4c907f7445dc66c4eb71944ca92e46f34b0752b8c4f004e0dfbb04f3e0d608a965caf65556994afdce3fe9499f5e4972f5f1f91bab2125b338d8ff084460
@@ -39,7 +39,11 @@ if(window.getDevicePixelRatio!==undefined) {
39
39
  }
40
40
 
41
41
  ga('set', 'dimension4', '{{ site.lang }}'); // Sprache der URL (Hit)
42
+ {% if page.url contains '404' %}
43
+ ga('set', 'dimension5', location.pathname + ' (404)'); // Custom Code for 404 pages
44
+ {% else %}
42
45
  ga('set', 'dimension5', '{{ site.baseurl }}{{ page.url }}');
46
+ {% endif %}
43
47
 
44
48
  ga('require', 'linkid');
45
49
  ga('require', 'displayfeatures');
@@ -3,8 +3,9 @@
3
3
  <head>
4
4
  <meta charset="UTF-8" />
5
5
  <meta content="width=device-width, initial-scale=1, maximum-scale=3" name="viewport" />
6
+ <!-- Generated {{ 'now' | date: "%F %T" }} -->
6
7
 
7
- <title>{{ page.page_title }}</title>
8
+ <title>{{ page.page_title | default:'betterplace.org' }}</title>
8
9
 
9
10
  {% if site.plugins contains 'jekyll-feed' %}
10
11
  <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ site.url }}/feed" />
@@ -16,22 +17,19 @@
16
17
  {% endif %}
17
18
 
18
19
  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.0/jquery.min.js" integrity="sha256-spTpc4lvj4dOkKjrGokIrHkJgNA0xMS98Pw9N7ir9oI=" crossorigin="anonymous"></script>
19
-
20
20
  <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha256-U5ZEeKfGNOja007MMD3YBI0A3OSZOQbeG6z2f2Y0hu8=" crossorigin="anonymous"></script>
21
21
 
22
22
  {% include sharing.html %}
23
- {% include google_analytics.html %}
24
23
 
25
24
  <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/default.css" />
26
-
27
- <link href="{{ site.baseurl }}/assets/theme_images/favicon.ico" rel="shortcut icon" type="image/x-icon" />
25
+ <link rel="shortcut icon" href="{{ site.baseurl }}/assets/theme_images/favicon.ico" type="image/x-icon" />
28
26
 
29
27
  {{ page.head_include }}
30
28
  {{ layout.head_include }}
31
29
 
30
+ {% include google_analytics.html %}
32
31
  </head>
33
-
34
- <body class="{{ site.css_root }}">
32
+ <body class="{{ site.css_root }}{% if page.url contains '404' %} error404{% endif %}">
35
33
  <div id="fb-root"></div>
36
34
 
37
35
  {% if site.lang == 'de' %}
@@ -0,0 +1,28 @@
1
+ ---
2
+ layout: default
3
+ ---
4
+
5
+ <div class="wrapper404">
6
+ <div class="container">
7
+ <div class="row">
8
+ <div class="col-md-22 col-md-offset-1 text-center">
9
+
10
+ <h1 class="thin-h1-style is-inverted">
11
+ {{ page.page_headline | default: 'Diese Seite konnten wir nicht finden' }}
12
+ <br>
13
+ <small>Fehler 404</small>
14
+ </h1>
15
+
16
+ {{ content }}
17
+ <br>
18
+
19
+ <p>
20
+ <a href="{{ page.cta_button_link | default: site.baseurl }}" class="btn btn-primary btn-large link-online-fundraising">
21
+ {{ page.cta_button_text | default: 'Zur Hautpseite' }}
22
+ </a>
23
+ </p>
24
+
25
+ </div>
26
+ </div>
27
+ </div>
28
+ </div>
@@ -2,9 +2,10 @@
2
2
  <html>
3
3
  <head>
4
4
  <meta charset="UTF-8" />
5
+ <!-- Generated {{ 'now' | date: "%F %T" }} -->
5
6
  <meta http-equiv="Refresh" content="0; url={{ page.redirect_url }}" />
6
7
  <link rel="canonical" href="{{ page.redirect_url }}"/>
7
- <title>{{ page.page_title }}</title>
8
+ <title>{{ page.page_title | default:'betterplace.org' }}</title>
8
9
  </head>
9
10
  <body>
10
11
  {{ content }}
File without changes
File without changes
@@ -0,0 +1,15 @@
1
+ body.error404
2
+ background-position: 50% 55px
3
+ background-image: url('#{$site_baseurl}/assets/theme_images/error404/body-background.jpg')
4
+
5
+ .wrapper404
6
+ padding-top: 65px
7
+ min-height: 394px
8
+ color: white
9
+ background-color: transparent
10
+
11
+ h1
12
+ margin-top: 0px
13
+
14
+ small
15
+ color: white
File without changes
@@ -3,7 +3,36 @@
3
3
 
4
4
  $site_baseurl: "{{ site.baseurl }}"
5
5
 
6
- @import "theme_basics"
6
+ @import url('https://fonts.googleapis.com/css?family=Open+Sans:300,400,600')
7
+ @import url('https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css')
8
+
9
+ @import "colors"
10
+ @import "media_queries"
11
+
12
+ @import "generics_bootstrap"
13
+ @import "generics"
14
+ @import "application"
15
+
16
+ @import "generics/city_list"
17
+ @import "generics/comments"
18
+ @import "generics/content-header"
19
+ @import "generics/desktop-navigation"
20
+ @import "generics/mobile-navigation"
21
+ @import "generics/pagination"
22
+ @import "generics/search-form"
23
+ @import "generics/sidebar-menu"
24
+ @import "generics/team_list"
25
+ @import "generics/topicblock"
26
+
27
+ @import "error404"
28
+
29
+ // Refactor them
30
+ @import "refactor-me"
31
+
32
+ // Page specific css which we should cleanup so we dont clutter our one css with too much page specific stuff
33
+ @import "archive"
34
+ @import "author"
35
+ @import "post"
7
36
  @import "about-us"
8
37
  @import "jobs"
9
38
  @import "news"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: betterplace-content
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.17
4
+ version: 0.1.18
5
5
  platform: ruby
6
6
  authors:
7
7
  - betterplace developers
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-09-15 00:00:00.000000000 Z
11
+ date: 2017-09-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: jekyll
@@ -67,9 +67,8 @@ files:
67
67
  - _includes/header-en.html
68
68
  - _includes/navigation.html
69
69
  - _includes/sharing.html
70
- - _layouts/current-custom-theme.html
71
- - _layouts/default-with-wrapper.html
72
70
  - _layouts/default.html
71
+ - _layouts/error404.html
73
72
  - _layouts/help.html
74
73
  - _layouts/post.html
75
74
  - _layouts/redirect.html
@@ -85,9 +84,11 @@ files:
85
84
  - _sass/about-us/transparency.sass
86
85
  - _sass/about-us/why.sass
87
86
  - _sass/about-us/wrapper.sass
88
- - _sass/application-overrides.less
89
87
  - _sass/application.scss
88
+ - _sass/archive.sass
89
+ - _sass/author.sass
90
90
  - _sass/colors.sass
91
+ - _sass/error404.sass
91
92
  - _sass/freundeskreis.sass
92
93
  - _sass/generics.scss
93
94
  - _sass/generics/city_list.scss
@@ -104,9 +105,7 @@ files:
104
105
  - _sass/jobs.sass
105
106
  - _sass/media_queries.sass
106
107
  - _sass/news.sass
107
- - _sass/page_templates/archive.sass
108
- - _sass/page_templates/author.sass
109
- - _sass/page_templates/post.sass
108
+ - _sass/post.sass
110
109
  - _sass/refactor-me.sass
111
110
  - _sass/team.sass
112
111
  - _sass/theme_basics.sass
@@ -141,6 +140,7 @@ files:
141
140
  - assets/theme_images/about-us/why-transparency.png
142
141
  - assets/theme_images/breadcrumb-arrow.png
143
142
  - assets/theme_images/distortion.png
143
+ - assets/theme_images/error404/body-background.jpg
144
144
  - assets/theme_images/favicon.ico
145
145
  - assets/theme_images/freundeskreis/illustration-1.png
146
146
  - assets/theme_images/freundeskreis/illustration-2.png
@@ -1,8 +0,0 @@
1
- ---
2
- layout: default
3
- head_include: <link rel="stylesheet" href="assets/css/{{ site.css_root }}.css" />
4
- ---
5
-
6
- TODO TJO: Oben funktioniert das nicht, man müsste das capuren oder so. Also eigentlich kann man das hier löschen.
7
-
8
- {{ content }}
@@ -1,9 +0,0 @@
1
- ---
2
- layout: default
3
- ---
4
-
5
- <script>alert('layout default with wrapper');</script>
6
-
7
- <div class="content-wrapper">
8
- {{content}}
9
- </div>
@@ -1,14 +0,0 @@
1
-
2
- /* Desktop */
3
- @media only screen and (min-width: 768px) {
4
-
5
- .content-wrapper {
6
- min-height: 500px;
7
- }
8
-
9
- // We introduced this for betterplace but it breaks the RSS link for wordpress
10
- body>.container {
11
- min-height: auto;
12
- }
13
-
14
- }