diff --git a/src/App.css b/src/App.css index 365f6e9..24a2ee9 100644 --- a/src/App.css +++ b/src/App.css @@ -3,5 +3,8 @@ } body { - font-family: sans-serif; + line-height: 1.6; + font-size: 1.125rem; + color: #333; + background-color: #F9F9F9; } diff --git a/src/Grid.css b/src/Grid.css index b8fb531..125634d 100644 --- a/src/Grid.css +++ b/src/Grid.css @@ -5,7 +5,7 @@ } .grid-item { - background: linear-gradient(135deg, #87e0fd 0%,#53cbf1 40%,#05abe0 100%); + //background: linear-gradient(135deg, #87e0fd 0%,#53cbf1 40%,#05abe0 100%); position: relative; float: left; @@ -23,6 +23,79 @@ padding: 1rem; } +.menu { + display: flex; + flex-flow: column; +} + +.menu .logo { + width: 100%; + padding: 1rem 5rem 0; +} + +.menu section { + display: flex; + min-height: 0; +} + +.menu aside { + flex: 1; + align-self: center; + text-align: right; +} + +.menu .mug { + height: 100%; + padding: 2rem; +} + +.project { + display: flex; + flex-flow: column; +} + +.project header { + font-size: 2.25rem; + line-height: 1.2; +} + +.project section { + min-height: 0; + flex: 1; + display: flex; +} + +.project footer { + display: flex; + justify-content: space-between; + margin: 0 1em; + font-size: 1rem; + font-family: monospace; +} + +.project.bottom section { + flex-flow: column; +} + +.project.left section p { + align-self: center; +} + +.project.left section img { + height: 100%; + padding: 1rem; +} + +.project.bottom section p { + margin-bottom: 1rem; +} + +.project.bottom section img { + object-fit: contain; + min-height: 0; + padding: 1rem; +} + @media all and (max-width: 120rem) { .grid-item { width: 25%; @@ -49,7 +122,7 @@ @media all and (max-width: 51rem) { .grid-container { - max-width: 34rem;; + max-width: 34rem; } .grid-item { width: 100%; diff --git a/src/Grid.js b/src/Grid.js index 18631a2..289a077 100644 --- a/src/Grid.js +++ b/src/Grid.js @@ -4,29 +4,81 @@ import './Grid.css'; import logo from './logo.png'; import GridItem from './GridItem'; +import tanner from './tanner.jpg'; +import dress1 from './dress1.jpg'; +import switch1 from './switch1.jpg'; +import pump1 from './pump1.jpg'; +import hand1 from './hand1.jpg'; + +//function importAll(r) { +// return r.keys().map(x => r(x)); +//} + +//const images = importAll(require.context('./images')); + + class Grid extends React.Component { render() { return (
- - logo -

Links

-

Links

-

Links

-

Links

-

Links

+ + Tanner Collin logo +
+ + Picture of Tanner +
+
More info or a .onion link.
- -

Project 1

+ +
LED Dress
+
+

A dress lit up with LEDs that act as twinkling stars. Seven act as The Big Dipper, and the rest twinkle randomly.

+ LED Dress thumbnail +
+
+

Project (Hardware)

+

2018-10-11

+
- -

Project 2

+ +
Remote Control Lightswitch
+
+ Lightswitch thumbnail +

Custom circuit that lets me control a ceiling light over Wifi.

+
+
+

Project (Hardware)

+

2018-10-11

+
- -

Project 3

+ +
Plant Waterer
+
+ Plant Waterer thumbnail +

Controller that waters my plant automatically every day.

+
+
+

Project (Hardware)

+

2018-10-11

+
- -

Project 4

+ +
Hand of Ozymandias
+
+

Sculpture welded together out of scrap metal for practice.

+ Metal Hand thumbnail +
+
); diff --git a/src/GridItem.js b/src/GridItem.js index c3cbd03..5bf4381 100644 --- a/src/GridItem.js +++ b/src/GridItem.js @@ -4,7 +4,7 @@ class GridItem extends React.Component { render() { return (
-
+
{this.props.children}
diff --git a/src/dress1.jpg b/src/dress1.jpg new file mode 100644 index 0000000..f9dde5e Binary files /dev/null and b/src/dress1.jpg differ diff --git a/src/hand1.jpg b/src/hand1.jpg new file mode 100644 index 0000000..fdf144f Binary files /dev/null and b/src/hand1.jpg differ diff --git a/src/pump1.jpg b/src/pump1.jpg new file mode 100644 index 0000000..943c450 Binary files /dev/null and b/src/pump1.jpg differ diff --git a/src/switch1.jpg b/src/switch1.jpg new file mode 100644 index 0000000..d659cf5 Binary files /dev/null and b/src/switch1.jpg differ diff --git a/src/tanner.jpg b/src/tanner.jpg new file mode 100755 index 0000000..21cffa0 Binary files /dev/null and b/src/tanner.jpg differ