octopress-genesis-theme 0.0.9 → 0.0.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (36) hide show
  1. checksums.yaml +4 -4
  2. data/assets/config.yml +0 -1
  3. data/assets/includes/head.html +1 -1
  4. data/assets/includes/index_post.html +3 -0
  5. data/assets/includes/inline-svgs.html +4 -0
  6. data/assets/includes/main_nav.html +1 -1
  7. data/assets/includes/mobile_nav.html +1 -1
  8. data/assets/includes/post_meta.html +1 -1
  9. data/assets/includes/search.html +15 -1
  10. data/assets/includes/site_header.html +0 -1
  11. data/assets/includes/social/sharing.html +2 -2
  12. data/assets/layouts/article.html +23 -0
  13. data/assets/layouts/base.html +1 -0
  14. data/assets/layouts/default.html +5 -1
  15. data/assets/layouts/page.html +3 -15
  16. data/assets/layouts/post.html +5 -20
  17. data/assets/stylesheets/_cover-image.scss +0 -9
  18. data/assets/stylesheets/_entry.scss +13 -9
  19. data/assets/stylesheets/_header.scss +16 -69
  20. data/assets/stylesheets/_layout.scss +19 -6
  21. data/assets/stylesheets/_mobile-nav.scss +13 -8
  22. data/assets/stylesheets/_post-nav.scss +4 -0
  23. data/assets/stylesheets/_search.scss +89 -0
  24. data/assets/stylesheets/_social.scss +6 -6
  25. data/assets/stylesheets/_theme.scss +1 -1
  26. data/assets/stylesheets/core/_colors.scss +1 -1
  27. data/assets/stylesheets/core/_index.scss +1 -0
  28. data/assets/stylesheets/core/_sizes.scss +4 -4
  29. data/assets/stylesheets/core/_state.scss +3 -0
  30. data/assets/stylesheets/core/_typography.scss +45 -9
  31. data/assets/stylesheets/index.scss +1 -0
  32. data/lib/octopress-genesis-theme.rb +1 -0
  33. data/lib/octopress-genesis-theme/version.rb +1 -1
  34. metadata +39 -9
  35. data/assets/includes/search/duckduckgo.html +0 -4
  36. data/assets/includes/search/google.html +0 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3446206fcd4aa41d0d34df1ed8a88283b69f36b9
4
- data.tar.gz: f5333e9c9e46b03e792589de90ea313f0dfb8ae2
3
+ metadata.gz: 0a465bf72992838dd7b6a2ec49132351ccdbd5aa
4
+ data.tar.gz: 04eee8048dfe109774b47b00f5e4894097b2aa18
5
5
  SHA512:
6
- metadata.gz: 1a082c1dd94c7317c0666f2e22291436b08920e6f63f515f9bd8d63356c768640f21c69c70965abe915494fc3470b4f3c36b77fd38beee23be40856b5f438393
7
- data.tar.gz: 108fabf5ca59e33b6bb3623c52dea5520722574e1789e7d1e076601faaae7a17306c8212ab1aa1ac968250a293a3d74ec1942a1bf03d46c0c435b337ed1811ca
6
+ metadata.gz: 7759b1a3b313c47ac6256bb1d0e5151cac5acb4fe34f440f6cab379ee2f4171f2dff2dcbfa32a157f6fad251c4e0ce00579cfc1e89af283b763ae8f6f41d1912
7
+ data.tar.gz: 1f26d738ab29328393c82a737fee9ed921e10bf8b65e44c7b792b33ebabb1e401c23d39701b8a91225a78fd78381ecd2a2ff64892a1de9982091703b9277e98f
@@ -1,6 +1,5 @@
1
1
  # Settings for main header
2
2
  title: My Octopress Blog
3
- subtitle:
4
3
 
5
4
  # Links for main navigation
6
5
  main_nav:
@@ -4,6 +4,6 @@
4
4
  <meta name="MobileOptimized" content="320">
5
5
  <meta name="viewport" content="width=device-width, initial-scale=1">
6
6
  <link href="{{ page.url | canonical_url }}" rel="canonical">
7
- <meta name='generator' content='{{ octopress.version }}'>
7
+ <meta name='generator' content='Octopress v {{ octopress.version }}'>
8
8
  {% if page.description %}<meta name="description" content="{{ page.description | strip_html }}">{% endif %}
9
9
  {% css_asset_tag %}
@@ -7,6 +7,9 @@
7
7
 
8
8
  <article class="entry {% return 'excerpted' if excerpted %}" role="article">
9
9
  <header class="entry-header">
10
+ {% if post.cover_image %}
11
+ <img src='{{ post.cover_image }}'>
12
+ {% endif %}
10
13
  <h2 class="entry-title">{{ post.title_link }}</h2>
