diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..5bfec50 Binary files /dev/null and b/.DS_Store differ diff --git a/Assignment/.DS_Store b/Assignment/.DS_Store new file mode 100644 index 0000000..0af6ca0 Binary files /dev/null and b/Assignment/.DS_Store differ diff --git a/Assignment/Homework_1 - HTML/.DS_Store b/Assignment/Homework_1 - HTML/.DS_Store new file mode 100644 index 0000000..6266814 Binary files /dev/null and b/Assignment/Homework_1 - HTML/.DS_Store differ diff --git a/Labs/.DS_Store b/Labs/.DS_Store new file mode 100644 index 0000000..593540e Binary files /dev/null and b/Labs/.DS_Store differ diff --git a/Labs/Lab3 - CSS/.DS_Store b/Labs/Lab3 - CSS/.DS_Store new file mode 100644 index 0000000..2e7c916 Binary files /dev/null and b/Labs/Lab3 - CSS/.DS_Store differ diff --git a/Labs/Lab3 - CSS/CSS-in-class-grid-layout.html b/Labs/Lab3 - CSS/CSS-in-class-grid-layout.html index 4d70768..ed744f7 100644 --- a/Labs/Lab3 - CSS/CSS-in-class-grid-layout.html +++ b/Labs/Lab3 - CSS/CSS-in-class-grid-layout.html @@ -33,27 +33,27 @@

In Other News

Our Finest Felines

-
+
Steve

Steve

-
+
Dr. Franklin

Dr. Franklin

-
+
Mr. Lickums

Mr. Lickums

-
+
Roxanne

Roxanne

-
+
Felix

Felix

-
+
Bubbles

Bubbles

diff --git a/Labs/Lab3 - CSS/grid-style.css b/Labs/Lab3 - CSS/grid-style.css index fc6c5d6..0a83c0d 100644 --- a/Labs/Lab3 - CSS/grid-style.css +++ b/Labs/Lab3 - CSS/grid-style.css @@ -62,6 +62,9 @@ header, footer { header { display: inline-block; + background: LightCoral; + position: fixed; + top: 0px; } footer { @@ -83,16 +86,26 @@ img { h2 { font-size: 1.5em; + font-family: "Calibri"; } h3 { font-size: 1.33em; - font-weight: bold; + font-weight: 500; + color: GoldenRod; + font-family: "Cambria"; padding: 20px; } a { - text-decoration: none; + text-decoration: underline; + font-family: "Helvetica"; +} + +p { + font-family: "Garamond"; + font-size: 1.5em; + font-weight: 200; } #site-title { @@ -124,21 +137,35 @@ a.nav-button:visited { /*START HERE*/ .other-news-container { + padding-top: 50px; + float: left; + width: 25%; } .main-container { + padding-top: 50px; + float: left; + width: 75%; } .ib-grid-item { + display: inline-block; + width: 33%; + margin-bottom: 5%; } .ib-grid-item img { + max-width: 66.67%; + max-height: 66.67% } .other-news-item { + box-sizing: border-box; + padding: 0 10%; + margin-bottom: 10%; } diff --git a/Labs/lab1/.DS_Store b/Labs/lab1/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/Labs/lab1/.DS_Store differ diff --git a/Labs/lab1/area.html b/Labs/lab1/area.html new file mode 100644 index 0000000..c79de80 --- /dev/null +++ b/Labs/lab1/area.html @@ -0,0 +1,14 @@ + + + + + + Pokedex + + + + + + + + \ No newline at end of file diff --git a/Labs/lab1/map.html b/Labs/lab1/map.html new file mode 100644 index 0000000..2a5fa86 --- /dev/null +++ b/Labs/lab1/map.html @@ -0,0 +1,17 @@ + + + + + + Pokedex + + + + + + + + + + + diff --git a/Labs/lab1/pokedex.html b/Labs/lab1/pokedex.html new file mode 100644 index 0000000..4c97b72 --- /dev/null +++ b/Labs/lab1/pokedex.html @@ -0,0 +1,71 @@ + + + + + + Pokedex + + + +
+ +
+ + + + + +
+ +

No. 001 Pikachu

+
    +
  • Electric type
    • +
  • Gentle temperament
    • +
  • Grasslands
    • +
+
+

Pikachu can be seen napping in bright sunglight.
+ It has two red dots on its cheeks.
+ By practicing HTML and CSS, Pikachu can learn confusion.
+ Pikachu likes to steal computer chargers from sleeping college students. +

+
+
+ +
+
+ + + + + + + + + + + + + + + + + +
+
+
+ + + + + \ No newline at end of file diff --git a/flaskLab2submission.zip b/flaskLab2submission.zip new file mode 100644 index 0000000..9333e1f Binary files /dev/null and b/flaskLab2submission.zip differ