betterplace-content 0.3.14 → 0.3.15

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: 822e4e119434338d5b76b318820fe20e879af0ca
4
- data.tar.gz: f8107c920ad3e7ef059042b318ddf5e90abc3496
3
+ metadata.gz: 9bdc831baafdddca124401585d194a207510aeb6
4
+ data.tar.gz: f7baf50df65018ca5766177e202bc653e5fec9cc
5
5
  SHA512:
6
- metadata.gz: d6aeaf790915f5e90e7a445a1252c7295ac1b779febf5f97a7701f38ee4d5b6cf0a62767cf8578dd2a515225632b1075ce1197ea45ee01b61360b3bbc5c0b83b
7
- data.tar.gz: 88eab313e20f9b7496bef6155467682c464ab9e0f480cfca149a2fef6940b6c29902f329f675e8a371dea577f6b9ccb92e32918608f773a849466c74abb669b4
6
+ metadata.gz: 8036eccadd578fcfd348f5769f6dbaad9412ad5c6362e1785bf580f20af3d8b860c4778a10f87b84b07d5ee76d3d8be700501984f8271c9d76580d6b0fcb7408
7
+ data.tar.gz: 420c6488042244261416b0f62baef46a39f316371473472cbc0d110cdd9d14bdd9fc62acc96a6c336753d8593af954843b28f243a4ab74887762d11c2bca8a20
@@ -0,0 +1,12 @@
1
+ <div class="help-categories m-t">
2
+ <hr/>
3
+
4
+ <ul class="list-unstyled m-t m-b">
5
+ {% for category in site.categories %}
6
+ <li>
7
+ <a href="{{ site.baseurl}}/{{ site.category_path}}/{{ category | first | slugify }}">{{ category | first }}</a>
8
+ </li>
9
+ {% endfor %}
10
+ </ul>
11
+
12
+ </div>
@@ -1,9 +1,22 @@
1
- <form action="{{ site.baseurl }}/suche" method="get">
2
- <div class="input-group">
3
- <input type="text" id="search-box" name="s" placeholder="{{ include.placeholder | default: "Hilfebereich durchsuchen" }}" class="form-control" value="">
4
- <input name="ga_category" value="content-pages--help" type="hidden">
5
- <span class="input-group-btn">
6
- <button type="submit" class="btn"><i class="fa fa-search fa-fw"></i></button>
7
- </span>
1
+ <div class="hero-search">
2
+ <div class="container">
3
+ <div class="row">
4
+ <div class="col-md-14">
5
+ {% if page.show_back_to_overview %}
6
+ <a class="btn btn-secondary back-button" href="{{ site.baseurl }}">Zurück zur Übersicht</a>
7
+ {% endif %}
8
+ </div>
9
+ <div class="col-md-10">
10
+ <form action="{{ site.baseurl }}/suche" method="get">
11
+ <div class="input-group">
12
+ <input type="text" id="search-box" name="s" placeholder="{{ include.placeholder | default: "Hilfebereich durchsuchen" }}" class="form-control" value="">
13
+ <input name="ga_category" value="content-pages--help" type="hidden">
14
+ <span class="input-group-btn">
15
+ <button type="submit" class="btn"><i class="fa fa-search fa-fw"></i></button>
16
+ </span>
17
+ </div>
18
+ </form>
19
+ </div>
20
+ </div>
8
21
  </div>
9
- </form>
22
+ </div>
@@ -1,9 +1,22 @@
1
- <form action="{{ site.baseurl }}/search" method="get">
2
- <div class="input-group">
3
- <input type="text" id="search-box" name="s" placeholder="{{ include.placeholder | default: "Search help area" }}" class="form-control" value="">
4
- <input name="ga_category" value="content-pages--help" type="hidden">
5
- <span class="input-group-btn">
6
- <button type="submit" class="btn"><i class="fa fa-search fa-fw"></i></button>
7
- </span>
1
+ <div class="hero-search">
2
+ <div class="container">
3
+ <div class="row">
4
+ <div class="col-md-14">
5
+ {% if page.show_back_to_overview %}
6
+ <a class="btn btn-secondary back-button" href="{{ site.baseurl }}">Back to Overview</a>
7
+ {% endif %}
8
+ </div>
9
+ <div class="col-md-10">
10
+ <form action="{{ site.baseurl }}/search" method="get">
11
+ <div class="input-group">
12
+ <input type="text" id="search-box" name="s" placeholder="{{ include.placeholder | default: "Search help area" }}" class="form-control" value="">
13
+ <input name="ga_category" value="content-pages--help" type="hidden">
14
+ <span class="input-group-btn">
15
+ <button type="submit" class="btn"><i class="fa fa-search fa-fw"></i></button>
16
+ </span>
17
+ </div>
18
+ </form>
19
+ </div>
20
+ </div>
8
21
  </div>
