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.

Sign up for GitHub

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

Css html clean #66

Merged
merged 2 commits into from
Oct 21, 2016
Merged

Css html clean #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
955c355
CSS and html clean
Oct 21, 2016
919d110
conflict in html resolved
Oct 21, 2016
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
12 changes: 4 additions & 8 deletions css/stylesheet.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ body {

a {
text-decoration: none;
color: currentColor;;
color: currentColor;
}

.section-title {
Expand Down Expand Up @@ -156,7 +156,7 @@ a.anchor-title {
visibility: hidden;
}

.iconStyle {
.icon-style {
width: 100%;
height: 100%;
display: inline-block;
Expand Down Expand Up @@ -189,10 +189,6 @@ a.anchor-title {
display: inline-block;
}

#name1{
display: inline-block;
}

#projects {
text-align:center;
margin-bottom: 10px;
Expand Down Expand Up @@ -222,12 +218,12 @@ a.anchor-title {
margin-right: 15px;
}

.profileHeight{
.profile-height{
margin-top: 10%;
height: auto;
}

.imageStyle{
.image-style{
border-radius: 100%;
height: 160px;
width: auto;
Expand Down
33 changes: 15 additions & 18 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
</ul>
</div>
</nav>
<header class="fixed_height row" id="main-header" title="Group photo FAC">
<header class="row" id="main-header">
<h1>The Repos</h1>
</header>
<!-- names of people in team -->
<section id="homeScreen" class="row programmer-list">
<div class="row programmer-box">
<a href="#peterR">
<div class="col-xs-2 col-xs-offset-2 programmer-img-container">
<img src="images/DSCF2728.JPG" class="iconStyle" alt="Peter's picture">
<img src="images/DSCF2728.JPG" class="icon-style">
</div>
<div class="col-xs-5 col-xs-offset-1 name-container">
<h3 class="programmer-name">Peter Rhodes</h3>
Expand All @@ -39,7 +39,7 @@ <h3 class="programmer-name">Peter Rhodes</h3>
<div class="row programmer-box">
<a href="#shireenZ">
<div class="col-xs-2 col-xs-offset-2 programmer-img-container">
<img src="images/DSCF2715.JPG" class="iconStyle" alt="Shireens's picture">
<img src="images/DSCF2715.JPG" class="icon-style">
</div>
<div class="col-xs-5 col-xs-offset-1 name-container">
<h3 class="programmer-name">Shireen Zoaby</h3>
Expand All @@ -49,7 +49,7 @@ <h3 class="programmer-name">Shireen Zoaby</h3>
<div class="row programmer-box">
<a href="#emilyB">
<div class="col-xs-2 col-xs-offset-2 programmer-img-container">
<img src="images/DSCF2718.JPG" class="iconStyle" alt="Emily's picture">
<img src="images/DSCF2718.JPG" class="icon-style">
</div>
<div class="col-xs-5 col-xs-offset-1 name-container">
<h3 class="programmer-name">Emily Bertwistle</h3>
Expand All @@ -59,7 +59,7 @@ <h3 class="programmer-name">Emily Bertwistle</h3>
<div class="row programmer-box">
<a href="#williamS">
<div class="col-xs-2 col-xs-offset-2 programmer-img-container">
<img src="images/DSCF2725.JPG" class="iconStyle" alt="William's picture">
<img src="images/DSCF2725.JPG" class="icon-style">
</div>
<div class="col-xs-5 col-xs-offset-1 name-container">
<h3 class="programmer-name">William Savage</h3>
Expand Down Expand Up @@ -91,9 +91,9 @@ <h2 class="section-title">Meet the team</h2>
</section>
<section>
<!-- profiles go here -->
<section class="profileHeight row">
<section class="profile-height row">
<div class="col-xs-6 col-xs-offset-3">
<img class="imageStyle" src="images/DSCF2728.JPG" alt="Peter's profile picture">
<img class="image-style" src="images/DSCF2728.JPG">
</div>
<div class="profile-description row">
<h3>Peter Rhodes</h3>
Expand All @@ -108,9 +108,9 @@ <h3>Peter Rhodes</h3>
</p>
</div>
</section>
<section class="profileHeight row">
<section class="profile-height row">
<div class="col-xs-6 col-xs-offset-3">
<img class="imageStyle" src="images/DSCF2715.JPG" alt="Shireen's profile picture">
<img class="image-style" src="images/DSCF2715.JPG">
</div>
<div class="profile-description row">
<h3>Shireen Zoaby</h3>
Expand All @@ -125,9 +125,9 @@ <h3>Shireen Zoaby</h3>
</p>
</div>
</section>
<section class="profileHeight row">
<section class="profile-height row">
<div class="col-xs-6 col-xs-offset-3">
<img class="imageStyle" src="images/DSCF2718.JPG" alt="Emily's profile picture">
<img class="image-style" src="images/DSCF2718.JPG">
</div>
<div class="profile-description row">
<h3>Emily Bertwistle</h3>
Expand All @@ -142,9 +142,9 @@ <h3>Emily Bertwistle</h3>
</p>
</div>
</section>
<section class="profileHeight row">
<section class="profile-height row">
<div class="col-xs-6 col-xs-offset-3">
<img class="imageStyle" src="images/DSCF2725.JPG" alt="Will's profile picture">
<img class="image-style" src="images/DSCF2725.JPG">
</div>
<div class="profile-description row">
<h3>William Savage</h3>
Expand All @@ -166,21 +166,18 @@ <h2>Contact</h2>
<ul>
<li>Email: <a href="mailto:[email protected]">[email protected]</a></li>
<li>Phone: <a href="tel:020 5644 5849">020 5644 5849</a></li>

<li>We are all members of FAC9 at Founders &amp; Coders</li>

<li>Email: <a href="mailto:[email protected]">[email protected]</a></li>
<li>Phone: <a href="tel:020 3583 2442">020 3583 2442</a></li>

</ul>
<p>
<a href="https://twitter.com/founderscoders?ref_src=twsrc%5Egoogle%7Ctwcamp%5Eserp%7Ctwgr%5Eauthor" target="blank" title="FAC twitter account">
<i class="fa fa-twitter"></i>@Founderscoders
</a>
</p>
<p>
<a href="https://github.com/foundersandcoders" target="blank" title="FAC github account"><i class="fa fa-github-alt"></i>
foundersandcoders
<a href="https://github.com/foundersandcoders" target="blank" title="FAC github account">
<i class="fa fa-github-alt"></i>foundersandcoders
</a>
</p>
</footer>
Expand Down