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: erfanmohseni/Webiste
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: gh-pages
Choose a base ref
...
head repository: LLHD/Erfan-Website
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: gh-pages
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 12, 2015

  1. Delete CNAME

    @julianengel
    julianengel committed Oct 12, 2015
    Copy the full SHA
    3699810 View commit details

  2. Merge remote-tracking branch 'erfanmohseni/gh-pages' into gh-pages 

    Conflicts:
	CNAME
    @julianengel
    julianengel committed Oct 12, 2015
    Copy the full SHA
    545fc0c View commit details
Showing with 5 additions and 17 deletions.
  1. +0 −1 CNAME
  2. +5 −16 index.html
1 change: 0 additions & 1 deletion CNAME
View file

This file was deleted.

21 changes: 5 additions & 16 deletions index.html
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
<meta name="description" content="">
<meta name="author" content="">

<title>I LUV ELIA</title>
<title>Erfan Mohseni</title>

<!-- Bootstrap Core CSS - Uses Bootswatch Flatly Theme: http://bootswatch.com/flatly/ -->
<link href="css/bootstrap.min.css" rel="stylesheet">
@@ -78,7 +78,7 @@
<div class="intro-text">
<span class="name">George</span>
<hr class="star-light">
<span class="skills">Web Developer - Web Developer-Gamer</span>
<span class="skills">Web Developer - Web Developer - Gamer</span>
</div>
</div>
</div>
@@ -141,10 +141,10 @@ <h2>About</h2>
</div>
<div class="row">
<div class="col-lg-4 col-lg-offset-2">
<p>I like gaming.And im 16 years old and i like to go out.</p>
<p>I like gaming and im 16 years old. I like to go out with friends and play water polo.</p>
</div>
<div class="col-lg-4">
<p>I have a potato.</p>
<p>I own two potatos.</p>
</div>


@@ -192,10 +192,6 @@ <h3>Around the Web</h3>
<a href="http://www.facebook/George.Mohseni" class="btn-social btn-outline"><i class="fa fa-fw fa-facebook"></i></a>
</li>

<li>
<a href="#" class="btn-social btn-outline"><i class="fa fa-fw fa-github"></i></a>
</li>

</ul>
</div>
<div class="footer-col col-md-4">
@@ -425,14 +421,7 @@ <h2>Project Title</h2>
<img src="img/portfolio/submarine.png" class="img-responsive img-centered" alt="">
<p>Use this area of the page to describe your project. The icon above is part of a free icon set by <a href="https://sellfy.com/p/8Q9P/jV3VZ/">Flat Icons</a>. On their website, you can download their free set with 16 icons, or you can purchase the entire set with 146 icons for only $12!</p>
<ul class="list-inline item-details">
<li>Client:
<strong><a href="http://startbootstrap.com">Start Bootstrap</a>
</strong>
</li>
<li>Date:
<strong><a href="http://startbootstrap.com">April 2014</a>
</strong>
</li>

<li>Service:
<strong><a href="http://startbootstrap.com">Web Development</a>
</strong>