9
- </form>
22
+ </div>
data/_layouts/help.html CHANGED
@@ -3,11 +3,19 @@ layout: default
3
3
  ---
4
4
  {% include hero_image.html %}
5
5
 
6
- <div class="content-wrapper layout-help">
6
+ {% if site.searchable %}
7
+ {% if site.lang == 'de' %}
8
+ {% include searchbar-de.html %}
9
+ {% else %}
10
+ {% include searchbar-en.html %}
11
+ {% endif %}
12
+ {% endif %}
13
+
14
+ <div class="content-wrapper">
7
15
  <div class="container centered">
8
16
  <div class="row">
9
17
  <div class="col-md-20 col-md-offset-2">
10
- <h1 class="text-center m-b">{{ page.title }}</h1>
18
+ <h1 class="headline-desktop-xl headline-phone-lg text-center m-b-md">{{ page.page_headline | default:page.title }}</h1>
11
19
 
12
20
  <article class="help-article">
13
21
 
@@ -26,13 +34,14 @@ layout: default
26
34
  {% endif %}
27
35
 
28
36
  {{ content }}
37
+
29
38
  </article>
30
39
  </div>
31
40
  </div>
32
41
 
33
42
  <div class="row">
34
43
  <div class="col-md-24">
35
- {% include help_search_and_categories.html %}
44
+ {% include help_categories.html %}
36
45
  </div>
37
46
  </div>
38
47
  </div>
data/_layouts/news.html CHANGED
@@ -3,22 +3,24 @@ layout: default
3
3
  ---
4
4
  {% include hero_image.html %}
5
5
 
6
+ {% if site.searchable %}
7
+ {% if site.lang == 'de' %}
8
+ {% include searchbar-de.html placeholder="Neuigkeiten durchsuchen" %}
9
+ {% else %}
10
+ {% include searchbar-en.html placeholder="Search News" %}
11
+ {% endif %}
12
+ {% endif %}
13
+
14
+ <!-- Layout "News" -->
15
+
6
16
  <div class="content-wrapper layout-news">
7
17
  <div class="container centered">
8
18
  <div class="row">
9
- <div class="col-md-offset-14 col-md-10">
10
- {% if site.lang == 'de' %}
11
- {% include searchbar-de.html placeholder="Neuigkeiten durchsuchen" %}
12
- {% else %}
13
- {% include searchbar-en.html placeholder="Search news" %}
14
- {% endif %}
15
- </div>
16
-
17
- <div class="col-md-24">
18
- <h1 class="text-center m-b">{{ page.title }}</h1>
19
+ <div class="col-md-20 col-md-offset-2">
20
+ <h1 class="headline-desktop-xl headline-phone-lg text-center m-b-md">{{ page.title }}</h1>
19
21
  </div>
20
22
 
21
- <div class="col-md-24">
23
+ <div class="col-md-20 col-md-offset-2">
22
24
  <div class="row news-article">
23
25
  {% if page.author %}
24
26
  <div class="news-meta-information m-b">
data/_layouts/post.html CHANGED
@@ -3,14 +3,26 @@ layout: default
3
3
  ---
4
4
  {% include hero_image.html %}
5
5
 
6
+ {% if site.searchable %}
7
+ {% if site.lang == 'de' %}
8
+ {% include searchbar-de.html %}
9
+ {% else %}
10
+ {% include searchbar-en.html %}
11
+ {% endif %}
12
+ {% endif %}
13
+
14
+ <!-- Layout "Post" -->
15
+
6
16
  <div class="content-wrapper">
7
17
  <div class="container centered">
8
18
  <div class="row">
9
- <div class="col-md-18">
19
+ <div class="col-md-20 col-md-offset-2">
10
20
  <article class="post">
11
- <h1 class="text-center">{{ page.page_headline }}</h1>
21
+
22
+ <h1 class="headline-desktop-xl headline-phone-lg text-center m-b-md">{{ page.page_headline | default:page.title }}</h1>
12
23
 