11
14
  {% if post.subtitle %}<h2 class="entry-subtitle">{{ post.subtitle }}</h2>{% endif %}
12
15
  <div class="entry-meta"><a href="{{ post.url | expand_url }}">{{ post.date_html }}</a></div>
@@ -0,0 +1,4 @@
1
+ <style>use { height: 0; }</style>
2
+ <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/" style="display: none">
3
+ <g id="site-search-svg"><path d="M125.7,120l-5.7,5.7c-1.5,1.5-3.5,2.3-5.7,2.3c-2.1,0-4.2-0.8-5.7-2.3L72.4,89.3C65.2,93.6,56.9,96,48,96 C21.5,96,0,74.5,0,48S21.5,0,48,0s48,21.5,48,48c0,8.9-2.4,17.2-6.7,24.4l36.3,36.3C128.8,111.8,128.8,116.9,125.7,120z M48,80 c17.7,0,32-14.3,32-32S65.7,16,48,16c-17.7,0-32,14.3-32,32S30.3,80,48,80z"/></g>
4
+ </svg>
@@ -1,5 +1,5 @@
1
1
  <nav class='main-nav' role="navigation">
2
2
  {% include theme:nav_items.html nav=theme.main_nav class='main-nav' %}
3
- <div class='main-nav-item main-nav-search'>{% include theme:search.html %}</div>
3
+ <div class='main-nav-item main-nav-search'>{% include theme:search.html nav='main' %}</div>
4
4
  <button class="mobile-nav-toggle" href="#" onclick="(function(){ document.querySelector('html').classList.toggle('mobile-nav-active') })()"><span class="mobile-nav-icon"></span><span class="hidden-label">Navigate<span></span></span></button>
5
5
  </nav>
@@ -1,6 +1,6 @@
1
1
  <div class='nav-panel'>
2
2
  <nav class='mobile-nav' role="navigation">
3
- <div class='mobile-nav-item mobile-nav-search'>{% include theme:search.html %}</div>
3
+ <div class='mobile-nav-item mobile-nav-search'>{% include theme:search.html nav='mobile' %}</div>
4
4
  {% include theme:nav_items.html nav=theme.main_nav class='mobile-nav' %}
5
5
  {% include theme:nav_items.html nav=theme.footer_nav class='mobile-nav' if theme.footer_nav %}
6
6
  </nav>
@@ -1,5 +1,5 @@
1
1
  <div class="entry-meta">
2
- <a href="{% return post.url || page.url %}">{% return post.date_html || page.date_html %}</a>
2
+ <a class='entry-date' href="{% return post.url || page.url %}">{% return post.date_html || page.date_html %}</a>
3
3
  {% include theme:category_links.html %}
4
4
  {% include theme:tag_links.html %}
5
5
  </div>
@@ -1 +1,15 @@
1
- {% capture search_template %}theme:search/{{ theme.search }}.html{% endcapture %}{% include search_template %}
1
+ {% if theme.search == 'google' %}
2
+ {% assign search_action = "https://google.com/search" %}
3
+ {% assign search_name = "sitesearch" %}
4
+ {% elsif theme.search == 'duckduckgo' %}
5
+ {% assign search_action = "https://www.duckduckgo.com/" %}
6
+ {% assign search_name = "sitesearch" %}
7
+ {% endif %}
8
+
9
+ <form class='site-search' action="{{ search_action }}" method="get">
10
+ <input type="hidden" name="{{ search_name }}" value="{{ site.url | strip_url_protocol }}">
11
+ <input id='site-search-{{ include.nav }}' class="site-search-input" type="text" name="q" results="0" placeholder="Search" accesskey="/">
12
+ <label class='site-search-label' for='site-search-{{ include.nav }}'><svg class='site-search-icon' viewBox="0 0 128 128">
13
+ <use xlink:href="#site-search-svg"></use>
14
+ </svg></label>
15
+ </form>
@@ -1,4 +1,3 @@
1
1
  <header role="banner" class="site-header">
2
2
  <h1 class="site-title"><a class="site-title-link" href="{% return site.root || '/' %}">{{ theme.title }}</a></h1>
3
- {% if theme.subtitle %}<p class='site-subtitle'>{{ theme.subtitle }}</p>{% endif %}
4
3
  </header>
@@ -1,4 +1,4 @@
1
- {% if theme.sharing and page.sharing != false %}<span class="entry-social-sharing {% if theme.share_with == 'buttons' %}social-buttons{% else %}social-links{% endif %}">
1
+ {% if theme.sharing and page.sharing != false %}<div class="entry-social-sharing {% if theme.share_with == 'buttons' %}social-buttons{% else %}social-links{% endif %}">
2
2
  {% if theme.share_with == 'buttons' %}
3
3
  {% if theme.sharing contains 'twitter' %}{% tweet_button %}{% endif %}
