diff --git a/README.md b/README.md index 86cbb1f4..03a7f9c3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Dash Website -## Jekyll +## Jekyll We are using Jekyll to generate the static html files. https://jekyllrb.com diff --git a/_i18n/en.yml b/_i18n/en.yml index 5478637b..26f13971 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -786,8 +786,8 @@ pages: claim-heading: Buy, Sell, Exchange Dash claim-subline: Dash can be acquired, held and exchanged in many ways. - setup-heading: Learn how to set up your wallet - setup-text: + setup-heading: Set up your wallet + setup-text: Explore different kinds of wallets and learn how to set up your wallet setup-btn: Learn More setup-link: https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=1146941 @@ -961,8 +961,9 @@ pages: blog: title: The Digital Cash Blog description: "Latest Dash news & information" - search-btn: Search Blog + search-btn: Search Blogs community-news-btn: Community News + search-heading: Search Blogs team: diff --git a/_includes/hero/blog.html b/_includes/hero/blog.html index aae6c1ee..554d6a18 100644 --- a/_includes/hero/blog.html +++ b/_includes/hero/blog.html @@ -15,7 +15,7 @@

{% t pages.blog.title %}

{% t pages.blog.community-news-btn %} - + {% t pages.blog.search-btn %} diff --git a/assets/js/search-script.js b/assets/js/search-script.js new file mode 100644 index 00000000..cb896f0f --- /dev/null +++ b/assets/js/search-script.js @@ -0,0 +1,6 @@ +/*! + * Simple-Jekyll-Search v1.4.1 (https://github.com/christian-fei/Simple-Jekyll-Search) + * Copyright 2015-2017, Christian Fei + * Licensed under MIT (https://github.com/christian-fei/Simple-Jekyll-Search/blob/master/LICENSE.md) + */ + !function t(e,r,n){function i(o,a){if(!r[o]){if(!e[o]){var c="function"==typeof require&&require;if(!a&&c)return c(o,!0);if(u)return u(o,!0);var s=new Error("Cannot find module '"+o+"'");throw s.code="MODULE_NOT_FOUND",s}var f=r[o]={exports:{}};e[o][0].call(f.exports,function(t){var r=e[o][1][t];return i(r||t)},f,f.exports,t,e,r,n)}return r[o].exports}for(var u="function"==typeof require&&require,o=0;or)return!1;if(n===r)return t===e;t:for(var i=0,u=0;i=0}}},{}],7:[function(t,e,r){"use strict";e.exports={compile:function(t){return n.template.replace(n.pattern,function(e,r){var i=n.middleware(r,t[r],n.template);return void 0!==i?i:t[r]||e})},setOptions:function(t){n.pattern=t.pattern||n.pattern,n.template=t.template||n.template,"function"==typeof t.middleware&&(n.middleware=t.middleware)}};var n={};n.pattern=/\{(.*?)\}/g,n.template="",n.middleware=function(){}},{}],8:[function(t,e,r){!function(e,r){"use strict";function n(t){m.put(t),a()}function i(t){S.load(t,function(e,r){e&&p("failed to get JSON ("+t+")"),n(r)})}function u(){h.resultsContainer.innerHTML=""}function o(t){h.resultsContainer.innerHTML+=t}function a(){h.searchInput.addEventListener("keyup",function(t){l(t.which)&&(u(),c(t.target.value))})}function c(t){f(t)&&s(m.search(t))}function s(t){var e=t.length;if(0===e)return o(h.noResultsText);for(var r=0;r0}function l(t){return-1===[13,16,20,37,38,39,40,91].indexOf(t)}function p(t){throw new Error("SimpleJekyllSearch --- "+t)}var h={searchInput:null,resultsContainer:null,json:[],searchResultTemplate:'
  • {title}
    • ',templateMiddleware:function(){},noResultsText:"No results found",limit:10,fuzzy:!1,exclude:[]},d=["searchInput","resultsContainer","json"],y=t("./Templater"),m=t("./Repository"),S=t("./JSONLoader"),g=t("./OptionsValidator")({required:d}),v=t("./utils");e.SimpleJekyllSearch=function(t){return g.validate(t).length>0&&p("You must specify the following required options: "+d),h=v.merge(h,t),y.setOptions({template:h.searchResultTemplate,middleware:h.templateMiddleware}),m.setOptions({fuzzy:h.fuzzy,limit:h.limit}),v.isJSON(h.json)?n(h.json):i(h.json),{search:c}},e.SimpleJekyllSearch.init=e.SimpleJekyllSearch,"function"==typeof e.SimpleJekyllSearchInit&&e.SimpleJekyllSearchInit.call(this,e.SimpleJekyllSearch)}(window,document)},{"./JSONLoader":2,"./OptionsValidator":3,"./Repository":4,"./Templater":7,"./utils":9}],9:[function(t,e,r){"use strict";e.exports={merge:function(t,e){var r={};for(var n in t)r[n]=t[n],"undefined"!=typeof e[n]&&(r[n]=e[n]);return r},isJSON:function(t){try{return!!(t instanceof Object&&JSON.parse(JSON.stringify(t)))}catch(e){return!1}}}},{}]},{},[8]); \ No newline at end of file diff --git a/blog/index.html b/blog/index.html index 4cb924af..a369d89e 100644 --- a/blog/index.html +++ b/blog/index.html @@ -49,4 +49,24 @@

    {{ post.tit +

    {% t pages.blog.search-heading %}

    + +
    + +
      +
      + + + + + + + + diff --git a/search.json b/search.json new file mode 100644 index 00000000..83e8ceed --- /dev/null +++ b/search.json @@ -0,0 +1,11 @@ +--- +--- +[ + {% for post in site.posts %} + { + + "title" : "{{ post.title | escape }}" + + } {% unless forloop.last %},{% endunless %} + {% endfor %} +] \ No newline at end of file diff --git a/src/js/search-script.js b/src/js/search-script.js new file mode 100644 index 00000000..cb896f0f --- /dev/null +++ b/src/js/search-script.js @@ -0,0 +1,6 @@ +/*! + * Simple-Jekyll-Search v1.4.1 (https://github.com/christian-fei/Simple-Jekyll-Search) + * Copyright 2015-2017, Christian Fei + * Licensed under MIT (https://github.com/christian-fei/Simple-Jekyll-Search/blob/master/LICENSE.md) + */ + !function t(e,r,n){function i(o,a){if(!r[o]){if(!e[o]){var c="function"==typeof require&&require;if(!a&&c)return c(o,!0);if(u)return u(o,!0);var s=new Error("Cannot find module '"+o+"'");throw s.code="MODULE_NOT_FOUND",s}var f=r[o]={exports:{}};e[o][0].call(f.exports,function(t){var r=e[o][1][t];return i(r||t)},f,f.exports,t,e,r,n)}return r[o].exports}for(var u="function"==typeof require&&require,o=0;or)return!1;if(n===r)return t===e;t:for(var i=0,u=0;i=0}}},{}],7:[function(t,e,r){"use strict";e.exports={compile:function(t){return n.template.replace(n.pattern,function(e,r){var i=n.middleware(r,t[r],n.template);return void 0!==i?i:t[r]||e})},setOptions:function(t){n.pattern=t.pattern||n.pattern,n.template=t.template||n.template,"function"==typeof t.middleware&&(n.middleware=t.middleware)}};var n={};n.pattern=/\{(.*?)\}/g,n.template="",n.middleware=function(){}},{}],8:[function(t,e,r){!function(e,r){"use strict";function n(t){m.put(t),a()}function i(t){S.load(t,function(e,r){e&&p("failed to get JSON ("+t+")"),n(r)})}function u(){h.resultsContainer.innerHTML=""}function o(t){h.resultsContainer.innerHTML+=t}function a(){h.searchInput.addEventListener("keyup",function(t){l(t.which)&&(u(),c(t.target.value))})}function c(t){f(t)&&s(m.search(t))}function s(t){var e=t.length;if(0===e)return o(h.noResultsText);for(var r=0;r0}function l(t){return-1===[13,16,20,37,38,39,40,91].indexOf(t)}function p(t){throw new Error("SimpleJekyllSearch --- "+t)}var h={searchInput:null,resultsContainer:null,json:[],searchResultTemplate:'
    • {title}
      • ',templateMiddleware:function(){},noResultsText:"No results found",limit:10,fuzzy:!1,exclude:[]},d=["searchInput","resultsContainer","json"],y=t("./Templater"),m=t("./Repository"),S=t("./JSONLoader"),g=t("./OptionsValidator")({required:d}),v=t("./utils");e.SimpleJekyllSearch=function(t){return g.validate(t).length>0&&p("You must specify the following required options: "+d),h=v.merge(h,t),y.setOptions({template:h.searchResultTemplate,middleware:h.templateMiddleware}),m.setOptions({fuzzy:h.fuzzy,limit:h.limit}),v.isJSON(h.json)?n(h.json):i(h.json),{search:c}},e.SimpleJekyllSearch.init=e.SimpleJekyllSearch,"function"==typeof e.SimpleJekyllSearchInit&&e.SimpleJekyllSearchInit.call(this,e.SimpleJekyllSearch)}(window,document)},{"./JSONLoader":2,"./OptionsValidator":3,"./Repository":4,"./Templater":7,"./utils":9}],9:[function(t,e,r){"use strict";e.exports={merge:function(t,e){var r={};for(var n in t)r[n]=t[n],"undefined"!=typeof e[n]&&(r[n]=e[n]);return r},isJSON:function(t){try{return!!(t instanceof Object&&JSON.parse(JSON.stringify(t)))}catch(e){return!1}}}},{}]},{},[8]); \ No newline at end of file diff --git a/src/scss/_info-grid.scss b/src/scss/_info-grid.scss index 4705cc4e..7fa987ff 100644 --- a/src/scss/_info-grid.scss +++ b/src/scss/_info-grid.scss @@ -7,7 +7,10 @@ $m: 'info-grid'; &__item { @extend .col-md-4; @extend .col-sm-6; + // background-color: $color-gray-light; margin-bottom: 70px; + text-align: center; + padding: 10px; @include mq($to: small) { @@ -24,7 +27,9 @@ $m: 'info-grid'; border-radius: 50%; // border: 1px solid rgba($color-gray-dark, 0.1); background-color: rgba($color-white, 0.5); - margin-bottom: 40px; + // margin-bottom: 40px; + margin-left: auto; + margin-right: auto; @include mq($to: small) { margin-left: auto; @@ -42,10 +47,12 @@ $m: 'info-grid'; @include font-title-small(); text-transform: none; margin-bottom: 0.5em; + // text-align: center; } &-text { color: $color-gray-dark; margin-bottom: 0.5em; + // text-align: center; } &-link { @extend .btn-blue; diff --git a/src/scss/_search.scss b/src/scss/_search.scss new file mode 100644 index 00000000..53dc609c --- /dev/null +++ b/src/scss/_search.scss @@ -0,0 +1,15 @@ + + +.search-container { + margin: 25px; + + #search-input{ + display: block; + margin: auto; + font-size: larger; + } + + #results-container{ + padding-top: 15px; + } +} \ No newline at end of file diff --git a/src/scss/main.scss b/src/scss/main.scss index 84a02d27..90617835 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss @@ -52,3 +52,4 @@ @import "pages/currency"; @import "social_icons"; @import "school"; +@import "search";