From ace44688fc60bc8387d4479739f913f5c770263d Mon Sep 17 00:00:00 2001 From: Alma Maizels Date: Fri, 16 Sep 2016 11:10:41 -0700 Subject: [PATCH 1/6] Baseline reqs --- Styles/index.css | 0 Styles/portfolio.css | 0 Styles/styles.css | 0 index.html | 20 ++++++++++++++++++++ portfolio.html | 20 ++++++++++++++++++++ 5 files changed, 40 insertions(+) create mode 100644 Styles/index.css create mode 100644 Styles/portfolio.css create mode 100644 Styles/styles.css create mode 100644 index.html create mode 100644 portfolio.html diff --git a/Styles/index.css b/Styles/index.css new file mode 100644 index 0000000..e69de29 diff --git a/Styles/portfolio.css b/Styles/portfolio.css new file mode 100644 index 0000000..e69de29 diff --git a/Styles/styles.css b/Styles/styles.css new file mode 100644 index 0000000..e69de29 diff --git a/index.html b/index.html new file mode 100644 index 0000000..6b48701 --- /dev/null +++ b/index.html @@ -0,0 +1,20 @@ + + + + + Alma Maizels Engineer + + + + +
+ +
+ + + + diff --git a/portfolio.html b/portfolio.html new file mode 100644 index 0000000..47fb883 --- /dev/null +++ b/portfolio.html @@ -0,0 +1,20 @@ + + + + + AM Portfolio + + + + +
+ +
+ + + + From 605c1afdf27b6932674971213ce9913a330ba788 Mon Sep 17 00:00:00 2001 From: Alma Maizels Date: Fri, 16 Sep 2016 23:05:41 -0700 Subject: [PATCH 2/6] Basic functionality of index.html in place. Working on the same for portfolio.html --- Styles/index.css | 52 ++++++++++++++++++++++++++++++++++ Styles/portfolio.css | 29 +++++++++++++++++++ Styles/styles.css | 67 ++++++++++++++++++++++++++++++++++++++++++++ about.html | 25 +++++++++++++++++ code-journal.html | 26 +++++++++++++++++ index.html | 20 +++++++++++-- portfolio.html | 56 ++++++++++++++++++++++++++++++++++-- 7 files changed, 270 insertions(+), 5 deletions(-) create mode 100644 about.html create mode 100644 code-journal.html diff --git a/Styles/index.css b/Styles/index.css index e69de29..47a2b26 100644 --- a/Styles/index.css +++ b/Styles/index.css @@ -0,0 +1,52 @@ +header nav h1, h2 { + color: orange; + text-align: left; +} + +/**/ +/**/ + +#A, #M { + display: inline; + + font-size: 4em; + font-family: 'Courgette', cursive; + +} + +div.monogram { + border: 5px solid black; + border-radius: 50%; + margin: auto; + width: 100px; + padding: 4%; + height: 7em; + width: 7em; + + /*position: relative;*/ + left: 40%; + top: 25%; + + background-color: teal; +} + +/*It is now blue*/ +/*main section:nth-of-type(1) {*/ + /*background-color: blue;*/ + /*position: absolute;*/ + /*left: -10em;*/ + /*left: 140%;*/ + /*top: 25%;*/ +/*}*/ + +li.bubble:nth-of-type(1) { + background-color: yellow; +} + +li.bubble:nth-of-type(2) { + background-color: red; +} + +li.bubble:nth-of-type(3) { + background-color: green; +} diff --git a/Styles/portfolio.css b/Styles/portfolio.css index e69de29..a1372d3 100644 --- a/Styles/portfolio.css +++ b/Styles/portfolio.css @@ -0,0 +1,29 @@ +main { + height: 50vmax; +} + + +section.featured { + float:left; + position: relative; +} + +section.current { + clear: left; + float: left; +} + +section.previous { + clear: right; + float: right; + width: 25%; + position: absolute; +} + +nav.bubble { + background-color: yellow; + clear: right; + float: right; +} + +/*START HERE: What if I put the nav and the previous into the same box? */ diff --git a/Styles/styles.css b/Styles/styles.css index e69de29..5064cc4 100644 --- a/Styles/styles.css +++ b/Styles/styles.css @@ -0,0 +1,67 @@ +header { + /*padding-top: 1em;*/ + padding-left: 2em; + background-color: grey; + border-top: 12px solid black; + border-bottom: 1px solid black; +} + +main { + padding: 20px; + position: relative; + font-family: 'Acme', sans-serif; + /*height: 28vmax;*/ +} + +.bubble { + display: inline-block; + border: 3px solid black; + border-radius: 50%; + margin: auto; + padding: 4%; + height: 2em; + width: 2em; + background-color: orange; + + /*position: absolute;*/ +} + +.bubble a { + margin: -1em; + text-decoration: none; +} + +.bubble:hover { + background-color: purple; +} + +a:active { + color: black; +} + +footer { + clear: both; + position: absolute; + width: 99%; + margin: 3em 1em auto auto; + border-top: 1px solid black; + border-bottom: 4px solid black; + background-color: grey; +} + +section { + display: inline; + border: 2px solid black; + margin: 0 1em 1em 1em; + width: 65%; +} + +section h2 { + margin: 0 0 0 0; + width: 100%; + background-color: grey; +} + +section h3, p { + padding: 0 1em 0 1em; +} diff --git a/about.html b/about.html new file mode 100644 index 0000000..bf6048a --- /dev/null +++ b/about.html @@ -0,0 +1,25 @@ + + + + + Portfolio + + + + +
+ +
+ +
+ +
+ +
+

©2016

+
+ + diff --git a/code-journal.html b/code-journal.html new file mode 100644 index 0000000..f73afa2 --- /dev/null +++ b/code-journal.html @@ -0,0 +1,26 @@ + + + + + Portfolio + + + + +
+ +
+ +
+ + +
+ +
+

©2016

+
+ + diff --git a/index.html b/index.html index 6b48701..aed5a1e 100644 --- a/index.html +++ b/index.html @@ -5,16 +5,32 @@ Alma Maizels Engineer + +
+
+
+
A
+
M
+
+
+ + +
- +

©2016

diff --git a/portfolio.html b/portfolio.html index 47fb883..99c1737 100644 --- a/portfolio.html +++ b/portfolio.html @@ -2,19 +2,69 @@ - AM Portfolio + Portfolio +
-