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

Alma #6

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Basic website finished. Working on tidy up.
mimyal committed Sep 19, 2016
commit e0bb8523762c831b7964add7c5e6274df3382354
Binary file added Assets/.DS_Store
Binary file not shown.
Binary file added Assets/commuter.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 21 additions & 17 deletions Styles/index.css
Original file line number Diff line number Diff line change
@@ -1,43 +1,47 @@
#A, #M {
display: inline;

font-size: 6em;
font-size: 5em;
font-family: 'Courgette', cursive;

}

div.monogram {
border: 5px solid black;
border: 4px solid black;
border-radius: 50%;
margin: 4vmin auto auto auto;
width: 100px;
padding: 4%;
height: 12em;
width: 12em;
margin: 5% auto auto auto;
/*width: 100px;*/
padding: 5%;
height: 8em;
width: 8em;

/*position: relative;*/
/*left: 40%;*/
/*top: 25%;*/

/*not teal, light blue*/
background-color: #6EC5B8;
/*not teal, blue*/
background-color: #4A95BD;
}

/*ul#floater {
li.bubble:nth-of-type(1) {
background-color: transparent;
border: none;
padding: 0em 1em 0em 0em;
/*color: grey;*/

position: absolute;
top: 83vmin;
float: left;
width: 100%;
}*/
/*left: 0em;*/
top: 21vmin;
}

