From 8f6a49d9bec7176c12ffcb3ce4de66895c56889b Mon Sep 17 00:00:00 2001 From: LeeEnck Date: Tue, 1 Oct 2019 12:50:04 -0400 Subject: [PATCH 1/2] Updated code for instagram and stevens-college --- instagram/index.html | 55 +++++++++++++++++++++++++++++++++++++- instagram/styles.css | 28 ++++++++++++++++++- stevens-college/index.html | 43 ++++++++++++++++++++++++++++- stevens-college/styles.css | 28 ++++++++++++++++++- 4 files changed, 150 insertions(+), 4 deletions(-) diff --git a/instagram/index.html b/instagram/index.html index 4884712..989888b 100644 --- a/instagram/index.html +++ b/instagram/index.html @@ -1 +1,54 @@ - + + + + + + + + + Instagram + + + + + +
+ +

About Us

+ +

The Team

+ +

Kevin Systrom (CEO, co-founder)

+ +

Kevin Systrom (@kevin) is the CEO and co-founder of Instagram, a community of more than 1 billion who capture and share the world's moments on the service. He is responsible for the company's overall vision and strategy as well as day-to-day operations.

+ +

Since the beginning, Kevin has focused on simplicity and inspiring creativity through solving problems with thoughtful product design. As a result, Instagram has become the home for visual storytelling for everyone from celebrities, newsrooms and brands, to teens, muscians and anyone with a creative passion.

+ +

Prior to founding Instagram, Kevin was part of the startup Odeo, which later became Twitter, and spent two years at Google working on products like Gmail and Google Reader. He graduated from Stanford University with a BS in Management Science & Engineering and serves on the boards of Walmart and KCRW.

+ +

Mike Krieger (CTO, co-founder)

+ +

Mike Krieger (@mikeyk) is the CTO and co-founder of instagram, a global community of more than 1 billion. As the head of engineering, Mike focuses on building products that bring out the creativity in all of us.

+ +

A native of São Paulo Brazil, Mike holds an MS in Symbolic Sytems from standford University. Prior to founding Instagram, he worked at Meebo as a user experience designer and front-end engineer.

