From 54a3f8b079c3ebf7167ba340b27449bf82b16650 Mon Sep 17 00:00:00 2001 From: Ethan Kubistek Date: Thu, 26 Sep 2019 15:49:47 -0400 Subject: [PATCH 1/4] my stevens got finsihed --- stevens-college/index.html | 57 +++++++++++++++++++++++++++++++++++++- stevens-college/styles.css | 28 ++++++++++++++++++- 2 files changed, 83 insertions(+), 2 deletions(-) diff --git a/stevens-college/index.html b/stevens-college/index.html index 4884712..a05774b 100644 --- a/stevens-college/index.html +++ b/stevens-college/index.html @@ -1 +1,56 @@ - + + + + stevens-college + + + + +

Computer Software Engineering Technology

+ + cat-photo + +
+ SCHEDULE + FACULTY + TOOLLIST +
+ + Computers have become a major factor in the development and operation of the modern + industry. From providing means of communications, to operating machines, to facilitating + international commerce, to systems animation, computers and their related software programs + makes things possible. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/stevens-college/styles.css b/stevens-college/styles.css index b9ad8b6..6e45dde 100644 --- a/stevens-college/styles.css +++ b/stevens-college/styles.css @@ -1 +1,27 @@ -/* Add your CSS here */ +.title { +display: block; +font-size: 6rem; +font-weight: 800; +margin: 0; +padding-right: 2000; +} + +.cat-photo{ +width: 608px; +height: 340px; +margin-left: 5px; +} + +a{ + border: solid #a6093d; + margin: 30px; + display: inline-block; + box-sizing: border-box; + width: 140px; + height: 45px; + text-align: center; + background-color: #a6093d; + color: #ffffff; +padding: 10px; +} + From bb96a1c62323a3c0487a2d6fc21d4b0a3b09b6b1 Mon Sep 17 00:00:00 2001 From: Ethan Kubistek Date: Thu, 26 Sep 2019 16:10:59 -0400 Subject: [PATCH 2/4] made a quick fix --- stevens-college/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stevens-college/index.html b/stevens-college/index.html index a05774b..808eb84 100644 --- a/stevens-college/index.html +++ b/stevens-college/index.html @@ -16,10 +16,10 @@

Computer Software Engineering Technology

TOOLLIST - Computers have become a major factor in the development and operation of the modern +

Computers have become a major factor in the development and operation of the modern industry. From providing means of communications, to operating machines, to facilitating international commerce, to systems animation, computers and their related software programs - makes things possible. + makes things possible.

From 0114eeb095b248ea177cec8dda2480fed8a50d79 Mon Sep 17 00:00:00 2001 From: Ethan Kubistek Date: Tue, 1 Oct 2019 12:19:59 -0400 Subject: [PATCH 3/4] github when we worked on it in pairs --- amazon/index.html | 8 +++++++- github/index.html | 44 +++++++++++++++++++++++++++++++++++++++- github/styles.css | 51 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 100 insertions(+), 3 deletions(-) diff --git a/amazon/index.html b/amazon/index.html index 4884712..f2d7917 100644 --- a/amazon/index.html +++ b/amazon/index.html @@ -1 +1,7 @@ - + + + + + + + diff --git a/github/index.html b/github/index.html index 4884712..6d2c5c5 100644 --- a/github/index.html +++ b/github/index.html @@ -1 +1,43 @@ - + + + + + GitHub + + + +
+

Come help us make collaboration even better

+

At GitHub we build the tools that make collaborating and + writing software easier for everyone. We've built a company we + truly love working for, and we think you will too.

+
+ +
+ +
+
+

A diverse and inclusive workplace

+

At GitHub, we think that a diverse company is a strong company, and + we work hard to foster a supportive and welcoming workplace. Learn + more about our commitment to diversity and inclusion and see our + current demographic data.

+
+
+

Work happier

+

Build amazing things with autonomy, self-direction, and a healthy + work-life balance. We offer flexible work schedules for all of + our employees and unlimited PTO. We also believe that if a job allows for it, + you should work wherever you're happiest.

+
+ + \ No newline at end of file diff --git a/github/styles.css b/github/styles.css index b9ad8b6..2b3fb1b 100644 --- a/github/styles.css +++ b/github/styles.css @@ -1 +1,50 @@ -/* Add your CSS here */ +*, *::after, *::before { + box-sizing: border-box; + } + body { + font-family: sans-serif; + } + h1 { + text-align: center; + margin-top: 8rem; + font-size: 3rem; + width: 60%; + margin-left: auto; + margin-right: auto; + } + li { + display: inline; + list-style: none; + } + ul { + padding-left: 0; + } + a { + text-decoration: none; + } + header p { + width: 70%; + font-size: 1.5rem; + margin-left: auto; + margin-right: auto; + text-align: center; + } + nav { + position: absolute; + top: 0; + }.links li{ + display: block; + width: 30%; + text-align: center; + } + .links ul{ + display: flex; + width: 50%; + margin: 3rem auto 4rem auto; + justify-content: space-around; + } + .links a { + font-size: 1.2rem; + } + + /* Add your CSS here */ From a76099538f3585a05e1f48e37184b0cfb51c0710 Mon Sep 17 00:00:00 2001 From: Ethan Kubistek Date: Tue, 1 Oct 2019 13:46:26 -0400 Subject: [PATCH 4/4] finished up on the amazon project --- amazon/index.html | 52 +++++++++++++++++++++++++++++++++++++ amazon/styles.css | 66 ++++++++++++++++++++++++++++++++++++++++++++++- github/styles.css | 2 -- 3 files changed, 117 insertions(+), 3 deletions(-) diff --git a/amazon/index.html b/amazon/index.html index f2d7917..1f893c2 100644 --- a/amazon/index.html +++ b/amazon/index.html @@ -5,3 +5,55 @@ + +
+

Computer & Technology Books

+

+ Browse a wide of Programming guides + , Android resources, and + Java books. +

+
+ +
+

Shop by category

+
+ + +
+
    +
  • cat-photo
    • +
  • cat-photo
    • +
  • cat-photo
    • +
  • cat-photo
    • + +
+
+ +
+ + +
+
    +
  • cat-photo
    • +
  • cat-photo
    • +
  • cat-photo
    • +
  • cat-photo
    • + +
+
+ +
+ +
+ diff --git a/amazon/styles.css b/amazon/styles.css index b9ad8b6..4ba43c3 100644 --- a/amazon/styles.css +++ b/amazon/styles.css @@ -1 +1,65 @@ -/* Add your CSS here */ +*, *::after, *::before { + box-sizing: border-box; + } + body { + font-family: sans-serif; + } + + header h1{ + color: #ff9900; + } + + header p{ + margin 0.5 top; + } + +.links li{ + width: 80%; + + } + .links ul{ + display: flex; + width: 75%; + margin: 5 rem auto 5 rem auto; + font-size: 0.5 rem; + justify-content: space-between; + + } + + li { + display: inline; + list-style: none; + } + + .pictures li{ + width: 80%; + + } + .pictures ul{ + display: flex; + width: 80%; + margin: 5 rem auto 5rem auto; + + } + .pictures a { + font-size: 1 rem; + } + + .pictures { + display: inline; + list-style: none; + } + + .links2 li{ + width: 80%; + + } + .links2 ul{ + display: flex; + width: 80%; + margin: 5 rem auto 5rem auto; + justify-content: space-between; + } + .links2 a { + font-size: 1 rem; + } diff --git a/github/styles.css b/github/styles.css index 2b3fb1b..e989032 100644 --- a/github/styles.css +++ b/github/styles.css @@ -46,5 +46,3 @@ .links a { font-size: 1.2rem; } - - /* Add your CSS here */