forked from AdaGold/group-fansite
-
Notifications
You must be signed in to change notification settings - Fork 47
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
maryams portfolio #37
Open
marshi23
wants to merge
7
commits into
Ada-C10:master
Choose a base branch
from
marshi23:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
9e4b257
pages creates index aligned
marshi23 745de64
hobby pages aligned about page left then style website
marshi23 00a8296
index updated, working on about framwork, fix nav bar
marshi23 f282dfe
nav fixed, working on portfolio page creating boxes, after that about…
marshi23 7c94277
potforlio layout done do about next. pages validated
marshi23 1187881
about page flex made needs alignment. reduce nav maybe?
marshi23 c3c2a3a
main tasks done update content next
marshi23 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
<!DOCTYPE html> | ||
<html lang="en"> | ||
|
||
<head> | ||
<meta charset="utf-8"> | ||
<title>Portfolio</title> | ||
<link href="stylesheets/about.css" rel="stylesheet"> | ||
<link href="stylesheets/normalize.css" rel="stylesheet"> | ||
<link href="stylesheets/styles.css" rel="stylesheet"> | ||
</head> | ||
|
||
<body> | ||
<header> | ||
<nav> | ||
<ul> | ||
<li><a href="index.html">Home</a></li> | ||
<li><a href="portfolio.html">Portfolio</a></li> | ||
<li><a href="hobby-blog.html">Visual Blog</a></li> | ||
<li><a href="about.html">About</a></li> | ||
</ul> | ||
</nav> | ||
</header> | ||
|
||
<main> | ||
<section class="about"> | ||
<section class="about-image"> | ||
<img src="images/box-clipart-face-9.png" alt="avatar"> | ||
</section> | ||
<section class="bio"> | ||
<h1>About me</h1> | ||
<p>Mountains are so simple that they're hard! Just practice, and you really can do this. Don't get carried away.</p> | ||
</section> | ||
</main> | ||
|
||
<footer> | ||
<section class="pages"> | ||
<h2>Check out my other pages</h2> | ||
<!-- TODO: Add links to portfolio and instagram page--> | ||
<ul class="icons"> | ||
<li class="github"><a href='https://github.com/marshi23' target="_blank"><img src="images/github.png" alt="github-icon"/></a></li> | ||
<li class="linkedin"><a href='http://www.linkedin.com/in/maryamshitu' target="_blank" ><img src="images/linkedin.png" alt="linkedin-icon"/></a></li> | ||
<li class="instagram"><a href='https://www.instagram.com' target="_blank"><img src="images/instagram.png" alt="github-icon"/></a></li> | ||
<li class="art-portfolio"><a href='https://www.wix.com/'><img src="images/art.png" alt="art-icon"/></a></li> | ||
</ul> | ||
</section> | ||
</footer> | ||
|
||
</body> | ||
|
||
</html> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
<!DOCTYPE html> | ||
<html lang="en"> | ||
|
||
<head> | ||
|
||
<meta charset="utf-8"> | ||
<title>Portfolio</title> | ||
<link href="stylesheets/index.css" rel="stylesheet"> | ||
<link href="stylesheets/normalize.css" rel="stylesheet"> | ||
<link href="stylesheets/styles.css" rel="stylesheet"> | ||
|
||
|
||
</head> | ||
|
||
<body> | ||
|
||
<header> | ||
|
||
<nav> | ||
<ul> | ||
<li><a href="index.html">Home</a></li> | ||
<li><a href="portfolio.html">Portfolio</a></li> | ||
<li><a href="hobby-blog.html">Visual Blog</a></li> | ||
<li><a href="about.html">About</a></li> | ||
</ul> | ||
</nav> | ||
|
||
<section class="hero-img"> | ||
<section> | ||
<h1>Maryam Shitu</h1> | ||
<h3>Software Developer</h3> | ||
</section> | ||
</section> | ||
|
||
</header> | ||
|
||
<!-- TODO: --> | ||
<footer> | ||
<!-- social media icons --> | ||
</footer> | ||
</body> | ||
|
||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
<!DOCTYPE html> | ||
<html lang="en"> | ||
|
||
<head> | ||
<meta charset="utf-8"> | ||
<title>Portfolio</title> | ||
<link href="stylesheets/photo-blog.css" rel="stylesheet"> | ||
<link href="stylesheets/normalize.css" rel="stylesheet"> | ||
<link href="stylesheets/styles.css" rel="stylesheet"> | ||
</head> | ||
|
||
<body> | ||
|
||
<nav> | ||
<ul> | ||
<li><a href="index.html">Home</a></li> | ||
<li><a href="portfolio.html">Portfolio</a></li> | ||
<li><a href="photo-blog.html">Visual Blog</a></li> | ||
<li><a href="about.html">About</a></li> | ||
</ul> | ||
</nav> | ||
|
||
<section class="grid-container"> | ||
<h1 class="section-header">Photo Jounral</h1> | ||
<p>Through a phone lense.</p> | ||
|
||
<!-- TODO: Import photos from phone --> | ||
<!-- Note: Not my images, grid style found on code pen --> | ||
<img src="http://c1.staticflickr.com/9/8450/8026519634_f33f3724ea_b.jpg" alt="black-white-image"> | ||
<img src="http://c2.staticflickr.com/8/7218/7209301894_c99d3a33c2_h.jpg" alt="black-white-image"> | ||
<img src="http://c2.staticflickr.com/8/7231/6947093326_df216540ff_b.jpg" alt="black-white-image"> | ||
|
||
<img src="http://c1.staticflickr.com/9/8788/17367410309_78abb9e5b6_b.jpg" alt="black-white-image"> | ||
<img src="http://c2.staticflickr.com/6/5814/20700286354_762c19bd3b_b.jpg" alt="black-white-image"> | ||
<img src="http://c2.staticflickr.com/6/5647/21137202535_404bf25729_b.jpg" alt="black-white-image"> | ||
|
||
<img src="http://c2.staticflickr.com/6/5588/14991687545_5c8e1a2e86_b.jpg" alt="black-white-image"> | ||
<img src="http://c2.staticflickr.com/4/3888/14878097108_5997041006_b.jpg" alt="black-white-image"> | ||
<img src="http://c2.staticflickr.com/8/7579/15482110477_0b0e9e5421_b.jpg" alt="black-white-image"> | ||
</section> | ||
|
||
</body> | ||
|
||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
<!DOCTYPE html> | ||
<html lang="en"> | ||
|
||
<head> | ||
<meta charset="utf-8"> | ||
<title>Portfolio</title> | ||
<link href="stylesheets/portfolio.css" rel="stylesheet"> | ||
<link href="stylesheets/normalize.css" rel="stylesheet"> | ||
<link href="stylesheets/styles.css" rel="stylesheet"> | ||
</head> | ||
|
||
<body> | ||
<header> | ||
<nav> | ||
<ul> | ||
<li><a href="index.html">Home</a></li> | ||
<li><a href="portfolio.html">Portfolio</a></li> | ||
<li><a href="photo-blog.html">Visual Blog</a></li> | ||
<li><a href="about.html">About</a></li> | ||
</ul> | ||
</nav> | ||
</header> | ||
|
||
<main> | ||
|
||
<section class="projects-container"> | ||
<h2 class="section-header">Projects</h2> | ||
<ul class="projects"> | ||
<li class="project-hotel"> | ||
<a href="https://github.com/marshi23/hotel" target="_blank"><img src="images/hotel.png" alt="greybox"/></a> | ||
<strong>Hotel</strong> | ||
<p> | ||
Language: Ruby. Hotel Reservation Managment Software | ||
</li> | ||
<li class="project-starly"> | ||
<a href="https://github.com/marshi23/startrly" target="_blank"><img src="images/starly.png" alt="greybox"/></a> | ||
<strong>Starly</strong> | ||
<p> | ||
Html & CSS. At vero eos et accusamus et iusto odio dignissimos ducimus qui. | ||
</p> | ||
</li> | ||
<li class="project-rideshare"> | ||
<a href="https://github.com/marshi23/ride-share" target="_blank"><img src="images/rideshare.png" alt="greybox"/></a> | ||
<strong>Ride Share</strong> | ||
<p> | ||
Ruby. Itaque earum rerum hic tenetur a sapiente delectus. | ||
</p> | ||
</li> | ||
</ul> | ||
</section> | ||
|
||
</main> | ||
|
||
</body> | ||
|
||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
nav li { | ||
border-right: 1px solid black; | ||
color: black; | ||
} | ||
|
||
ul { | ||
list-style: none; | ||
} | ||
|
||
a:visited { | ||
color: black; | ||
} | ||
|
||
.about { | ||
display: flex; | ||
/* flex-wrap: wrap; */ | ||
height: 100%; | ||
align-items: center; | ||
} | ||
|
||
.about-image img { | ||
width: 100%; | ||
float: left; | ||
margin: 1.66%; | ||
} | ||
|
||
.bio { | ||
padding-left: 10%; | ||
} | ||
|
||
.bio h1 { | ||
font-size: 3rem; | ||
} | ||
footer h2 { | ||
padding-top: 2vh; | ||
font-size: 2rem; | ||
text-align: center; | ||
} | ||
|
||
.icons { | ||
padding-top: 1vh; | ||
/* border: 5px solid #ffcc5c; */ | ||
display: flex; | ||
justify-content: center; | ||
justify-content: space-between; | ||
} | ||
|
||
.icons img { | ||
padding-top: 1vh; | ||
width: 30%; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
body { | ||
margin: 0; | ||
font-family: sans-serif; | ||
} | ||
|
||
header { | ||
width: 100vw; | ||
height: 100%; | ||
background-image: url(../images/federico-bottos-744760-unsplash.jpg); | ||
background-size: cover; | ||
} | ||
|
||
nav li { | ||
border-right: 1px solid white; | ||
color: white; | ||
} | ||
|
||
a:hover { | ||
color: white; | ||
} | ||
a:visited { | ||
color: white; | ||
} | ||
|
||
.hero-img { | ||
width: 100vw; | ||
height: 100vh; | ||
display: flex; | ||
justify-content: center; | ||
align-items: center; | ||
background-size: cover; | ||
background-position: center center; | ||
background-repeat: no-repeat; | ||
background-attachment: fixed; | ||
|
||
} | ||
|
||
.hero-img h1 { | ||
/* Text styles */ | ||
font-size: 5em; | ||
color: orange; | ||
color: white; | ||
text-shadow: 2px 2px 4px #000000; | ||
|
||
} | ||
|
||
h3 { | ||
color: yellow; | ||
font-size: 1.5em; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indentation is a little off and you have an unclosed
section
element