Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: st4ple/solid-jekyll
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: achopijolabs/achopijolabs.github.io
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on Jun 20, 2016

  1. Copy the full SHA
    b3db994 View commit details
  2. https for google fonts

    achopijocoder committed Jun 20, 2016
    Copy the full SHA
    f718aaf View commit details

Commits on Jun 29, 2016

  1. cambios web

    achopijocoder committed Jun 29, 2016
    Copy the full SHA
    4b69f5f View commit details

Commits on Jul 12, 2016

  1. Copy the full SHA
    7a86a27 View commit details

Commits on Jul 13, 2016

  1. Copy the full SHA
    fa188c0 View commit details
  2. Copy the full SHA
    2d50bf8 View commit details

Commits on Jul 26, 2016

  1. Copy the full SHA
    ad87bf5 View commit details

Commits on Jul 27, 2016

  1. member page done

    achopijocoder committed Jul 27, 2016
    Copy the full SHA
    8aa31e8 View commit details

Commits on Jul 28, 2016

  1. Copy the full SHA
    2712b71 View commit details
  2. memeber details updated

    achopijocoder committed Jul 28, 2016
    Copy the full SHA
    961d252 View commit details

Commits on Jul 29, 2016

  1. Update style.css

    added Montserrat
    achopijocoder authored Jul 29, 2016
    Copy the full SHA
    e3b38e7 View commit details
  2. Cloudflare changes

    achopijocoder committed Jul 29, 2016
    Copy the full SHA
    fced53c View commit details
  3. Delete CNAME

    achopijocoder authored Jul 29, 2016
    Copy the full SHA
    4acfa93 View commit details
  4. Update head.html

    achopijocoder authored Jul 29, 2016
    Copy the full SHA
    f284604 View commit details
  5. Create CNAME

    achopijocoder authored Jul 29, 2016
    Copy the full SHA
    1d649b5 View commit details

Commits on Aug 2, 2016

  1. Copy the full SHA
    5218164 View commit details

Commits on Sep 13, 2016

  1. Create juanlubarreda.txt

    Fichero para ideas de posts
    achopijocoder authored Sep 13, 2016
    Copy the full SHA
    9775bd3 View commit details

Commits on Sep 14, 2016

  1. Copy the full SHA
    12846f8 View commit details

Commits on Sep 17, 2016

  1. Comentarios DISQUS

    achopijocoder committed Sep 17, 2016
    Copy the full SHA
    c5dd391 View commit details
  2. Copy the full SHA
    ed37a79 View commit details

Commits on Sep 22, 2016

  1. Copy the full SHA
    3da741e View commit details

Commits on Sep 23, 2016

  1. header finished

    achopijocoder committed Sep 23, 2016
    Copy the full SHA
    a4f766a View commit details

Commits on Oct 17, 2016

  1. Copy the full SHA
    cc42a78 View commit details

Commits on Oct 22, 2016

  1. ofii queued

    achopijocoder committed Oct 22, 2016
    Copy the full SHA
    9697db1 View commit details
  2. New project school core

    achopijocoder committed Oct 22, 2016
    Copy the full SHA
    c40dca0 View commit details

Commits on Oct 23, 2016

  1. Copy the full SHA
    8f2c166 View commit details
  2. asdfasdfasdfsdf

    senorpatata committed Oct 23, 2016
    Copy the full SHA
    7868e38 View commit details
  3. Ya saco bonicoh

    senorpatata committed Oct 23, 2016
    Copy the full SHA
    a7a815b View commit details

Commits on Nov 24, 2016

  1. Update _config.yml

    achopijocoder authored Nov 24, 2016
    Copy the full SHA
    3abb5b7 View commit details

Commits on Jan 9, 2017

  1. Copy the full SHA
    4c192f0 View commit details
  2. CNAME file

    achopijocoder committed Jan 9, 2017
    Copy the full SHA
    0ea121e View commit details

Commits on Apr 19, 2017

  1. Copy the full SHA
    6beb70c View commit details

Commits on May 16, 2017

  1. updated url play store

    achopijocoder authored May 16, 2017
    Copy the full SHA
    c159062 View commit details

Commits on May 17, 2017

  1. Copy the full SHA
    71da853 View commit details

Commits on May 28, 2017

  1. Copy the full SHA
    f1534dc View commit details