4
4
  {% if theme.sharing contains 'facebook' %}{% facebook_like_button %}{% endif %}
@@ -11,4 +11,4 @@
11
11
  {% if theme.sharing contains 'email' %}
12
12
  {% email_share_link %}
13
13
  {% endif %}
14
- </span>{% endif %}
14
+ </div>{% endif %}
@@ -0,0 +1,23 @@
1
+ ---
2
+ layout: theme:default
3
+ ---
4
+ {% assign page_type = (page.tags ? 'post' : 'page') %}
5
+ <article class="entry {{ page_type }} {{ page.class }} {% return 'cover-image' if page.cover_image %} {% return 'linkpost' if page.linkpost %}" role="article">
6
+ <header class="entry-header">
7
+ {% assign title = (page.linkpost ? page.title_link : page.title_html) %}
8
+ <div class='entry-header-content'>
9
+ <h1 class="entry-title">{{ title }}</h1>
10
+ {% if page.subtitle %}<h2 class="entry-subtitle">{{ page.subtitle }}</h2>{% endif %}
11
+ {% yield header %}
12
+ </div>
13
+ </header>
14
+
15
+ {% include theme:post_meta.html | join_lines %}
16
+
17
+ <div class="entry-content">{{ content }}</div>
18
+
19
+ {% wrap yield footer %}<footer class='entry-footer' role='contentinfo'>
20
+ {{ yield }}
21
+ </footer>{% endwrap %}
22
+
23
+ </article>
@@ -6,6 +6,7 @@
6
6
  {% yield head %}
7
7
  </head>
8
8
  <body>
9
+ {% include theme:inline-svgs.html %}
9
10
  <div class="site">{{ content | expand_urls }}</div>
10
11
  {% js_asset_tag %}
11
12
  {% include theme:social/scripts.html %}
@@ -8,8 +8,12 @@ layout: theme:base
8
8
  {% include theme:main_nav.html | compact_newlines %}
9
9
  </div></div>
10
10
  <div class="site-main">
11
- <div class="main {% return 'with-sidebar' if sidebar %}">
11
+ <div class="main {% return 'with-sidebar' if page.sidebar %}">
12
12
  <div class="main-content">{{ content }}</div>
13
+ {% if page.sidebar %}
14
+ {% capture sidebar %}sidebars/{{ page.sidebar }}.html{% endcapture %}
15
+ {% wrap include sidebar %}<div class="main-sidebar"><div class="main-sidebar-content">{{ yield }}</div></div>{% endwrap %}
16
+ {% endif %}
13
17
  </div>
14
18
  </div>
15
19
  <div class="site-bottom"><div class="site-bottom-content">
@@ -1,18 +1,6 @@
1
1
  ---
2
- layout: theme:default
2
+ layout: theme:article
3
3
  ---
4
- <article class="page entry {{ page.class }}" role="article">
5
- <header class="entry-header">
6
- <h1 class="entry-title">{{ page.title_html }}</h1>
7
- <div class="entry-meta">{{ page.date_html }}</div>
8
- {% wrap include theme:social/sharing.html if theme.sharing and page.sharing == true %}
9
- <div class="entry-social top">{{ yield }}</div>
10
- {% endwrap %}
11
- </header>
4
+ {{ content }}
12
5
 
13
- <div class="entry-content">{{ content }}</div>
14
-
15
- </article>
16
- {% wrap include theme:social/comments.html if theme.comments and page.comments == true %}
17
- <div class='entry-comments'>{{ yield }}</div>
18
- {% endwrap %}
6
+ {% include theme:social/sharing.html | join_lines %}
@@ -1,28 +1,13 @@
1
1
  ---
2
- layout: theme:default
2
+ layout: theme:article
3
3
  ---
4
- <article class="post entry {% return 'cover-image' if page.cover_image %} {% return 'linkpost' if page.linkpost %}" role="article">
5
- <header class="entry-header">
6
- {% assign title = (page.linkpost ? page.title_link : page.title_html) %}
7
- <div class='entry-header-content'>
8
- <h1 class="entry-title">{{ title }}</h1>
9
- {% if page.subtitle %}<h2 class="entry-subtitle">{{ page.subtitle }}</h2>{% endif %}
10
- {% yield header %}
11
- </div>
12
- </header>
4
+ {% assign is_post = true %}
5
+ {{ content }}
13
6
 
14
- {% include theme:post_meta.html | join_lines %}
7
+ {% include theme:social/sharing.html | join_lines %}
15
8
 
16
- <div class="entry-content">{{ content }}</div>
17
-
18
- <footer class='entry-footer' role='contentinfo'>
19
- {% yield footer %}
20
- </footer>
21
-
22
- {% include theme:social/sharing.html | join_lines %}
23
-
24
- </article>
25
9
  {% include theme:post_nav.html %}
10
+
26
11
  {% wrap include theme:social/comments.html if theme.comments and page.comments != false %}