13
24
  {{ content }}
25
+
14
26
  </article>
15
27
  </div>
16
28
  </div>
@@ -0,0 +1,21 @@
1
+ .hero-search
2
+
3
+ background: $very-light-green
4
+ display: flex
5
+ justify-content: center
6
+ align-items: center
7
+
8
+ +desktop
9
+ padding: 25px 0
10
+
11
+ +phone
12
+ padding: 10px 0
13
+
14
+ .back-button
15
+
16
+ +desktop
17
+ margin-top: 4px
18
+
19
+ +phone
20
+ width: 100%
21
+ margin-bottom: 10px
File without changes
@@ -0,0 +1,4 @@
1
+ .content-wrapper
2
+ p
3
+ font-size: 16px
4
+ line-height: 22px
@@ -0,0 +1,31 @@
1
+ .help-article img
2
+ max-width: 100%
3
+
4
+ .help-article,
5
+ .help-category-teaser
6
+ font-size: 15px
7
+
8
+ .help-category-teaser li
9
+ margin-bottom: 5px
10
+
11
+ .help-meta-information
12
+ display: flex
13
+ justify-content: center
14
+
15
+ .help-author,
16
+ .help-date
17
+ padding: 10px
18
+ color: $medium-grey
19
+
20
+ .help-categories
21
+ ul
22
+ display: flex
23
+ justify-content: center
24
+
25
+ li > a
26
+ padding-right: 10px
27
+ padding-left: 10px
28
+ border-right: 1px solid $light-grey
29
+
30
+ li:last-child a
31
+ border-right: 0
File without changes
File without changes
@@ -39,7 +39,7 @@ body.team
39
39
  .container
40
40
  +desktop
41
41
  margin-top: -560px
42
-
42
+
43
43
  .tax-receipt-hint .container
44
44
  +desktop
45
45
  margin-top: 0
data/_sass/post.sass CHANGED
@@ -2,13 +2,6 @@
2
2
  .post
3
3
  padding-bottom: 5px
4
4
 
5
- h2,
6
- h3,
7
- h4,
8
- h5,
9
- h6
10
- margin-top: 15px
11
-
12
5
  p,
13
6
  li
14
7
  color: #4c5256
@@ -25,13 +18,6 @@
25
18
  height: 1px
26
19
  border: none
27
20
 
28
-
29
- h2
30
- font-size: 27px
31
- line-height: 42px
32
- font-weight: bold
33
- margin: 50px 0 15px
34
-
35
21
  .wp-caption
36
22
  margin: 15px 0
37
23
  .wp-caption-text
@@ -49,12 +35,6 @@
49
35
  border: 0
50
36
 
51
37
  +desktop
52
- h2,
53
- h3,
54
- h4,
55
- h5,
56
- h6
57
- padding-right: 100px
58
38
 
59
39
  p,
60
40
  ul
@@ -3,36 +3,45 @@
3
3
 
4
4
  $site_baseurl: "{{ site.baseurl }}"
5
5
 
6
- @import url('https://fonts.googleapis.com/css?family=Open+Sans:300,400,600')
7
6
  @import url('https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css')
8
7
 
9
- @import "colors"
10
- @import "media_queries"
8
+ @import initialize/colors
9
+ @import initialize/media_queries
10
+ @import initialize/typography
11
11
 
12
- @import "generics/city_list"
13
- @import "generics/comments"
14
- @import "generics/content-header"
15
- @import "generics/desktop-navigation"
16
- @import "generics/mobile-navigation"
17
- @import "generics/pagination"
18
- @import "generics/search-form"
19
- @import "generics/sidebar-menu"
20
- @import "generics/team_list"
21
- @import "generics/topicblock"
22
- @import "generics/hero_image"
12
+ @import generics/city_list
13
+ @import generics/comments
14
+ @import generics/content-header
15
+ @import generics/desktop-navigation
16
+ @import generics/mobile-navigation
17
+ @import generics/pagination
18
+ @import generics/search-form
19
+ @import generics/sidebar-menu
20
+ @import generics/team_list
21
+ @import generics/topicblock
22
+ @import generics/hero_image
23
+ @import generics/hero_search
23
24
 
24
- @import "error404"
25
+ @import error404
25
26
 