Commits on Oct 30, 2017

  1. Copy the full SHA
    f17fe87 View commit details
  2. Actualizacion privacy

    achopijocoder committed Oct 30, 2017
    Copy the full SHA
    d984f99 View commit details

Commits on Nov 2, 2017

  1. Copy the full SHA
    006ec3f View commit details
  2. Copy the full SHA
    c7846cf View commit details

Commits on Nov 11, 2017

  1. Copy the full SHA
    5062573 View commit details

Commits on Dec 5, 2017

  1. Copy the full SHA
    3b740f4 View commit details

Commits on Jan 31, 2018

  1. Copy the full SHA
    d4805d2 View commit details
  2. Copy the full SHA
    2b37b88 View commit details
  3. Update thesaas.min.css

    achopijocoder authored Jan 31, 2018
    Copy the full SHA
    aa785eb View commit details
  4. Update thesaas.min.css

    achopijocoder authored Jan 31, 2018
    Copy the full SHA
    7d76775 View commit details
  5. Update thesaas.min.css

    achopijocoder authored Jan 31, 2018
    Copy the full SHA
    8c17995 View commit details
Showing with 15,904 additions and 11,602 deletions.
  1. +0 −1 .gitignore
  2. +1 −0 CNAME
  3. +22 −0 LICENSE
  4. +46 −79 README.md
  5. +0 −109 _config.yml
  6. +0 −28 _includes/carousel.html
  7. +0 −12 _includes/clients.html
  8. +0 −507 _includes/css/style.css
  9. +0 −29 _includes/footer.html
  10. +0 −30 _includes/head.html
  11. +0 −15 _includes/header.html
  12. +0 −102 _includes/js.html
  13. +0 −26 _includes/members.html
  14. +0 −23 _includes/nav.html
  15. +0 −21 _includes/portfolio.html
  16. +0 −47 _includes/sidebar.html
  17. +0 −13 _includes/testimonial.html
  18. +0 −7 _includes/wrap.html
  19. +0 −10 _layouts/about.html
  20. +0 −6 _layouts/blog.html
  21. +0 −6 _layouts/contact.html
  22. +0 −14 _layouts/default.html
  23. +0 −9 _layouts/index.html
  24. +0 −8 _layouts/portfolio.html
  25. +0 −31 _layouts/post.html
  26. +0 −32 _layouts/project.html
  27. +0 −30 _layouts/question.html
  28. +0 −1 _layouts/style.css
  29. +0 −31 _posts/blog/2014-04-25-logo-design-contest-starts-now.markdown
  30. +0 −31 _posts/blog/2014-04-25-our-new-logo-is-here.markdown
  31. +0 −31 _posts/blog/2014-04-25-time-to-change-your-apps.markdown
  32. +0 −22 _posts/project/2014-04-15-your-project-name.markdown
  33. +0 −22 _posts/project/2014-04-16-your-project-name.markdown
  34. +0 −22 _posts/project/2014-04-17-your-project-name.markdown
  35. +0 −22 _posts/project/2014-04-18-your-project-name.markdown
  36. +0 −22 _posts/project/2014-04-19-your-project-name.markdown
  37. +0 −22 _posts/project/2014-04-20-your-project-name.markdown
  38. +0 −22 _posts/project/2014-04-21-your-project-name.markdown
  39. +0 −22 _posts/project/2014-04-22-your-project-name.markdown
  40. +0 −22 _posts/project/2014-04-23-your-project-name.markdown
  41. +0 −21 _posts/project/2014-04-25-your-project-name.markdown
  42. +0 −9 _posts/question/2014-04-15-your-project-name.markdown
  43. +0 −20 about.html
  44. +0 −5,785 assets/css/bootstrap.css
  45. +11 −0 assets/css/core.min.css
  46. +0 −4 assets/css/font-awesome.min.css
  47. +0 −2,838 assets/css/hoverex-all.css
  48. BIN assets/css/images/prettyPhoto/dark_rounded/btnNext.png
  49. BIN assets/css/images/prettyPhoto/dark_rounded/btnPrevious.png
  50. BIN assets/css/images/prettyPhoto/dark_rounded/contentPattern.png
  51. BIN assets/css/images/prettyPhoto/dark_rounded/loader.gif
  52. BIN assets/css/images/prettyPhoto/dark_rounded/sprite.png
  53. BIN assets/css/images/prettyPhoto/dark_square/btnNext.png
  54. BIN assets/css/images/prettyPhoto/dark_square/btnPrevious.png
  55. BIN assets/css/images/prettyPhoto/dark_square/loader.gif
  56. BIN assets/css/images/prettyPhoto/dark_square/sprite.png
  57. BIN assets/css/images/prettyPhoto/default/default_thumb.png
  58. BIN assets/css/images/prettyPhoto/default/loader.gif
  59. BIN assets/css/images/prettyPhoto/default/sprite.png
  60. BIN assets/css/images/prettyPhoto/default/sprite_next.png
  61. BIN assets/css/images/prettyPhoto/default/sprite_prev.png
  62. BIN assets/css/images/prettyPhoto/default/sprite_x.png
  63. BIN assets/css/images/prettyPhoto/default/sprite_y.png
  64. BIN assets/css/images/prettyPhoto/facebook/btnNext.png
  65. BIN assets/css/images/prettyPhoto/facebook/btnPrevious.png
  66. BIN assets/css/images/prettyPhoto/facebook/contentPatternBottom.png
  67. BIN assets/css/images/prettyPhoto/facebook/contentPatternLeft.png
  68. BIN assets/css/images/prettyPhoto/facebook/contentPatternRight.png
  69. BIN assets/css/images/prettyPhoto/facebook/contentPatternTop.png
  70. BIN assets/css/images/prettyPhoto/facebook/default_thumbnail.gif
  71. BIN assets/css/images/prettyPhoto/facebook/loader.gif
  72. BIN assets/css/images/prettyPhoto/facebook/sprite.png
  73. BIN assets/css/images/prettyPhoto/light_rounded/btnNext.png
  74. BIN assets/css/images/prettyPhoto/light_rounded/btnPrevious.png
  75. BIN assets/css/images/prettyPhoto/light_rounded/loader.gif
  76. BIN assets/css/images/prettyPhoto/light_rounded/sprite.png
  77. BIN assets/css/images/prettyPhoto/light_square/btnNext.png
  78. BIN assets/css/images/prettyPhoto/light_square/btnPrevious.png
  79. BIN assets/css/images/prettyPhoto/light_square/sprite.png
  80. +0 −170 assets/css/prettyPhoto.css
  81. +40 −3 assets/css/style.css
  82. +9,223 −0 assets/css/thesaas.css
  83. +61 −0 assets/css/thesaas.css.map
  84. +1 −0 assets/css/thesaas.min.css
  85. +61 −0 assets/css/thesaas.min.css.map
  86. BIN assets/fonts/FontAwesome.otf
  87. BIN assets/fonts/et-line.eot
  88. +1,214 −0 assets/fonts/et-line.svg
  89. BIN assets/fonts/et-line.ttf
  90. BIN assets/fonts/et-line.woff
  91. BIN assets/fonts/fontawesome-webfont.eot
  92. +2,668 −411 assets/fonts/fontawesome-webfont.svg
  93. BIN assets/fonts/fontawesome-webfont.ttf
  94. BIN assets/fonts/fontawesome-webfont.woff
  95. BIN assets/fonts/fontawesome-webfont.woff2
  96. BIN assets/fonts/glyphicons-halflings-regular.eot
  97. +0 −229 assets/fonts/glyphicons-halflings-regular.svg
  98. BIN assets/fonts/glyphicons-halflings-regular.ttf
  99. BIN assets/fonts/glyphicons-halflings-regular.woff
  100. BIN assets/fonts/themify.eot
  101. +362 −0 assets/fonts/themify.svg
  102. BIN assets/fonts/themify.ttf
  103. BIN assets/fonts/themify.woff
  104. BIN assets/img/about.jpg
  105. BIN assets/img/apple-touch-icon.png
  106. BIN assets/img/blog/post01.jpg
  107. BIN assets/img/blog/post02.jpg
  108. BIN assets/img/blog/post03.jpg
  109. BIN assets/img/blog/thumbs/thumb01.jpg
  110. BIN assets/img/blog/thumbs/thumb02.jpg
  111. BIN assets/img/blog/thumbs/thumb03.jpg
  112. BIN assets/img/blog/thumbs/thumb04.jpg
  113. BIN assets/img/browser.png
  114. BIN assets/img/clients/client01.png
  115. BIN assets/img/clients/client02.png
  116. BIN assets/img/clients/client03.png
  117. BIN assets/img/clients/client04.png
  118. BIN assets/img/contact.jpg
  119. BIN assets/img/docker.png
  120. BIN assets/img/family.png
  121. BIN assets/img/favicon.png
  122. BIN assets/img/hills.png
  123. BIN assets/img/logo-light.png
  124. BIN assets/img/logo.png
  125. BIN assets/img/members/team01.jpg
  126. BIN assets/img/members/team02.jpg
  127. BIN assets/img/members/team03.jpg
  128. BIN assets/img/members/team04.jpg
  129. BIN assets/img/microsoft.png
  130. BIN assets/img/portfolio-1.jpg
  131. BIN assets/img/portfolio-2.jpg
  132. BIN assets/img/portfolio-21.jpg
  133. BIN assets/img/portfolio-22.jpg
  134. BIN assets/img/portfolio-biciapps.jpg
  135. BIN assets/img/portfolio-espanolimetro.jpg
  136. BIN assets/img/portfolio-fansbattle.jpg
  137. BIN assets/img/portfolio-notifyme.jpg
  138. BIN assets/img/portfolio-ofii.jpg
  139. BIN assets/img/portfolio-schoolcore.jpg
  140. BIN assets/img/project/carousel/single01.jpg
  141. BIN assets/img/project/carousel/single02.jpg
  142. BIN assets/img/project/carousel/single03.jpg
  143. BIN assets/img/project/portfolio_01.jpg
  144. BIN assets/img/project/portfolio_02.jpg
  145. BIN assets/img/project/portfolio_03.jpg
  146. BIN assets/img/project/portfolio_04.jpg
  147. BIN assets/img/project/portfolio_05.jpg
  148. BIN assets/img/project/portfolio_06.jpg
  149. BIN assets/img/project/portfolio_07.jpg
  150. BIN assets/img/project/portfolio_08.jpg
  151. BIN assets/img/project/portfolio_09.jpg
  152. BIN assets/img/project/portfolio_10.jpg
  153. BIN assets/img/rocket.png
  154. BIN assets/img/t-back.jpg
  155. BIN assets/img/t-back1.jpg
  156. BIN assets/img/xamarin.png
  157. +0 −6 assets/js/bootstrap.min.js
  158. +92 −0 assets/js/core.min.js
  159. +0 −12 assets/js/custom.js
  160. +0 −220 assets/js/jquery.hoverdir.js
  161. +0 −1 assets/js/jquery.hoverex.min.js
  162. +0 −13 assets/js/jquery.isotope.min.js
  163. +0 −7 assets/js/jquery.prettyPhoto.js
  164. +0 −152 assets/js/retina-1.1.0.js
  165. +76 −0 assets/js/script.js
  166. +818 −0 assets/js/thesaas.js
  167. +7 −0 assets/js/thesaas.min.js
  168. +0 −32 blog.html
  169. +0 −35 category.html
  170. +0 −51 contact.html
  171. +0 −30 feed.xml
  172. +309 −51 index.html
  173. +172 −0 page-privacy.html
  174. +378 −15 portfolio.html
  175. +168 −0 project_biciapps.html
  176. +174 −0 project_espanolimetro.html