27
12
  <div class='entry-comments'>{{ yield }}</div>
28
13
  {% endwrap %}
@@ -14,13 +14,4 @@
14
14
  opacity: 1;
15
15
  }
16
16
  }
17
- .main-nav-search {
18
- opacity: 1;
19
- input {
20
- opacity: .8;
21
- &:hover, &:focus {
22
- opacity: 1;
23
- }
24
- }
25
- }
26
17
  }
@@ -1,8 +1,8 @@
1
1
  .entry {
2
- margin: { top: 4rem; bottom: 4rem; }
2
+ margin: { top: 4em; bottom: 4em; }
3
3
  margin: { left: auto; right: auto; }
4
4
  + .entry {
5
- padding-top: 2rem;
5
+ padding-top: 2em;
6
6
  &:before {
7
7
  content: "";
8
8
  display: block;
@@ -10,7 +10,7 @@
10
10
  border-top: 1px solid $page-border;
11
11
  margin: 0 auto;
12
12
  position: relative;
13
- top: -2rem;
13
+ top: -2em;
14
14
  }
15
15
  }
16
16
  }
@@ -38,13 +38,13 @@
38
38
  }
39
39
 
40
40
  .entry-content {
41
- margin: { top: 3rem; bottom: 3rem; }
41
+ margin: { top: 2em; bottom: 2em; }
42
42
  }
43
43
 
44
44
  .entry-meta, .entry-subtitle, .entry-footer {
45
45
  font-family: $meta-font;
46
46
  font-weight: 400;
47
- font-size: .9rem;
47
+ font-size: 1.6rem;
48
48
  }
49
49
 
50
50
  .entry-header > * {
@@ -53,7 +53,7 @@
53
53
  }
54
54
  .entry-subtitle {
55
55
  font-family: $subtitle-font;
56
- font-size: 1.15em;
56
+ font-size: 2rem;
57
57
  margin-top: 0;
58
58
  }
59
59
 
@@ -83,7 +83,7 @@
83
83
  top: 0;
84
84
  bottom: 0;
85
85
  right: 0;
86
- background: rgba(#000, .08);
86
+ background: rgba(#222,0.3);
87
87
  }
88
88
  }
89
89
 
@@ -95,10 +95,14 @@
95
95
 
96
96
  .entry-title {
97
97
  font-family: $title-font;
98
- font-size: 2.5em;
98
+ font-size: 4.5rem;
99
+
100
+ @include at-least($small) {
101
+ font-size: 5.5rem;
102
+ }
99
103
 
100
104
  @include at-least($medium) {
101
- font-size: 3.5em;
105
+ font-size: 6.5rem;
102
106
  }
103
107
  }
104
108
  }
@@ -12,11 +12,14 @@
12
12
 
13
13
  .site-title {
14
14
  margin: 0;
15
- font-size: 1.5rem;
16
- }
17
-
18
- .site-title {
19
15
  color: $site-title-color;
16
+ font-size: 2.2rem;
17
+ @include at-least($small) {
18
+ font-size: 2.5rem;
19
+ }
20
+ @include at-least($small) {
21
+ font-size: 2.8rem;
22
+ }
20
23
  }
21
24
 