26
- // Refactor them
27
- @import "refactor-me"
27
+ // Page specific css, get rid of them if you can
28
+ @import pages/jobs
29
+ @import pages/news
30
+ @import pages/team
31
+ @import pages/freundeskreis
32
+ @import pages/help
33
+ body.about-us
34
+ @import about-us/wrapper
35
+ @import about-us/headlines
36
+ @import about-us/generic_content_header
37
+ @import about-us/scroll-down
38
+ @import about-us/why
39
+ @import about-us/because
40
+ @import about-us/team
41
+ @import about-us/feature
42
+ @import about-us/history
43
+ @import about-us/transparency
44
+ @import about-us/social-sharing
28
45
 
29
- // Page specific css which we should cleanup so we dont clutter our one css with too much page specific stuff
30
- @import "archive"
31
- @import "author"
32
- @import "post"
33
- @import "about-us"
34
- @import "jobs"
35
- @import "news"
36
- @import "team"
37
- @import "freundeskreis"
38
- @import "help"
46
+ // refactor them urgently
47
+ @import post
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.3.14
4
+ version: 0.3.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - betterplace.org Developers
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-01-31 00:00:00.000000000 Z
11
+ date: 2018-02-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: jekyll
@@ -66,7 +66,7 @@ files:
66
66
  - _includes/google_analytics.html
67
67
  - _includes/header-de.html
68
68
  - _includes/header-en.html
69
- - _includes/help_search_and_categories.html
69
+ - _includes/help_categories.html
70
70
  - _includes/hero_image.html
71
71
  - _includes/searchbar-de.html
72
72
  - _includes/searchbar-en.html
@@ -79,7 +79,6 @@ files:
79
79
  - _layouts/news.html
80
80
  - _layouts/post.html
81
81
  - _layouts/redirect.html
82
- - _sass/about-us.sass
83
82
  - _sass/about-us/because.sass
84
83
  - _sass/about-us/feature.sass
85
84
  - _sass/about-us/generic_content_header.sass
@@ -91,29 +90,28 @@ files:
91
90
  - _sass/about-us/transparency.sass
92
91
  - _sass/about-us/why.sass
93
92
  - _sass/about-us/wrapper.sass
94
- - _sass/archive.sass
95
- - _sass/author.sass
96
- - _sass/colors.sass
97
93
  - _sass/error404.sass
98
- - _sass/freundeskreis.sass
99
94
  - _sass/generics/city_list.scss
100
95
  - _sass/generics/comments.sass
101
96
  - _sass/generics/content-header.sass
102
97
  - _sass/generics/desktop-navigation.scss
103
98
  - _sass/generics/hero_image.sass
99
+ - _sass/generics/hero_search.sass
104
100
  - _sass/generics/mobile-navigation.sass
105
101
  - _sass/generics/pagination.scss
106
102
  - _sass/generics/search-form.scss
107
103
  - _sass/generics/sidebar-menu.scss
108
104
  - _sass/generics/team_list.scss
109
105
  - _sass/generics/topicblock.sass
110
- - _sass/help.sass
111
- - _sass/jobs.sass
112
- - _sass/media_queries.sass
113
- - _sass/news.sass
106
+ - _sass/initialize/colors.sass
107
+ - _sass/initialize/media_queries.sass
108
+ - _sass/initialize/typography.sass
109
+ - _sass/pages/freundeskreis.sass
110
+ - _sass/pages/help.sass
111
+ - _sass/pages/jobs.sass
112
+ - _sass/pages/news.sass
113
+ - _sass/pages/team.sass
114
114
  - _sass/post.sass
115
- - _sass/refactor-me.sass
116
- - _sass/team.sass
117
115
  - assets/css/default.sass
118
116
  - assets/js/ga-autotrack.js
119
117
  - assets/js/help_search.js
@@ -178,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
178
176
  version: '0'
179
177
  requirements: []
180
178
  rubyforge_project:
181
- rubygems_version: 2.6.11
179
+ rubygems_version: 2.6.13
182
180
  signing_key:
183
181
  specification_version: 4
184
182
  summary: betterplace.org's Jekyll Content Theme