li.bubble:nth-of-type(1) {
li.bubble:nth-of-type(2) {
background-color: yellow;
}

li.bubble:nth-of-type(2) {
li.bubble:nth-of-type(3) {
background-color: red;
}

li.bubble:nth-of-type(3) {
li.bubble:nth-of-type(4) {
background-color: green;
}
21 changes: 3 additions & 18 deletions Styles/portfolio.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/*header nav h2 {

}*/

section.featured {
float:left;
position: relative;
@@ -21,20 +17,9 @@ section.previous {

li.bubble {
background-color: yellow;
/*float: right;*/
float: right;

position: absolute;
top: 0vmin;
right: 3vmax;
}

ul#floater {
/*float: right;*/
width: 95%;

/*position: absolute;*/
/*width: 100%;*/
/*top: 0vmin;*/
/*right: 3vmax;*/
/*right: 100vmax;*/
top: -10vmin;
right: 2em;
}
67 changes: 50 additions & 17 deletions Styles/styles.css
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
/*Colors*/
/*Colors #E44424 #BD4A5B #DFDCE3 #4ABDAC #F7B733 #FC4A1A -- #67BCDB*/

header {
/*padding-top: 1em;*/
padding-left: 2em;
/*light blue*/
background-color: #67BCDB;
border-top: 12px solid black;
border-top: 1px solid black;
border-bottom: 1px solid black;
/*border-right: 1em solid #32897C;*/
/*border-right: 1em solid #9C9A9E;*/
}

header nav h1, h2 {
/*deep red color*/
color: #E44424;
/*light grey*/
/*color: #DFDCE3;*/
text-align: left;
}

main {
padding: 20px;
padding: 10px;
position: relative;
font-family: 'Acme', sans-serif;
height: 55vmin;
height: 40vmin;
}

.bubble {
@@ -30,21 +32,29 @@ main {
padding: 4%;
height: 2.1em;
width: 2.1em;
background-color: #FFAC00;
background-color: #F7B733;

/*position: absolute;*/
/*top: 75%;*/
/*right: 75vmax;*/
}

.bubble:hover {
background-color: #FC4A1A;
}

.bubble a:visited {
color: #DFDCE3;
}


.bubble a {
margin: -1em;
text-decoration: none;
}

.bubble:hover {
/*deep orange*/
background-color: #DC5C05;
.bubble:hover ul li.bubble:hover {
background-color: #FC4A1A;
}

a:active {
@@ -55,15 +65,26 @@ footer {
position: relative;
}

footer h4 {
clear: both;
footer nav ul {
padding-left: 0;
margin: 5.5em auto auto auto;
border-bottom: 4px solid black;
list-style-type: none;

}

/*li h4 {*/
/*width: 3%;*/
/*display: inline;*/
/*}*/

footer ul li h4 {
/*clear: both;*/
position: absolute;
top: 7.4vmin;
width: 99%;
margin: 6em 1em auto auto;
border-top: 1px solid black;
border-bottom: 4px solid black;
background-color: #67BCDB;
/*border-top: 1px solid black;*/
/*background-color: #67BCDB;*/
}

section {
@@ -77,9 +98,21 @@ section h2 {
margin: 0 0 0 0;
width: 100%;
/*light blue*/
background-color: #67BCDB;
/*background-color: #67BCDB;*/
}

section h3, p {
padding: 0 1em 0 1em;
}

ul.line-of-photos {
clear: both;
margin-left: 1em;
list-style-type: none;
}

.line-of-photos li img {
float: left;
width: 12vmax;
/*height: (12*0.56)vmax;*/
}
52 changes: 47 additions & 5 deletions about.html
Original file line number Diff line number Diff line change
@@ -4,22 +4,64 @@
<meta charset="utf-8">
<title>Portfolio</title>
<link rel="stylesheet" href="Styles/styles.css">
<link rel="stylesheet" href="Styles/about.css">
<link rel="stylesheet" href="Styles/portfolio.css">
<link href="https://fonts.googleapis.com/css?family=Acme" rel="stylesheet">
</head>
<body>
<header>
<nav>
<h1>About Me</h1>
<a href="index.html">Home</a>
<h1>Alma Maizels: About Me</h1>
<!-- <h2></h2> -->
</nav>
</header>

<main>
<!-- shared personal information -->
<section class="featured">
<!-- Featured project -->
<h2>Background</h2>
<p>
Where I come from, my "education"
</p>
<p>
Stuff I want to develop
</p>
</section>
<section class="current">
<!-- Latest -->
<h2>Interests</h2>
<p>
I have cats and kids and a house.
</p>
<p>
I also have games, reading and the world
</p>
</section>
<section class="contact-me">
<h2>Contact me</h2>
<div class="">
<p>
Photo here
</p>
</div>
<div class="">
<ul>
<li><a href="#"><img src="" alt="Twitter" /></a></li>
<li><a href="#"><img src="" alt="Twitter" /></a></li>
<li><a href="#"><img src="" alt="Twitter" /></a></li>
</ul>
</div>
</section>

</main>

<footer>
<h4>&copy;2016</h4>
<nav>
<ul>
<li>&copy;2016</li>
<li class="bubble"><a href="index.html">Home</a></li>
</ul>
</nav>
<!-- <h4>&copy;2016</h4> -->
</footer>
</body>
</html>
63 changes: 57 additions & 6 deletions code-journal.html
Original file line number Diff line number Diff line change
@@ -4,23 +4,74 @@
<meta charset="utf-8">
<title>Portfolio</title>
<link rel="stylesheet" href="Styles/styles.css">
<link rel="stylesheet" href="Styles/code-journal.css">
<link rel="stylesheet" href="Styles/portfolio.css">
<link href="https://fonts.googleapis.com/css?family=Acme" rel="stylesheet">
</head>
<body>
<header>
<nav>
<h1>Reflections</h1>
<a href="index.html">Home</a>
<h1>Reflections: Technology</h1>
<!-- <h2></h2> -->
</nav>
</header>

<main>
<!-- reflections -->
<!-- observations -->
<section class="featured">
<!-- Featured project -->
<h2>Featured Cool Tech</h2>
<p>
Some new cool tech I want to learn more about here, beginner's info.
</p>
<p>
Some new cool tech I want to learn more about here, beginner's info.
</p>
</section>
<section class="current">
<!-- Latest -->
<h2>This week at Ada</h2>
<p>
Resources to the current subject at Ada Academy.
</p>
<p>
Stuff I am thinking about this week.
</p>
</section>
<!-- <aside class="previous">

</aside> -->
<section class="previous">
<!-- completed Ada projects -->
<h2>Previous reflections</h2>
<div class="">
<h3>Ada Week 4</h3>
<p>
What I wrote about a previous week at Ada.
</p>
</div>
<div class="">
<h3>Ada Week 3</h3>
<p>
What I wrote about a previous week at Ada.
</p>
</div>
<div class="">
<h3>Ada Week 2</h3>
<p>
What I wrote about a previous week at Ada.
</p>
</div>
</section>

</main>

<footer>
<h4>&copy;2016</h4>
<nav>
<ul>
<li>&copy;2016</li>
<li class="bubble"><a href="index.html">Home</a></li>
</ul>
</nav>
<!-- <h4>&copy;2016</h4> -->
</footer>
</body>
</html>
Loading