22
25
  .site-title-link {
@@ -27,6 +30,7 @@
27
30
 
28
31
  .main-nav {
29
32
  color: $main-nav-color;
33
+ font-size: $main-nav-font-size;
30
34
  }
31
35
 
32
36
  .main-nav-item {
@@ -34,94 +38,37 @@
34
38
  font-family: $nav-font;
35
39
  text-decoration: none;
36
40
  color: inherit;
37
- padding: 0 .3rem;
41
+ padding: 0 .3em;
42
+ line-height: 1.8em;
38
43
 
39
44
  &:last-child {
40
45
  padding-right: 0;
41
46
  }
42
- }
43
- a.main-nav-item {
44
- &:hover {
45
- color: $accent-color;
46
- }
47
- }
48
-
49
- .main-nav-search {
50
- padding: 0;
51
- input {
52
- cursor: pointer;
53
- font-family: $nav-font;
54
- line-height: 1.65em;
55
- font-size: .8rem;
56
-
57
- border: {
58
- color: transparent;
59
- width: 1px;
60
- style: solid;
61
- radius: .2rem;
62
- }
63
-
64
- background: none;
65
- color: inherit;
66
- padding: 0 .5rem;
67
- outline: none;
68
- width: 5em;
69
- transition: all .25s ease-in-out;
70
- position: relative;
71
- top: -1px;
72
-
73
- &:focus {
74
- outline: none;
75
- width: 10em;
76
- border-color: inherit;
77
- @include placeholder {
78
- font-size: .8rem;
79
- opacity: .5;
80
- }
81
- }
82
-
83
- @include placeholder {
84
- transition: opacity .25s ease-in-out;
85
- font-size: $main-nav-font-size;
86
- font-family: $nav-font;
87
- color: inherit;
88
- opacity: 1;
89
- }
90
47
 
48
+ @include at-least($small) {
49
+ display: inline-block;
91
50
  }
92
51
  }
93
52
 
94
- .site-subtitle {
95
- margin: .2rem 0;
96
- color: $medium-text-color;
97
- font-size: .95rem;
98
- }
99
-
100
- @include at-least($small) {
101
- .main-nav-item {
102
- display: inline-block;
53
+ a.main-nav-item {
54
+ &:hover {
55
+ color: $accent-color;
103
56
  }
104
57
  }
105
58
 
106
-
107
59
  @include at-least($medium) {
108
60
  .site-top-content {
109
61
  display: table;
110
62
  }
111
63
  .site-header, .main-nav {
112
64
  display: table-cell;
113
- padding: .7rem 1.4rem;
65
+ padding: .7em 1.4em;
114
66
  }
115
67
  .site-header {
116
68
  text-align: left;
117
69
  }
118
70
  .main-nav {
119
71
  text-align: right;
120
- font-size: $main-nav-font-size;
121
- }
122
- .site-title {
123
- margin: 0;
124
- font-size: 1.8rem;
125
72
  }
126
73
  }
127
74
 
@@ -7,12 +7,13 @@ html, body, .site {
7
7
  margin: 0;
8
8
  }
9
9
 
10
+ .site {
11
+ transform: translate3d(0,0,0);
12
+ }
13
+
10
14
  .site-content {
11
15
  width: 100%;
12
16
  min-height: 100%;
13
- display: table;
14
- table-layout: fixed;
15
- transform: translate3d(0,0,0);
16
17
  }
17
18
 
18
19
  .hidden-label {
@@ -21,8 +22,14 @@ html, body, .site {
21
22
  display: inline-block;
22
23
  }
23
24
 
24
- .site-top, .site-main, .site-bottom {
25
- display: table-row;
25
+ @include at-least($small) {
26
+ .site-content {
27
+ display: table;
28
+ table-layout: fixed;
29
+ }
30
+ .site-top, .site-main, .site-bottom {
31
+ display: table-row;
32
+ }
26
33
  }
27
34
 
28
35
  .site-main {
@@ -41,7 +48,7 @@ html, body, .site {
41
48
  }
42
49
 
43
50
  .main-content {
44
- padding-bottom: 3rem;
51
+ padding-bottom: 3em;
45
52
  }
46
53
 
47
54
  @include at-least($large) {
@@ -52,9 +59,15 @@ html, body, .site {
52
59
 
53
60
  .main-sidebar {
54
61
  width: $main-sidebar-width;
62
+ border-left: 1px solid $page-border;
55
63
  }
56
64
  }
57
65
 
66
+ .main-sidebar-content {
67
+ padding-left: $content-pad;
68
+ padding-right: $content-pad;
69
+ }
70
+
58
71
  @include at-least($max) {
59
72
  .site {
60
73
  margin-left: auto;
@@ -8,6 +8,7 @@
8
8
  background: $mobile-nav-bg;
9
9
  font-family: $nav-font;
10
10
  transform: translate3d(0,0,0);
11
+ z-index: -1;
11
12
  }
12
13
 
13
14
  .mobile-nav {
@@ -25,8 +26,8 @@
25
26
  border: 0px;
26
27
  background: none;
27
28
  position: absolute;
28
- top: 1.5em;
29
- left: 1.5em;
29
+ top: .8em;
30
+ left: .8em;
30
31
 
31
32
  &:focus {
32
33
  outline: none;
@@ -75,22 +76,22 @@
75
76
  color: $mobile-nav-color;
76
77
  display: block;
77
78
  text-decoration: none;
78
- padding: .5rem 1rem;
79
+ padding: .5em 1.3em;
79
80
  border-bottom: 1px solid $mobile-nav-border;
80
81
  }
81
82
 
82
83
  .mobile-nav-search {
83
- padding: 1rem .5rem 0;
84
+ padding: 1em .6em 0;
84
85
  border-bottom: 0;
85
86
  input {
86
87
  font-family: $nav-font;
87
- font-size: $base-font-size;
88
+ font-size: 1.6rem;
88
89
  line-height: 1.65em;
89
90
  margin: 0;
90
91
  background: $mobile-nav-border;
91
92
  border: 1px solid lighten($mobile-nav-border, 5);
92
93
  color: $mobile-search-color;
93
- padding: 0 .5rem;
94
+ padding: .3em .7em;
94
95
  outline: none;
95
96
  width: 100%;
96
97
  transition: all .25s ease-in-out;
@@ -99,15 +100,19 @@
99
100
 
100
101
  &:focus {
101
102
  outline: none;
103
+ @include placeholder {
104
+ opacity: .3;
105
+ }
102
106
  }
103
107
  @include placeholder {
104
108
  transition: opacity .25s ease-in-out;
105
- font-size: $main-nav-font-size;
106
- font-family: $nav-font;
107
109
  color: $mobile-search-color;
108
110
  opacity: .5;
109
111
  }
110
112
  }
113
+ .site-search-label {
114
+ display: none;
115
+ }
111
116
  }
112
117
 
113
118
  @include at-least($small) {
@@ -10,6 +10,10 @@
10
10
  .post-nav {
11
11
  border-top: 1px solid $page-border;
12
12
  overflow: hidden;
13
+ margin: {
14
+ top: 2em;
15
+ bottom: 2em;
16
+ }
13
17
  }
14
18
 
15
19
  .next-post { float: right; text-align: right; }
@@ -0,0 +1,89 @@
1
+ .main-nav-search {
2
+ color: inherit;
3
+ position: relative;
4
+ padding: 0;
5
+
6
+ .site-search-input {
7
+ cursor: pointer;
8
+ font-family: $nav-font;
9
+ line-height: 1.7em;
10
+ font-size: 1.3rem;
11
+ background: none;
12
+ color: inherit;
13
+ padding: 0em .5em 0em 1.5em;
14
+ position: relative;
15
+ outline: none;
16
+ transition: all .2s ease-in-out;
17
+ font-size: $main-nav-font-size;
18
+ font-family: $nav-font;
19
+ border: none;
20
+ width: 2em;
21
+ opacity: .1;
22
+ margin: 0;
23
+ z-index: 1;
24
+
25
+ &:hover {
26
+ opacity: .2;
27
+ }
28
+
29
+ @include placeholder {
30
+ opacity: .5;
31
+ font-size: $main-nav-font-size;
32
+ font-family: $nav-font;
33
+ color: inherit;
34
+ }
35
+
36
+ &:focus {
37
+ width: 10em;
38
+ opacity: 1;
39
+ outline: none;
40
+ padding-left: 1.8em;
41
+
42
+ + .site-search-label:after {
43
+ opacity: .1;
44
+ background: currentColor;
45
+ }
46
+ }
47
+ }
48
+
49
+ .site-search-label {
50
+ position: absolute;
51
+ left: 0; top: 0; bottom: 0; right: 0;
52
+
53
+ &:after {
54
+ content: "";
55
+ position: absolute;
56
+ left: 0; top: 0; bottom: 0; right: 0;
57
+ background: currentColor;
58
+ opacity: .05;
59
+ transition: all .2s ease-in-out;
60
+ border-radius: 3px;
61
+ }
62
+ }
63
+
64
+ &:hover .site-search-label:after {
65
+ opacity: .1;
66
+ }
67
+ }
68
+
69
+ .site-search-label {
70
+ vertical-align: middle;
71
+ }
72
+
73
+ .site-search-icon {
74
+ padding-left: 1rem;
75
+ cursor: pointer;
76
+ opacity: 1;
77
+ z-index: 1;
78
+ height: 1em;
79
+ width: 1.6em;
80
+ fill: currentColor;
81
+ position: absolute;
82
+ left: .5em;
83
+ top: 50%;
84
+ transform: translateY(-50%);
85
+ }
86
+
87
+
88
+
89
+
@@ -28,14 +28,14 @@
28
28
  content: attr(title);
29
29
  position: absolute;
30
30
  top: 0;
31
- padding: .1rem .4rem;
32
- border-radius: .2rem;
31
+ padding: 4px 5px;
32
+ border-radius: 3px;
33
33
  display: inline-block;
34
- line-height: 1rem;
35
- font-size: .7rem;
34
+ line-height: 1em;
35
+ font-size: 14px;
36
36
  white-space: nowrap;
37
37
  transition: all .25s ease-in-out;
38
- transform: translate(-50%, -10px);
38
+ transform: translate(-50%, -.1em);
39
39
  color: transparent;
40
40
  z-index: -2;
41
41
  border: 1px solid rgba(#000, 0);
@@ -55,7 +55,7 @@
55
55
  transition: all .25s ease-in-out;
56
56
  }
57
57
  &:hover:before {
58
- transform: translate(-50%, -9px);
58
+ transform: translate(-50%, -10px);
59
59
  }
60
60
  }
61
61
 
@@ -9,7 +9,7 @@ html {
9
9
 
10
10
  a {
11
11
  text-decoration: none;
12
- color: $link-color;
12
+ color: $accent-color;
13
13
  transition: color .25s ease-in-out;
14
14
  &:hover {
15
15
  color: $light-text-color;
@@ -1,5 +1,5 @@
1
1
  $main-bg: #f4f3ef;//#edefef;//#f5f6f6;
2
- $page-border: #dadede;
2
+ $page-border: darken($main-bg, 6);//#dadede;
3
3
 
4
4
  $accent-color: #e46767; // pale red
5
5
 
@@ -1,3 +1,4 @@
1
+ @import 'state';
1
2
  @import 'sizes';
2
3
  @import 'mixins';
3
4
  @import 'grid';
@@ -1,18 +1,18 @@
1
1
  // Global breakpoints
2
2
  $tiny: 320px;
3
3
  $small: 550px;
4
- $medium: 750px;
4
+ $medium: 760px;
5
5
  $large: 900px;
6
6
  $max: 1080px;
7
7
 
8
8
 
9
9
  // Item widths
10
10
  $main-sidebar-width: 300px;
11
- $main-content-max: 900px;
11
+ $main-content-max: 1080px;
12
12
  $content-pad: 20px;
13
13
 
14
14
  $h-pad-box: 5%, 40px;
15
15
  $v-pad-box: 5%, 30px;
16
16
 
17
- $base-font-size: 20px;
18
- $main-nav-font-size: 20px;
17
+ $base-font-size: 10px;
18
+ $main-nav-font-size: 1.6rem;
@@ -0,0 +1,3 @@
1
+ .is-hidden {
2
+ display: none;
3
+ }
@@ -4,7 +4,14 @@ html {
4
4
 
5
5
  body {
6
6
  font-family: $main-font;
7
+ font-size: 1.8rem;
7
8
  line-height: 1.65em;
9
+ @include at-least($small) {
10
+ font-size: 2.1rem;
11
+ }
12
+ @include at-least($large) {
13
+ font-size: 2.4rem;
14
+ }
8
15
  }
9
16
 
10
17
  h1,h2,h3,h4,h5,h6 {
@@ -13,31 +20,31 @@ h1,h2,h3,h4,h5,h6 {
13
20
  }
14
21
 
15
22
  h1 {
16
- font-size: 2.8rem;
23
+ font-size: 3.5rem;
17
24
  }
18
25
 
19
26
  h2 {
20
- font-size: 2em;
27
+ font-size: 3rem;
21
28
  }
22
29
 
23
30
  h3 {
24
- font-size: 1.6em;
31
+ font-size: 2.8rem;
25
32
  }
26
33
 
27
34
  h4 {
28
- font-size: 1.3em;
35
+ font-size: 2.4rem;
29
36
  }
30
37
 
31
38
  h5 {
32
- font-size: 1.2em;
39
+ font-size: 2rem;
33
40
  }
34
41
 
35
42
  h6 {
36
- font-size: 1em;
43
+ font-size: 1.5rem;
37
44
  }
38
45
 
39
46
  p, ul, ol, dl, table, figure, blockquote {
40
- margin: { top: 1.45rem; bottom: 1.45rem; }
47
+ margin: { top: 1.65em; bottom: 1.65em; }
41
48
  }
42
49
 
43
50
  figure {
@@ -51,10 +58,39 @@ img {
51
58
  blockquote {
52
59
  border-left: 5px solid $page-border;
53
60
  margin-left: 0;
54
- padding: 1px .5rem 1px 2rem;
61
+ margin-right: 0;
62
+ padding: 1px 1.5em;
55
63
  color: $medium-text-color;
56
64
  p {
57
- margin: .8rem 0;
65
+ margin: 1em 0;
66
+ }
67
+ }
68
+
69
+ figure.quote {
70
+ border-left: 5px solid $page-border;
71
+ padding: 0px 1em;
72
+
73
+ @include at-least($medium) {
74
+ padding: 1px 2em;
75
+ }
76
+
77
+ blockquote {
78
+ border: none;
79
+ padding: 0;
80
+ margin: 0;
81
+ }
82
+
83
+ .quote-source {
84
+ margin: 1em 0;
85
+ &:before {
86
+ content: " — ";
87
+ }
88
+ }
89
+ .quote-author + .quote-title {
90
+ &:before {
91
+ font-style: normal;
92
+ content: ", ";
93
+ }
58
94
  }
59
95
  }
60
96
 
@@ -13,4 +13,5 @@ $center-headings: {{ theme.center_headings }};
13
13
  @import "post-nav";
14
14
  @import "social";
15
15
  @import "cover-image";
16
+ @import "search";
16
17
  @import "mobile-nav";
@@ -11,6 +11,7 @@ require 'octopress-content-for'
11
11
  require 'octopress-filter-tag'
12
12
  require 'octopress-paginate'
13
13
  require 'octopress-social'
14
+ require 'octopress-littlefoot'
14
15
 
15
16
  require 'octopress-genesis-theme/version'
16
17
 
@@ -1,5 +1,5 @@
1
1
  module Octopress
2
2
  module Genesis
3
- VERSION = "0.0.9"
3
+ VERSION = "0.0.10"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,29 +1,29 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: octopress-genesis-theme
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.9
4
+ version: 0.0.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brandon Mathis
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-04-07 00:00:00.000000000 Z
11
+ date: 2015-05-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: octopress-ink
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '0'
19
+ version: '1.0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ">="
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '0'
26
+ version: '1.0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: octopress-linkblog
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
136
136
  - - ">="
137
137
  - !ruby/object:Gem::Version
138
138
  version: '0'
139
+ - !ruby/object:Gem::Dependency
140
+ name: octopress-quote-tag
141
+ requirement: !ruby/object:Gem::Requirement
142
+ requirements:
143
+ - - ">="
144
+ - !ruby/object:Gem::Version
145
+ version: '0'
146
+ type: :runtime
147
+ prerelease: false
148
+ version_requirements: !ruby/object:Gem::Requirement
149
+ requirements:
150
+ - - ">="
151
+ - !ruby/object:Gem::Version
152
+ version: '0'
139
153
  - !ruby/object:Gem::Dependency
140
154
  name: octopress-social
141
155
  requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,20 @@ dependencies:
150
164
  - - ">="
151
165
  - !ruby/object:Gem::Version
152
166
  version: '0'
167
+ - !ruby/object:Gem::Dependency
168
+ name: octopress-littlefoot
169
+ requirement: !ruby/object:Gem::Requirement
170
+ requirements:
171
+ - - ">="
172
+ - !ruby/object:Gem::Version
173
+ version: '0'
174
+ type: :runtime
175
+ prerelease: false
176
+ version_requirements: !ruby/object:Gem::Requirement
177
+ requirements:
178
+ - - ">="
179
+ - !ruby/object:Gem::Version
180
+ version: '0'
153
181
  - !ruby/object:Gem::Dependency
154
182
  name: sass
155
183
  requirement: !ruby/object:Gem::Requirement
@@ -248,20 +276,20 @@ files:
248
276
  - assets/includes/cover_image.html
249
277
  - assets/includes/head.html
250
278
  - assets/includes/index_post.html
279
+ - assets/includes/inline-svgs.html
251
280
  - assets/includes/main_nav.html
252
281
  - assets/includes/mobile_nav.html
253
282
  - assets/includes/nav_items.html
254
283
  - assets/includes/post_meta.html
255
284
  - assets/includes/post_nav.html
256
285
  - assets/includes/search.html
257
- - assets/includes/search/duckduckgo.html
258
- - assets/includes/search/google.html
259
286
  - assets/includes/site_footer.html
260
287
  - assets/includes/site_header.html
261
288
  - assets/includes/social/comments.html
262
289
  - assets/includes/social/scripts.html
263
290
  - assets/includes/social/sharing.html
264
291
  - assets/includes/tag_links.html
292
+ - assets/layouts/article.html
265
293
  - assets/layouts/base.html
266
294
  - assets/layouts/default.html
267
295
  - assets/layouts/page.html
@@ -273,6 +301,7 @@ files:
273
301
  - assets/stylesheets/_layout.scss
274
302
  - assets/stylesheets/_mobile-nav.scss
275
303
  - assets/stylesheets/_post-nav.scss
304
+ - assets/stylesheets/_search.scss
276
305
  - assets/stylesheets/_social.scss
277
306
  - assets/stylesheets/_theme.scss
278
307
  - assets/stylesheets/core/_colors.scss
@@ -281,6 +310,7 @@ files:
281
310
  - assets/stylesheets/core/_index.scss
282
311
  - assets/stylesheets/core/_mixins.scss
283
312
  - assets/stylesheets/core/_sizes.scss
313
+ - assets/stylesheets/core/_state.scss
284
314
  - assets/stylesheets/core/_typography.scss
285
315
  - assets/stylesheets/index.scss
286
316
  - assets/templates/category_feed.xml
@@ -309,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
309
339
  version: '0'
310
340
  requirements: []
311
341
  rubyforge_project:
312
- rubygems_version: 2.2.2
342
+ rubygems_version: 2.4.6
313
343
  signing_key:
314
344
  specification_version: 4
315
345
  summary: A Jekyll theme built on Octopress Ink
@@ -1,4 +0,0 @@
1
- <form class='site-search' action="http://www.duckduckgo.com/" method="get">
2
- <input type="hidden" name="sites" value="{{ site.url | strip_url_protocol }}">
3
- <input class="search-input" type="text" name="q" results="0" placeholder="Search" accesskey="/">
4
- </form>
@@ -1,4 +0,0 @@
1
- <form class='site-search' action="https://google.com/search" method="get">
2
- <input type="hidden" name="sitesearch" value="{{ site.url | strip_url_protocol }}">
3
- <input class="search-input" type="text" name="q" results="0" placeholder="Search" accesskey="/">
4
- </form>