Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

to correct issue when unable to commit in git bash #30

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CNAME
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
desiraemcardle.life
16 changes: 8 additions & 8 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
# SITE CONFIGURATION
baseurl: "" # the subpath of your site, e.g. /blog/ (optional)
url: "http://www.your-domain.com" # the base hostname & protocol for your site
url: "http://desiraemcardle.life" # the base hostname & protocol for your site

# THEME-SPECIFIC CONFIGURATION
theme_settings:
# Meta
title: Tyrion Lannister # Your name will go here
title: Desirae McArdle # Your name will go here
description: "A personal portfolio and blog website" # used by search engines

# Header and footer text
header_text: >
<h1>Witty & Hilarious Rails Developer</h1>
<p>I'm a kickass developer specializing in Rails, AngularJS, and MongoDB.</p>
<h1>This is my first attempt at a static website</h1>
<p>I'm working toward becoming a kickass developer.</p>
header_text_feature_image:
footer_text: >
Powered by <a href="http://jekyllrb.com">Jekyll</a> and made with love.

# Icons
rss: false
email_address: # Full email address, e.g. "sam@example.com"
email_address: "dmcardle@yahoo.com"
behance:
bitbucket:
dribbble:
facebook:
flickr:
github: # github profile name, e.g. "madebymunsters"
github: "desiraem"
google_plus:
instagram:
linkedin: # Full URL
Expand All @@ -39,7 +39,7 @@ theme_settings:
youtube:

# Scripts
google_analytics: # Tracking ID, e.g. "UA-000000-01"
google_analytics: "UA-102271952-1"
disqus_shortname:
katex: true # Enable if using math markup

Expand Down Expand Up @@ -72,4 +72,4 @@ sass:
sass_dir: _sass
style: :compressed

gems: [jekyll-paginate]
plugins: [jekyll-paginate]
14 changes: 14 additions & 0 deletions _portfolio/blocjams.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
layout: post
title: BlocJams
thumbnail-path: "img/bloc_jams_logo.png"
short-description: bloc-jams is a practice music app.

---

{:.center}
![]({{ site.baseurl }}/img/bloc_jams_logo.png)

## Explanation

Bloc Jams is a simple music application that we build as part of the BLOC curriculum.
21 changes: 0 additions & 21 deletions _posts/2014-11-30-sample-post.md

This file was deleted.

13 changes: 13 additions & 0 deletions _posts/2017-07-10-The-journey-continues.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
layout: post
title: The Journey Continues
---
It was once said that the more you learn the more you realize you don't know.

I think this is especially true in the programming world. I went back to school 17 years ago to pursue a career in programming. I got a job as a programmer/analyst and that has worked out well however you can get stuck in a certain language and the world of programming and develop continues to move forward. At this point I am trying to get current on some of the many changes in the development world.

> Where do you start?

When you start to look into the best place to continue your education you realize that there are so many directions that you can pursue and it can get pretty discouraging pretty fast. Where do you spend your time? What area will give you the best benefit?

One thing I will say is that it is a never-ending process. Sometimes we get complacent and we need to be reminded to get out there and see what going on in the world.
4 changes: 2 additions & 2 deletions contact.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ feature-img: "img/color.png"

Bacon ipsum dolor amet filet mignon meatball spare ribs fatback bacon shankle. Kielbasa andouille fatback salami, boudin bresaola pig alcatra turkey spare ribs jerky. Corned beef bresaola leberkas salami alcatra beef landjaeger venison shank bacon meatloaf beef ribs picanha. Leberkas sausage brisket porchetta shankle prosciutto chicken picanha kielbasa pig kevin t-bone turducken filet mignon jowl.

<form action="https://getsimpleform.com/messages?form_api_token=" method="post">
<form action="https://getsimpleform.com/messages?form_api_token=9dbb34a3d61785aec695915175fc6d42" method="post">
<!-- the redirect_to is optional, the form will redirect to the referrer on submission -->
<input type='hidden' name='redirect_to' value='full-url/thank-you/' />
<input type='hidden' name='redirect_to' value='https://Desiraemcardle.life/thank-you/' />
<input type='text' name='name' placeholder='Your Full Name' />
<input type='email' name='email' placeholder='Your E-mail Address' />
<textarea name='message' placeholder='Write your message ...'></textarea>
Expand Down
Binary file added img/bloc_jams_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<div class="work">
<h2>My Work</h2>
{% for project in site.portfolio limit:3 %}
{% for project in site.portfolio limit:4 %}
<div class="project">
<div class="project-thumb">
<a href="{{ project.url | prepend: site.baseurl }}">
Expand Down Expand Up @@ -64,3 +64,4 @@ <h3>
</div>
{% endif %}
</div>