+ +
+ +
+ + +
  • Company
    • +
  • press
    • +
  • Jobs
    • + + +
  • Terms
    • +
  • Privacy
    • +
  • platforms
    • +
  • Libraries
    • + +
    + + + + diff --git a/instagram/styles.css b/instagram/styles.css index b9ad8b6..5bb7b46 100644 --- a/instagram/styles.css +++ b/instagram/styles.css @@ -1 +1,27 @@ -/* Add your CSS here */ +.content { + float: right; +} + +.sidebar { + display: flex; + float: left; +} + +.sidebar { + background: #da9833; + color: #3c70a4; + padding: 2rem; + width: 200px; + } + +.sidebar { + height: 100%; + width: 160px; + position: fixed; + z-index: 1; + top: 0; + left: 0; + background-color: #111; + overflow-x: hidden; + padding-top: 20px; +} diff --git a/stevens-college/index.html b/stevens-college/index.html index 4884712..deab019 100644 --- a/stevens-college/index.html +++ b/stevens-college/index.html @@ -1 +1,42 @@ - + + + + + + + + + + Computer Software Engineering Technology + +

    Computer Software Engineering Technology

    + + + + + +
    + + + +
    + +

    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 and animation, computers and their related software programs makes things possible

    + +
    + +
    + +
    + + Schedule + + Faculty + + Tool List + +
    + + + + diff --git a/stevens-college/styles.css b/stevens-college/styles.css index b9ad8b6..7d4d4bc 100644 --- a/stevens-college/styles.css +++ b/stevens-college/styles.css @@ -1 +1,27 @@ -/* Add your CSS here */ +.title { + display: block; + position: relative; + margin: 0; + padding: 0; +} + +.title { + font-size: 2.625em; + font-family: "Lato" sans-serif; + font-weight: 900; + line-height: 1.2; + text-transform: uppercase; +} + +.p { + justify-content: center; + +} + + .sidebar { + float: left; + display:inline; + margin-left: 20px; + margin: 25px; + text-align: justify; +} From 5e6a599e68f10cc3238e51e204a3a1fd3db63097 Mon Sep 17 00:00:00 2001 From: LeeEnck Date: Tue, 1 Oct 2019 14:24:03 -0400 Subject: [PATCH 2/2] fixed the ul for instagram, also started the html for github. --- github/index.html | 31 ++++++++++++++++++++++++++++++- github/styles.css | 2 +- instagram/index.html | 35 ++++++++++++++++++++--------------- instagram/styles.css | 37 ++++++++++++++++++------------------- stevens-college/index.html | 33 +++++++++++++++++---------------- stevens-college/styles.css | 15 +++++++-------- 6 files changed, 93 insertions(+), 60 deletions(-) diff --git a/github/index.html b/github/index.html index 4884712..ce46613 100644 --- a/github/index.html +++ b/github/index.html @@ -1 +1,30 @@ - + + + + + + + + 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.

    + +
    + + + +
    + + + + diff --git a/github/styles.css b/github/styles.css index b9ad8b6..8b13789 100644 --- a/github/styles.css +++ b/github/styles.css @@ -1 +1 @@ -/* Add your CSS here */ + diff --git a/instagram/index.html b/instagram/index.html index 989888b..78aa9cd 100644 --- a/instagram/index.html +++ b/instagram/index.html @@ -2,17 +2,17 @@ - + - + - Instagram + Instagram - + - + -
    +

    About Us

    @@ -20,11 +20,14 @@

    The Team

    Kevin Systrom (CEO, co-founder)

    -

    Kevin Systrom (@kevin) is the CEO and co-founder of Instagram, a community of more than 1 billion who capture and share the world's moments on the service. He is responsible for the company's overall vision and strategy as well as day-to-day operations.

    +

    Kevin Systrom (@kevin) is the CEO and co-founder of Instagram, a community of more than 1 billion who capture and share the world's moments on the service. He is responsible for the company's overall vision and strategy as + well as day-to-day operations.

    -

    Since the beginning, Kevin has focused on simplicity and inspiring creativity through solving problems with thoughtful product design. As a result, Instagram has become the home for visual storytelling for everyone from celebrities, newsrooms and brands, to teens, muscians and anyone with a creative passion.

    +

    Since the beginning, Kevin has focused on simplicity and inspiring creativity through solving problems with thoughtful product design. As a result, Instagram has become the home for visual storytelling for everyone from celebrities, newsrooms + and brands, to teens, muscians and anyone with a creative passion.

    -

    Prior to founding Instagram, Kevin was part of the startup Odeo, which later became Twitter, and spent two years at Google working on products like Gmail and Google Reader. He graduated from Stanford University with a BS in Management Science & Engineering and serves on the boards of Walmart and KCRW.

    +

    Prior to founding Instagram, Kevin was part of the startup Odeo, which later became Twitter, and spent two years at Google working on products like Gmail and Google Reader. He graduated from Stanford University with a BS in Management Science + & Engineering and serves on the boards of Walmart and KCRW.

    Mike Krieger (CTO, co-founder)

    @@ -32,23 +35,25 @@

    Mike Krieger (CTO, co-founder)

    A native of São Paulo Brazil, Mike holds an MS in Symbolic Sytems from standford University. Prior to founding Instagram, he worked at Meebo as a user experience designer and front-end engineer.

    -
    +
    -
    +
    + - + diff --git a/instagram/styles.css b/instagram/styles.css index 5bb7b46..3ddf497 100644 --- a/instagram/styles.css +++ b/instagram/styles.css @@ -1,27 +1,26 @@ -.content { +.article { float: right; + justify-content: center; } -.sidebar { +.aside { display: flex; - float: left; + flex-flow: column wrap; + float: right; } -.sidebar { - background: #da9833; - color: #3c70a4; - padding: 2rem; - width: 200px; - } +.aside { + padding: 2rem; + width: 200px; +} -.sidebar { - height: 100%; - width: 160px; - position: fixed; - z-index: 1; - top: 0; - left: 0; - background-color: #111; - overflow-x: hidden; - padding-top: 20px; +.aside { + height: auto; + width: 160px; + position: fixed; + z-index: 1; + top: 0; + left: 0; + overflow-x: hidden; + padding-top: 20px; } diff --git a/stevens-college/index.html b/stevens-college/index.html index deab019..1d619df 100644 --- a/stevens-college/index.html +++ b/stevens-college/index.html @@ -2,41 +2,42 @@ - + - + Computer Software Engineering Technology

    Computer Software Engineering Technology

    - + - + -
    +
    - + -
    +
    -

    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 and animation, computers and their related software programs makes things possible

    +

    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 and animation, computers and + their related software programs makes things possible

    -
    +
    -
    +
    -
    +
    - Schedule + Schedule - Faculty + Faculty - Tool List + Tool List -
    +
    - + diff --git a/stevens-college/styles.css b/stevens-college/styles.css index 7d4d4bc..2cd1860 100644 --- a/stevens-college/styles.css +++ b/stevens-college/styles.css @@ -7,7 +7,7 @@ .title { font-size: 2.625em; - font-family: "Lato" sans-serif; + font-family: "Lato"sans-serif; font-weight: 900; line-height: 1.2; text-transform: uppercase; @@ -15,13 +15,12 @@ .p { justify-content: center; - } - .sidebar { - float: left; - display:inline; - margin-left: 20px; - margin: 25px; - text-align: justify; +.sidebar { + float: left; + display: inline; + margin-left: 20px; + margin: 25px; + text-align: justify; }