diff --git a/404.html b/404.html new file mode 100644 index 00000000..e9194a65 --- /dev/null +++ b/404.html @@ -0,0 +1,11 @@ +--- +layout: default +--- +
+
+

404

+ +

Page not found :(

+

The requested page could not be found.

+ Return Home +
diff --git a/Gemfile b/Gemfile index 8249ac7f..310a5835 100644 --- a/Gemfile +++ b/Gemfile @@ -1,14 +1,21 @@ -source 'https://rubygems.org' -gem "jekyll", "3.5.1" +source "https://rubygems.org" +gem "jekyll", "~> 3.8.4" +# If you want to use GitHub Pages, remove the "gem "jekyll"" above and +# uncomment the line below. To upgrade, run `bundle update github-pages`. +# gem "github-pages", group: :jekyll_plugins + +# If you have any plugins, put them here! group :jekyll_plugins do + gem "jekyll-feed", "~> 0.6" + gem 'jekyll-paginate' gem 'jekyll-redirect-from' gem 'jekyll-sitemap' - gem 'jekyll-paginate' - gem 'rouge' + gem 'jekyll-tidy' end -require 'rbconfig' -if RbConfig::CONFIG['target_os'] =~ /darwin(1[0-3])/i - gem 'rb-fsevent', '<= 0.9.4' -end +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] + +# Performance-booster for watching directories on Windows +gem "wdm", "~> 0.1.0" if Gem.win_platform? diff --git a/Gemfile.lock b/Gemfile.lock index 4d5063fc..218f3e23 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,43 +4,63 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) colorator (1.1.0) - ffi (1.9.18) + concurrent-ruby (1.0.5) + em-websocket (0.5.1) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0.6.0) + eventmachine (1.2.7) + ffi (1.9.25) forwardable-extended (2.6.0) - jekyll (3.5.1) + htmlbeautifier (1.3.1) + htmlcompressor (0.4.0) + http_parser.rb (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + jekyll (3.8.4) addressable (~> 2.4) colorator (~> 1.0) + em-websocket (~> 0.5) + i18n (~> 0.7) jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 1.1) - kramdown (~> 1.3) + jekyll-watch (~> 2.0) + kramdown (~> 1.14) liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) - rouge (~> 1.7) + rouge (>= 1.7, < 4) safe_yaml (~> 1.0) + jekyll-feed (0.11.0) + jekyll (~> 3.3) jekyll-paginate (1.1.0) - jekyll-redirect-from (0.12.1) + jekyll-redirect-from (0.14.0) jekyll (~> 3.3) - jekyll-sass-converter (1.5.0) + jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-sitemap (1.1.1) + jekyll-sitemap (1.2.0) jekyll (~> 3.3) - jekyll-watch (1.5.0) - listen (~> 3.0, < 3.1) - kramdown (1.15.0) - liquid (4.0.0) - listen (3.0.8) + jekyll-tidy (0.2.2) + htmlbeautifier + htmlcompressor + jekyll + jekyll-watch (2.1.2) + listen (~> 3.0) + kramdown (1.17.0) + liquid (4.0.1) + listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + ruby_dep (~> 1.2) mercenary (0.3.6) - pathutil (0.16.0) + pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (3.0.0) - rb-fsevent (0.9.4) + public_suffix (3.0.3) + rb-fsevent (0.10.3) rb-inotify (0.9.10) ffi (>= 0.5.0, < 2) - rouge (1.11.1) + rouge (3.3.0) + ruby_dep (1.5.0) safe_yaml (1.0.4) - sass (3.5.2) + sass (3.6.0) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -50,11 +70,13 @@ PLATFORMS ruby DEPENDENCIES - jekyll (= 3.5.1) + jekyll (~> 3.8.4) + jekyll-feed (~> 0.6) jekyll-paginate jekyll-redirect-from jekyll-sitemap - rouge + jekyll-tidy + tzinfo-data BUNDLED WITH - 1.16.2 + 2.0.1 diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 0334caf0..00000000 --- a/LICENSE +++ /dev/null @@ -1,319 +0,0 @@ -Creative Commons Legal Code - -Attribution 3.0 Unported - - CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE - LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN - ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS - INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES - REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR - DAMAGES RESULTING FROM ITS USE. - -License - -THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE -COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY -COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS -AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. - -BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE -TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY -BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS -CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND -CONDITIONS. - -1. Definitions - - a. "Adaptation" means a work based upon the Work, or upon the Work and - other pre-existing works, such as a translation, adaptation, - derivative work, arrangement of music or other alterations of a - literary or artistic work, or phonogram or performance and includes - cinematographic adaptations or any other form in which the Work may be - recast, transformed, or adapted including in any form recognizably - derived from the original, except that a work that constitutes a - Collection will not be considered an Adaptation for the purpose of - this License. For the avoidance of doubt, where the Work is a musical - work, performance or phonogram, the synchronization of the Work in - timed-relation with a moving image ("synching") will be considered an - Adaptation for the purpose of this License. - b. "Collection" means a collection of literary or artistic works, such as - encyclopedias and anthologies, or performances, phonograms or - broadcasts, or other works or subject matter other than works listed - in Section 1(f) below, which, by reason of the selection and - arrangement of their contents, constitute intellectual creations, in - which the Work is included in its entirety in unmodified form along - with one or more other contributions, each constituting separate and - independent works in themselves, which together are assembled into a - collective whole. A work that constitutes a Collection will not be - considered an Adaptation (as defined above) for the purposes of this - License. - c. "Distribute" means to make available to the public the original and - copies of the Work or Adaptation, as appropriate, through sale or - other transfer of ownership. - d. "Licensor" means the individual, individuals, entity or entities that - offer(s) the Work under the terms of this License. - e. "Original Author" means, in the case of a literary or artistic work, - the individual, individuals, entity or entities who created the Work - or if no individual or entity can be identified, the publisher; and in - addition (i) in the case of a performance the actors, singers, - musicians, dancers, and other persons who act, sing, deliver, declaim, - play in, interpret or otherwise perform literary or artistic works or - expressions of folklore; (ii) in the case of a phonogram the producer - being the person or legal entity who first fixes the sounds of a - performance or other sounds; and, (iii) in the case of broadcasts, the - organization that transmits the broadcast. - f. "Work" means the literary and/or artistic work offered under the terms - of this License including without limitation any production in the - literary, scientific and artistic domain, whatever may be the mode or - form of its expression including digital form, such as a book, - pamphlet and other writing; a lecture, address, sermon or other work - of the same nature; a dramatic or dramatico-musical work; a - choreographic work or entertainment in dumb show; a musical - composition with or without words; a cinematographic work to which are - assimilated works expressed by a process analogous to cinematography; - a work of drawing, painting, architecture, sculpture, engraving or - lithography; a photographic work to which are assimilated works - expressed by a process analogous to photography; a work of applied - art; an illustration, map, plan, sketch or three-dimensional work - relative to geography, topography, architecture or science; a - performance; a broadcast; a phonogram; a compilation of data to the - extent it is protected as a copyrightable work; or a work performed by - a variety or circus performer to the extent it is not otherwise - considered a literary or artistic work. - g. "You" means an individual or entity exercising rights under this - License who has not previously violated the terms of this License with - respect to the Work, or who has received express permission from the - Licensor to exercise rights under this License despite a previous - violation. - h. "Publicly Perform" means to perform public recitations of the Work and - to communicate to the public those public recitations, by any means or - process, including by wire or wireless means or public digital - performances; to make available to the public Works in such a way that - members of the public may access these Works from a place and at a - place individually chosen by them; to perform the Work to the public - by any means or process and the communication to the public of the - performances of the Work, including by public digital performance; to - broadcast and rebroadcast the Work by any means including signs, - sounds or images. - i. "Reproduce" means to make copies of the Work by any means including - without limitation by sound or visual recordings and the right of - fixation and reproducing fixations of the Work, including storage of a - protected performance or phonogram in digital form or other electronic - medium. - -2. Fair Dealing Rights. Nothing in this License is intended to reduce, -limit, or restrict any uses free from copyright or rights arising from -limitations or exceptions that are provided for in connection with the -copyright protection under copyright law or other applicable laws. - -3. License Grant. Subject to the terms and conditions of this License, -Licensor hereby grants You a worldwide, royalty-free, non-exclusive, -perpetual (for the duration of the applicable copyright) license to -exercise the rights in the Work as stated below: - - a. to Reproduce the Work, to incorporate the Work into one or more - Collections, and to Reproduce the Work as incorporated in the - Collections; - b. to create and Reproduce Adaptations provided that any such Adaptation, - including any translation in any medium, takes reasonable steps to - clearly label, demarcate or otherwise identify that changes were made - to the original Work. For example, a translation could be marked "The - original work was translated from English to Spanish," or a - modification could indicate "The original work has been modified."; - c. to Distribute and Publicly Perform the Work including as incorporated - in Collections; and, - d. to Distribute and Publicly Perform Adaptations. - e. For the avoidance of doubt: - - i. Non-waivable Compulsory License Schemes. In those jurisdictions in - which the right to collect royalties through any statutory or - compulsory licensing scheme cannot be waived, the Licensor - reserves the exclusive right to collect such royalties for any - exercise by You of the rights granted under this License; - ii. Waivable Compulsory License Schemes. In those jurisdictions in - which the right to collect royalties through any statutory or - compulsory licensing scheme can be waived, the Licensor waives the - exclusive right to collect such royalties for any exercise by You - of the rights granted under this License; and, - iii. Voluntary License Schemes. The Licensor waives the right to - collect royalties, whether individually or, in the event that the - Licensor is a member of a collecting society that administers - voluntary licensing schemes, via that society, from any exercise - by You of the rights granted under this License. - -The above rights may be exercised in all media and formats whether now -known or hereafter devised. The above rights include the right to make -such modifications as are technically necessary to exercise the rights in -other media and formats. Subject to Section 8(f), all rights not expressly -granted by Licensor are hereby reserved. - -4. Restrictions. The license granted in Section 3 above is expressly made -subject to and limited by the following restrictions: - - a. You may Distribute or Publicly Perform the Work only under the terms - of this License. You must include a copy of, or the Uniform Resource - Identifier (URI) for, this License with every copy of the Work You - Distribute or Publicly Perform. You may not offer or impose any terms - on the Work that restrict the terms of this License or the ability of - the recipient of the Work to exercise the rights granted to that - recipient under the terms of the License. You may not sublicense the - Work. You must keep intact all notices that refer to this License and - to the disclaimer of warranties with every copy of the Work You - Distribute or Publicly Perform. When You Distribute or Publicly - Perform the Work, You may not impose any effective technological - measures on the Work that restrict the ability of a recipient of the - Work from You to exercise the rights granted to that recipient under - the terms of the License. This Section 4(a) applies to the Work as - incorporated in a Collection, but this does not require the Collection - apart from the Work itself to be made subject to the terms of this - License. If You create a Collection, upon notice from any Licensor You - must, to the extent practicable, remove from the Collection any credit - as required by Section 4(b), as requested. If You create an - Adaptation, upon notice from any Licensor You must, to the extent - practicable, remove from the Adaptation any credit as required by - Section 4(b), as requested. - b. If You Distribute, or Publicly Perform the Work or any Adaptations or - Collections, You must, unless a request has been made pursuant to - Section 4(a), keep intact all copyright notices for the Work and - provide, reasonable to the medium or means You are utilizing: (i) the - name of the Original Author (or pseudonym, if applicable) if supplied, - and/or if the Original Author and/or Licensor designate another party - or parties (e.g., a sponsor institute, publishing entity, journal) for - attribution ("Attribution Parties") in Licensor's copyright notice, - terms of service or by other reasonable means, the name of such party - or parties; (ii) the title of the Work if supplied; (iii) to the - extent reasonably practicable, the URI, if any, that Licensor - specifies to be associated with the Work, unless such URI does not - refer to the copyright notice or licensing information for the Work; - and (iv) , consistent with Section 3(b), in the case of an Adaptation, - a credit identifying the use of the Work in the Adaptation (e.g., - "French translation of the Work by Original Author," or "Screenplay - based on original Work by Original Author"). The credit required by - this Section 4 (b) may be implemented in any reasonable manner; - provided, however, that in the case of a Adaptation or Collection, at - a minimum such credit will appear, if a credit for all contributing - authors of the Adaptation or Collection appears, then as part of these - credits and in a manner at least as prominent as the credits for the - other contributing authors. For the avoidance of doubt, You may only - use the credit required by this Section for the purpose of attribution - in the manner set out above and, by exercising Your rights under this - License, You may not implicitly or explicitly assert or imply any - connection with, sponsorship or endorsement by the Original Author, - Licensor and/or Attribution Parties, as appropriate, of You or Your - use of the Work, without the separate, express prior written - permission of the Original Author, Licensor and/or Attribution - Parties. - c. Except as otherwise agreed in writing by the Licensor or as may be - otherwise permitted by applicable law, if You Reproduce, Distribute or - Publicly Perform the Work either by itself or as part of any - Adaptations or Collections, You must not distort, mutilate, modify or - take other derogatory action in relation to the Work which would be - prejudicial to the Original Author's honor or reputation. Licensor - agrees that in those jurisdictions (e.g. Japan), in which any exercise - of the right granted in Section 3(b) of this License (the right to - make Adaptations) would be deemed to be a distortion, mutilation, - modification or other derogatory action prejudicial to the Original - Author's honor and reputation, the Licensor will waive or not assert, - as appropriate, this Section, to the fullest extent permitted by the - applicable national law, to enable You to reasonably exercise Your - right under Section 3(b) of this License (right to make Adaptations) - but not otherwise. - -5. Representations, Warranties and Disclaimer - -UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR -OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY -KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, -INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, -FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF -LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, -WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION -OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. - -6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE -LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR -ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES -ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS -BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. Termination - - a. This License and the rights granted hereunder will terminate - automatically upon any breach by You of the terms of this License. - Individuals or entities who have received Adaptations or Collections - from You under this License, however, will not have their licenses - terminated provided such individuals or entities remain in full - compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will - survive any termination of this License. - b. Subject to the above terms and conditions, the license granted here is - perpetual (for the duration of the applicable copyright in the Work). - Notwithstanding the above, Licensor reserves the right to release the - Work under different license terms or to stop distributing the Work at - any time; provided, however that any such election will not serve to - withdraw this License (or any other license that has been, or is - required to be, granted under the terms of this License), and this - License will continue in full force and effect unless terminated as - stated above. - -8. Miscellaneous - - a. Each time You Distribute or Publicly Perform the Work or a Collection, - the Licensor offers to the recipient a license to the Work on the same - terms and conditions as the license granted to You under this License. - b. Each time You Distribute or Publicly Perform an Adaptation, Licensor - offers to the recipient a license to the original Work on the same - terms and conditions as the license granted to You under this License. - c. If any provision of this License is invalid or unenforceable under - applicable law, it shall not affect the validity or enforceability of - the remainder of the terms of this License, and without further action - by the parties to this agreement, such provision shall be reformed to - the minimum extent necessary to make such provision valid and - enforceable. - d. No term or provision of this License shall be deemed waived and no - breach consented to unless such waiver or consent shall be in writing - and signed by the party to be charged with such waiver or consent. - e. This License constitutes the entire agreement between the parties with - respect to the Work licensed here. There are no understandings, - agreements or representations with respect to the Work not specified - here. Licensor shall not be bound by any additional provisions that - may appear in any communication from You. This License may not be - modified without the mutual written agreement of the Licensor and You. - f. The rights granted under, and the subject matter referenced, in this - License were drafted utilizing the terminology of the Berne Convention - for the Protection of Literary and Artistic Works (as amended on - September 28, 1979), the Rome Convention of 1961, the WIPO Copyright - Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 - and the Universal Copyright Convention (as revised on July 24, 1971). - These rights and subject matter take effect in the relevant - jurisdiction in which the License terms are sought to be enforced - according to the corresponding provisions of the implementation of - those treaty provisions in the applicable national law. If the - standard suite of rights granted under applicable copyright law - includes additional rights not granted under this License, such - additional rights are deemed to be included in the License; this - License is not intended to restrict the license of any rights under - applicable law. - - -Creative Commons Notice - - Creative Commons is not a party to this License, and makes no warranty - whatsoever in connection with the Work. Creative Commons will not be - liable to You or any party on any legal theory for any damages - whatsoever, including without limitation any general, special, - incidental or consequential damages arising in connection to this - license. Notwithstanding the foregoing two (2) sentences, if Creative - Commons has expressly identified itself as the Licensor hereunder, it - shall have all rights and obligations of Licensor. - - Except for the limited purpose of indicating to the public that the - Work is licensed under the CCPL, Creative Commons does not authorize - the use by either party of the trademark "Creative Commons" or any - related trademark or logo of Creative Commons without the prior - written consent of Creative Commons. Any permitted use will be in - compliance with Creative Commons' then-current trademark usage - guidelines, as may be published on its website or otherwise made - available upon request from time to time. For the avoidance of doubt, - this trademark restriction does not form part of this License. - - Creative Commons may be contacted at http://creativecommons.org/. \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..c7b98eca --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,407 @@ +Attribution-NonCommercial 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution-NonCommercial 4.0 International Public +License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution-NonCommercial 4.0 International Public License ("Public +License"). To the extent this Public License may be interpreted as a +contract, You are granted the Licensed Rights in consideration of Your +acceptance of these terms and conditions, and the Licensor grants You +such rights in consideration of benefits the Licensor receives from +making the Licensed Material available under these terms and +conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + d. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + e. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + f. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + g. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + h. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + i. NonCommercial means not primarily intended for or directed towards + commercial advantage or monetary compensation. For purposes of + this Public License, the exchange of the Licensed Material for + other material subject to Copyright and Similar Rights by digital + file-sharing or similar means is NonCommercial provided there is + no payment of monetary compensation in connection with the + exchange. + + j. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + k. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + l. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part, for NonCommercial purposes only; and + + b. produce, reproduce, and Share Adapted Material for + NonCommercial purposes only. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties, including when + the Licensed Material is used other than for NonCommercial + purposes. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + 4. If You Share Adapted Material You produce, the Adapter's + License You apply must not prevent recipients of the Adapted + Material from complying with this Public License. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database for NonCommercial purposes + only; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material; and + + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/README.md b/README.md index 34a542cd..f08bea20 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # Start Bootstrap -A library of open source, free to download, HTML starter templates for [Bootstrap](https://getbootstrap.com/) +A library of open source, free to download, HTML starter templates for [Bootstrap](http://getbootstrap.com/) All of the templates and themes featured on Start Bootstrap are up to date for Bootstrap 4! -For more information please visit the website at . +For more information please visit the website at . ## Snippets diff --git a/_config.yml b/_config.yml index 35442f0d..84d68ab4 100644 --- a/_config.yml +++ b/_config.yml @@ -1,49 +1,56 @@ # Site Information -license: "MIT" -license-url: "https://github.com/BlackrockDigital/startbootstrap/blob/gh-pages/LICENSE" -author: "Blackrock Digital" +license: "MIT" +license-url: "https://github.com/BlackrockDigital/startbootstrap/blob/gh-pages/LICENSE" +author: "Blackrock Digital" # Site Settings -baseurl: "" +baseurl: "" # Build settings -exclude: [node_modules] - -# Dependencies -markdown: kramdown -highlighter: rouge +markdown: kramdown +exclude: [node_modules] # Permalinks -permalink: /articles/:year/:month/:day/:title/ +permalink: /blog/:year/:month/:day/:title/ # Server -url: https://startbootstrap.com -enforce_ssl: startbootstrap.com -encoding: UTF-8 -host: localhost -port: 9000 +url: https://startbootstrap.com +enforce_ssl: startbootstrap.com +encoding: UTF-8 +host: localhost +port: 9000 # Plugins plugins: - - jekyll-sitemap - - jekyll-redirect-from + - jekyll-feed - jekyll-paginate - - rouge + - jekyll-redirect-from + - jekyll-sitemap + - jekyll-tidy # Collections collections: - premium: - output: false + themes: + output: true + permalink: /:collection/:title/ templates: - output: true - permalink: /template-overviews/:title/ + output: true + permalink: /:collection/:title/ snippets: - output: true - permalink: /snippets/:title/ + output: true + permalink: /:collection/:title/ + guides: + output: true + permalink: /:collection/:title/ + previews: + output: true + permalink: /:collection/:title/ + premium: + output: false # Pagination paginate: 5 -paginate_path: "/articles/page:num/" +paginate_path: "/blog/page:num/" # Blog Excerpt Separator excerpt_separator: "" diff --git a/_data/resources-dev-visual.yml b/_data/resources-dev-visual.yml index 0d5b45ba..4ea0f701 100644 --- a/_data/resources-dev-visual.yml +++ b/_data/resources-dev-visual.yml @@ -16,7 +16,7 @@ - name: Bootstrap Studio link: https://bootstrapstudio.io/ description: A powerful desktop app for creating responsive websites using the Bootstrap framework. - supports: bs3 + supports: bs4 - name: Form Builder link: https://bootsnipp.com/forms diff --git a/_data/resources-official.yml b/_data/resources-official.yml index 5f728969..5a174868 100644 --- a/_data/resources-official.yml +++ b/_data/resources-official.yml @@ -6,14 +6,6 @@ link: http://blog.getbootstrap.com/ description: The official bootstrap blog. Announcements, discussions, and more for Bootstrap. -- name: Bootstrap Jobs - link: https://jobs.getbootstrap.com/ - description: Find your next job - imagine what you could be working on. - -- name: Bootstrap Themes - link: https://themes.getbootstrap.com/ - description: Official Themes from Bootstrap's creators. - - name: Bootstrap Expo link: http://expo.getbootstrap.com/ description: Beautiful and inspiring uses of Bootstrap, curated by @mdo. @@ -21,7 +13,3 @@ - name: Bootlint link: https://github.com/twbs/bootlint description: An HTML linter for Bootstrap projects. - -- name: Ratchet - link: http://goratchet.com/ - description: Build mobile apps with simple HTML, CSS, and JS components. diff --git a/_data/resources-templates-free.yml b/_data/resources-templates-free.yml index 60a24c0f..c1f9c65e 100644 --- a/_data/resources-templates-free.yml +++ b/_data/resources-templates-free.yml @@ -1,15 +1,7 @@ - name: Start Bootstrap link: https://startbootstrap.com/ - description: Free to download, open source templates and themes for Bootstrap up to date for Bootstrap 4! + description: Start Bootstrap creates free, open source, MIT license, Bootstrap themes, templates, and code snippets for you to use on any project, guides to help you learn more about designing and developing with the Bootstrap framework, and premium Bootstrap products. - name: Bootswatch link: http://bootswatch.com/ - description: Free themes for Bootstrap, simply download a CSS file and replace the one in Bootstrap. - -- name: BlackTie - link: http://blacktie.co/ - description: Free Handsome Bootstrap Themes - -- name: BootstrapMade - link: https://bootstrapmade.com/ - description: Elegant, clean and beautiful free website templates using Bootstrap, the most popular HTML, CSS & JS framework. + description: A collection of easy to use, open source swatches for Bootstrap. diff --git a/_data/resources-templates-premium-marketplaces.yml b/_data/resources-templates-premium-marketplaces.yml index 5c3534dd..bec71140 100644 --- a/_data/resources-templates-premium-marketplaces.yml +++ b/_data/resources-templates-premium-marketplaces.yml @@ -1,19 +1,19 @@ +- name: Bootstrap Themes + link: https://themes.getbootstrap.com/ + description: Bootstrap Themes sells themes built by or reviewed by Bootstrap's creators. The Boostrap team reviews every new theme and update against a set of guidelines they wrote. + +- name: WrapBootstrap + link: https://wrapbootstrap.com/?ref=StartBootstrap + description: WrapBootstrap was one of the first third-party marketplaces dedicated to selling premium Bootstrap templates and themes. + - name: BootstrapBay - link: https://bootstrapbay.com/?ref=StartBootstrap - description: BootstrapBay is a marketplace for Bootstrap themes & templates. + link: https://bootstrapbay.sjv.io/N0yAv + description: BootstrapBay is a third-party marketplace for Bootstrap themes & templates, operating since 2014. - name: ThemeForest - link: https://themeforest.net/tags/bootstrap?ref=BlackrockDigital - description: ThemeForest is a popular marketplace for website templates, where you can browse through thousands of Bootstrap templates. + link: https://1.envato.market/4m9dG + description: ThemeForest is a very popular marketplace for website themes. There are thousands of Bootstrap based products on ThemeForest to choose from. - name: Creative Market link: https://creativemarket.com/themes/bootstrap?u=StartBootstrap - description: A collection of over 1000 premium, hand picked Bootstrap templates and themes on Creative Market, a design content marketplace. - -- name: ThemeHunt - link: https://themehunt.com/?ref=StartBootstrap - description: A marketplace of responsive HTML templates from a huge community of professional authors to create your amazing online presence. - -- name: Gridgum - link: https://gridgum.com/themes/category/bootstrap-themes/?affiliates=360 - description: Gridgum is a marketplace for responsive themes and templates. + description: Creative Market is another third-party vendor marketplace that offers a variety of general design assets. Creative Market has many Bootstrap built themes to choose from. diff --git a/_data/resources-templates-premium-vendors.yml b/_data/resources-templates-premium-vendors.yml index bfedb363..741d8c1d 100644 --- a/_data/resources-templates-premium-vendors.yml +++ b/_data/resources-templates-premium-vendors.yml @@ -1,19 +1,15 @@ - name: Creative Tim link: https://www.creative-tim.com?affiliate_id=101249 - description: Premium Bootstrap themes, templates, UI Kits and more developed by Creative Tim. + description: A selection of premium Bootstrap themes, templates, UI kits and more - developed by Creative Tim. - name: Designmodo - link: http://designmodo.com/shop/?u=787 - description: Designmodo has a collection of premium static website builders created using the Bootstrap framework. + link: https://designmodo.com/startup/?u=787 + description: Designmodo's Startup Framework is a Bootstrap based website generator, which is a high quality solution for those who want a beautiful startup website quickly. -- name: Material Design for Bootstrap 4 - link: https://mdbootstrap.com/material-design-for-bootstrap/?utm_ref_id=28366 - description: Powerful and free Material Design UI KIT for Bootstrap 4 with a premium version available for purchase. +- name: MDBootstrap + link: https://mdbootstrap.com/products/?utm_ref_id=28366 + description: Material Design based dashboard and UI kit products for Bootstrap 4. - name: Themefisher link: https://themefisher.com/premium-templates/ - description: Incredible website templates with fresh elegant designs for your next project! - -- name: Flatlogic - link: https://flatlogic.com/admin-dashboards - description: Bootstrap admin dashboard templates built with React, Angular and Vue.js + description: A selection of Bootstrap based themes built by the design team at Themefisher. diff --git a/_guides/2019-02-05-how-to-create-a-website-with-github-pages.md b/_guides/2019-02-05-how-to-create-a-website-with-github-pages.md new file mode 100644 index 00000000..687eb21d --- /dev/null +++ b/_guides/2019-02-05-how-to-create-a-website-with-github-pages.md @@ -0,0 +1,108 @@ +--- +title: "How to Create and Launch a Website from Start to Finish" +description: "A beginners guide to publishing websites using themes from Start Bootstrap and GitHub Pages" + +date: 2019-02-05 + +src: /guides/how-to-create-a-website-with-github-pages + +categories: + - beginner + +layout: guide +type: guide + +meta-title: "Create and Launch a Website from Start to Finish" +meta-description: "A beginners guide to publishing a website using themes from Start Bootstrap and hosting by GitHub Pages" +--- + +### Before we begin +**Technical Requirements:** In this guide you will be editing the content of a website theme! You will need to have some working knowledge of HTML to do so. + +**Optional Requirements:** If you want to edit your theme's style (colors, fonts, etc.), you will need to have some working knowledge of CSS - this isn't required if you are happy with the default design of the theme you choose. + +### Introduction + +GitHub Pages is a great way to get a simple, static website published online - especially when you use a predesigned theme from Start Bootstrap! There are plenty of benefits to having your code on GitHub, but for the purposes of this guide, the major bonus is that you can host a static website for free! So let’s get started! + +### Step 1: Create a GitHub account + +First things first, since you are setting up a website using GitHub Pages, you will need a GitHub account if you don’t already have one. To do this, just go to https://github.com and register for an account - it’s free! + +### Step 2: Download GitHub Desktop + +Many folks use their terminal to push and pull files to and from GitHub, but since this is a beginner level guide we’re going to be using GitHub’s super handy desktop client instead of the terminal. GitHub Desktop is also free to download, and it’s available at https://desktop.github.com/. After downloading and installing, open up GitHub Desktop and login using your GitHub account credentials. + +### Step 3: Choose a theme + +Now that we have a GitHub account and the desktop client installed, it’s time to choose a theme! You can browse the predesigned Bootstrap themes at https://startbootstrap.com/themes to get started. Once you’ve chosen a theme meets your needs, we will then need to make a copy of the theme by ‘forking’ the repository. + +### Step 4: Fork your theme + +From the theme overview page of the theme you’ve chosen, click on the ‘View on GitHub’ button that is just below the download and live preview buttons on the right hand sidebar - you can see an example below on the resume theme overview page. + + + +Once you’re on GitHub, you will need to click on the ‘Fork’ button at the very top of the screen, which will create a copy of the repository under your account - shown below. + + + +At this point, you can change the name of the repository - for example - if you forked ‘startbootstrap-resume’ you could change this to ‘my-resume’ if you choose. You can do this under your repository settings. + +After your repository is forked, you will then need to clone it to your local machine. + +### Step 5: Clone your theme + +Cloning a theme is easy on GitHub. Once you have forked your chosen theme, go to the repository and click on the green ‘Clone or Download’ button and choose ‘Open in Desktop’ - shown below. + + + +This will open your GitHub Desktop application and prompt you to clone the repository files to a folder on your PC. Once the files are on your local machine, you will be able to edit them. + +### Step 6: Modify your theme + +Once you have the theme running locally, it’s time to edit. At this point, just open the theme’s HTML file(s) in your favorite code editor and modify the content. For beginners, all you need to do is edit the content within the HTML files. If you want to do anything like change the colors of the theme though, you will need to have some knowledge of CSS. Once you’re finished editing, it’s time to publish! + +### Step 7: Commit and push the modified files + +Now open the GitHub Desktop application. Since you edited some files locally, the program will detect the files that have changed. It’s time to push these changes to GitHub. Simply enter a commit message in the box provided (in the lower left hand part of the application), and a description if you want to, and then click on ‘Commit to master’ - shown below. + + + +This doesn’t push the changes to GitHub yet! To do that you will need to click on ‘Push origin’ at the top of the screen - shown below. + + + +Now, if you go to your repository on GitHub, you will see that the changes have been made! Go to your repository on GitHub’s website and verify that the changes were made to the repository. On your fork of the repository, you should see the commit message with a timestamp on the files that have changed. + +### Step 8: Merge the modified files into the gh-pages branch + +Your changes have been committed and pushed to the master branch of your repository, but when using GitHub pages, the files in the gh-pages branch are the ones that are hosted. That means we need to merge the modified files from the master branch into gh-pages branch! + +Merging your master branch into gh-pages takes a few steps. First you will need to go to your repo and click on the ‘New pull request’ button - make sure your master branch is selected! + + + +After this, since we forked the theme from somewhere else, you will want to make sure the base repository is your own repository, not the one from Start Bootstrap. To do this, change the base repository in the dropdown provided to username/repository-name. + +Once you’ve set the base repository to your own account, you will have the option to set the base branch for this pull request. Using the dropdown, make sure the base repository is set to gh-pages. This will compare the master branch to the gh-pages branch. + + + +At this point, you should see the commit message and a summary of the files that will be merged. Click on ‘Create pull request’ - seen below. + + + +Finally, you will need to click on 'Merge pull request' and then 'Confirm merge' to finalize the merge. + + + +If everything has gone as planned, the gh-pages branch will now be identical to the master branch, and GitHub Pages will be serving your files to a website located at username.github.io/repository-name. Keep in mind that it will probably take a few minutes for the changes to go live as the server catches up. Give it some time, and check to make sure your website is live after a few minutes! + +### Additional details + +If you want to update your website, just use this same guide and repeat steps 6-8. You'll be making changes locally, pushing the changes to the master branch on your GitHub repository, and then merging the master branch into the gh-pages branch again! + +If you want to use a custom domain for your website, you can also set that up with GitHub pages. You will need to purchase a domain from a domain name provider, and then point the domain to GitHub’s name servers. GitHub has some handy documentation on how to do this on their custom domain setup page! + +That’s it! You now have a website online with free hosting thanks to GitHub pages! Thanks for checking out this Start Bootstrap beginner tutorial! Make sure to subscribe to our mailing list and follow Start Bootstrap on Twitter for new guides, updated themes, and more Bootstrap related content! diff --git a/_guides/_drafts/2019-01-18-applied-design-principles-whitespace.md b/_guides/_drafts/2019-01-18-applied-design-principles-whitespace.md new file mode 100644 index 00000000..9f8cf74d --- /dev/null +++ b/_guides/_drafts/2019-01-18-applied-design-principles-whitespace.md @@ -0,0 +1,18 @@ +--- +title: "Applied Design Principles: Working with Whitespace" +description: "Applied examples of how whitespace can improve a page's design quality" + +date: 2019-01-18 + +src: /guides/applied-design-principles-whitespace + +categories: + - new + - design + +layout: page +type: theme + +meta-title: "Applied Design Principles: Working with Whitespace" +meta-description: "Applied examples of how whitespace can improve a page's design quality" +--- diff --git a/_guides/_drafts/2019-01-19-gulp-npm-workflow-for-designers.md b/_guides/_drafts/2019-01-19-gulp-npm-workflow-for-designers.md new file mode 100644 index 00000000..28a6aeb7 --- /dev/null +++ b/_guides/_drafts/2019-01-19-gulp-npm-workflow-for-designers.md @@ -0,0 +1,18 @@ +--- +title: "Gulp and npm Workflow Essentials for Designers" +description: "A step-by-step introduction to creating an automated workflow environment using command line tools" + +date: 2019-01-19 + +src: /guides/gulp-npm-workflow-for-designers + +categories: + - new + - development + +layout: page +type: template + +meta-title: "Gulp and npm Workflow Essentials for Designers" +meta-description: "A step-by-step introduction to creating an automated workflow environment using command line tools" +--- diff --git a/_includes/ad.html b/_includes/carbon.html similarity index 100% rename from _includes/ad.html rename to _includes/carbon.html diff --git a/_includes/footer.html b/_includes/footer.html index c004d43b..f3cc70f1 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,36 +1,8 @@