@@ -1,21 +0,0 @@
1
- <div class="help-search-and-categories m-t">
2
- <hr/>
3
-
4
- <ul class="list-unstyled m-t m-b">
5
- {% for category in site.categories %}
6
- <li>
7
- <a href="{{ site.baseurl}}/{{ site.category_path}}/{{ category | first | slugify }}">{{ category | first }}</a>
8
- </li>
9
- {% endfor %}
10
- </ul>
11
-
12
- <div class="row">
13
- <div class="col-md-10 col-md-offset-7">
14
- {% if site.lang == 'de' %}
15
- {% include searchbar-de.html %}
16
- {% else %}
17
- {% include searchbar-en.html %}
18
- {% endif %}
19
- </div>
20
- </div>
21
- </div>
data/_sass/about-us.sass DELETED
@@ -1,16 +0,0 @@
1
- // stattdessen nur @import "theme"?
2
- @import "colors"
3
- @import "media_queries"
4
-
5
- body.about-us
6
- @import "about-us/wrapper"
7
- @import "about-us/headlines"
8
- @import "about-us/generic_content_header"
9
- @import "about-us/scroll-down"
10
- @import "about-us/why"
11
- @import "about-us/because"
12
- @import "about-us/team"
13
- @import "about-us/feature"
14
- @import "about-us/history"
15
- @import "about-us/transparency"
16
- @import "about-us/social-sharing"
data/_sass/archive.sass DELETED
@@ -1,51 +0,0 @@
1
- /* Archives (home, categories, index) start */
2
- .archive
3
- margin-bottom: 30px
4
-
5
- .archive h2,
6
- .archive h3,
7
- .archive h4,
8
- .archive h5,
9
- .archive h6
10
- margin-top: 20px
11
-
12
- .archive h2:first-child
13
- margin-top: 0px
14
-
15
- /* TODO @TJO: Zusammenfuehren mit normalized-content */
16
- .archive p
17
- color: #4c5256
18
- font-size: 12px
19
- line-height: 18px
20
- margin: 15px 0
21
- margin-top: 5px
22
- padding-bottom: 7px
23
-
24
- .archive p.more
25
- margin: 0
26
-
27
- .archive em
28
- font-style: italic
29
-
30
- .archive ul
31
- margin-bottom: 5px
32
- margin-left: 15px
33
- list-style-type: disc
34
-
35
- li
36
- padding-left: 0
37
-
38
- .archive ul.tags li
39
- background: none
40
- padding-left: 0
41
-
42
- .archive li
43
- color: #4C5256
44
- padding-left: 11px
45
- line-height: 18px
46
- font-weight: bold
47
- background: url(../images/li-bullet.png) no-repeat 0 8px
48
- margin-bottom: 2px
49
-
50
- +phone
51
- margin-bottom: 7px
data/_sass/author.sass DELETED
@@ -1,6 +0,0 @@
1
- .author-description
2
- margin-bottom: 30px
3
- padding-top: 15px
4
-
5
- p
6
- margin-top: 0
data/_sass/help.sass DELETED
@@ -1,46 +0,0 @@
1
- .layout-help
2
- .help-article img
3
- max-width: 100%
4
-
5
- .help-article,
6
- .help-category-teaser
7
- font-size: 15px
8
-
9
- .help-category-teaser li
10
- margin-bottom: 5px
11
-
12
- .help-meta-information
13
- display: flex
14
- justify-content: center
15
-
16
- .help-author,
17
- .help-date
18
- padding: 10px
19
- color: $medium-grey
20
-
21
- .help-search-and-categories
22
- ul
23
- display: flex
24
- justify-content: center
25
-
26
- li > a
27
- padding-right: 10px
28
- padding-left: 10px
29
- border-right: 1px solid $light-grey
30
-
31
- li:last-child a
32
- border-right: 0
33
-
34
- .help-hero-search
35
- background: $very-light-green
36
- height: 160px
37
- display: flex
38
- justify-content: center
39
- align-items: center
40
-
41
- form
42
- +desktop
43
- width: 530px
44
-
45
- +phone
46
- width: 100%
@@ -1,21 +0,0 @@
1
- .themenline
2
- margin-top: 40px
3
- color: #636B70
4
- line-height: 1.3
5
-
6
- .descText
7
- margin: 10px 0 10px
8
- color: #899299
9
- font-size: 10px
10
- margin-top: 11px
11
-
12
- @media print
13
- a[href]:after
14
- content: ''
15
-
16
- .content-wrapper
17
- padding-bottom: 50px
18
-
19
- body .content-wrapper > .container.centered
20
- @media (min-width: 786px)
21
- padding-top: 25px