1 change: 0 additions & 1 deletion .gitignore

This file was deleted.

1 change: 1 addition & 0 deletions CNAME
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
www.achopijolabs.com
22 changes: 22 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@

The MIT License (MIT)

Copyright (c) 2016-2018 Antonio Trento https://it.linkedin.com/in/antoniotrento.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
125 changes: 46 additions & 79 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,79 +1,46 @@
Solid. A Bootstrap theme for Jekyll.
============
![Screenshot](https://st4ple.github.io/solid-jekyll/assets/img/browser.png)

This is a [Jekyll](http://jekyllrb.com/) port of the [Solid theme](http://www.blacktie.co/2014/05/solid-multipurpose-theme/) by [blacktie.co](http://www.blacktie.co/). Visit the [live demo](https://st4ple.github.io/solid-jekyll/) for a preview.

##Usage
This theme can be customized, built and published straight from GitHub, thanks to [GitHub Pages](https://pages.github.com/). A local installation of Jekyll isn't even necessary!

[Fork this repository](https://github.com/st4ple/solid-jekyll/fork) to get started.
####Customize
Most general settings and data like site name, colors, address, etc. can be configured and changed right in the main config file: `/_config.yml`
The content of the Home page can be changed here: `/home.html`
The content of the About page can be changed here: `/about.html`
The content of the Portfolio page can be changed here:`/portfolio.html`
The content of the Contact page can be changed here:`/contact.html`
####Add content
Delete the demo content and publish your own content.
#####Blog post
Create a Blog post by creating a file called `yyyy-mm-dd-name-of-post-like-this.markdown` in the `/_posts/blog/` directory with the following template:
```markdown
---
layout: post #important: don't change this
title: "Name of post like this"
date: yyyy-mm-dd hh:mm:ss
author: Name
categories:
- blog #important: leave this here
- category1
- category2
- ...
img: post01.jpg #place image (850x450) with this name in /assets/img/blog/
thumb: thumb01.jpg #place thumbnail (70x70) with this name in /assets/img/blog/thumbs/
---
This text will appear in the excerpt "post preview" on the Blog page that lists all the posts.
<!--more-->
This text will not be shown in the excerpt because it is after the excerpt separator.
```
#####Project post
Create a Project post to go in your Portfolio by creating a file called `yyyy-mm-dd-name-of-the-project.markdown` in the `/_posts/project/` directory with the following template:
```markdown
---
layout: project #important: don't change this
title: "Name of the project"
date: yyyy-mm-dd hh:mm:ss
author: Name
categories:
- project #important: leave this here
img: portfolio_10.jpg #place image (600x450) with this name in /assets/img/project/
thumb: thumb02.jpg
carousel:
- single01.jpg #place image (1280x600) with this name in /assets/img/project/carousel/
- single02.jpg
- ...
client: Company XY
website: http://www.internet.com
---
####This is a heading
This is a regular paragraph. Write as much as you like.
```
#####Question entry
Create a Question entry (that is listed in the Frequently Asked section on the Home page) in this directory by creating a file called `yyyy-mm-dd-do-i-have-a-question.markdown` in the `/_posts/project/` directory with the following template:
```markdown
---
layout: question
title: "Do I have a question?"
date: yyyy-mm-dd hh:mm:ss
author: First Last
categories:
- question #important: leave this here
---
####Can I use this theme for my website?
Of course you can!
```
####Publish
To publish with [GitHub Pages](https://pages.github.com/), simply create a branch called `gh-pages`in your repository. GitHub will build your site automatically and publish it at `http://yourusername.github.io/repositoryname/`.
If there are problems with loading assets like CSS files and images, make sure that the `baseurl` in the `_config.yml`is set correctly (it should say `/repositoryname`).

If you want to host your website somewhere else than GitHub (or just would like to customize and build your site locally), please check out the [Jekyll documentation](http://jekyllrb.com/).
#New Age Jekyll theme
=========================

## If you are a company and you're going to use the blog:
1. contact bootstrap start up and ask.
2. contact me because there is to remove some useless part.

Jekyll theme based on [New Age bootstrap theme ](https://startbootstrap.com/template-overviews/new-age/)

# Demo
View this jekyll theme in action [here](https://jekynewage.github.io/)

## Built by
[Antonio Trento](https://it.linkedin.com/in/antoniotrento)

This Jekyll template was created to develop, landing pages, squeeze pages, portfolio and blog or all the above.

###I integrated analytical tools and marketing such as:
- Google Ad Words
- Google analytics
- Disqus comment system
- Add This social sharing

>>External stylesheets and libraries included are Google Fonts, Font Awesome, Normalize.CSS, and WOW.js
In order to set your log data to applications _config.yml just open the file and find the associated items.

I also built a system to add their own names on the same company files

**To change the base colors yellow go in css folder there main.css where you can set the primary color and the secondary color, remember that the theme is gradient in the background areas**


If you are interested in implementing this theme please contact me without any problems I will do what is in my power to help you!

If you have noticed anything unusual or errors in my development I ask you kindly let me know or send a pull request!

Any opinion and critical comment is welcome! So give us inside!

We can get in touch by:

1. By <a href="https://twitter.com/lantoniotrento">twitter</a>
2. mail <a href="mailto:lantoniotrento@gmail.com">lantoniotrento[at]gmail.com</a>
3. Via <a href="https://it.linkedin.com/in/antoniotrento">LinkedIn</a>

=========
For more details, read the [documentation](http://jekyllrb.com/)
109 changes: 0 additions & 109 deletions _config.yml

This file was deleted.

28 changes: 0 additions & 28 deletions _includes/carousel.html

This file was deleted.

12 changes: 0 additions & 12 deletions _includes/clients.html

This file was deleted.

Loading