From cef4672a5165bb73c2ef80c961a1164eeb9bf629 Mon Sep 17 00:00:00 2001 From: nick Date: Fri, 11 Sep 2020 20:15:10 -0400 Subject: [PATCH 01/11] added comments at bottom of index with links to winning websites and adjusted tabs above (Maybe we add dropdown?) --- index.html | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 2e5e5eb..82456b5 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - 750 Website + SB Robotics @@ -29,7 +29,15 @@
  • - Work During Pandemic + Competition Overview +
    • + +
  • + News +
    • + +
  • + Contact Us
    • @@ -38,3 +46,14 @@ + + + + + + + + + + + From 37a7c44b86b5623e8dd07622562b2c31c78bef74 Mon Sep 17 00:00:00 2001 From: nick Date: Sun, 20 Sep 2020 15:33:18 -0400 Subject: [PATCH 02/11] update during prog meeting --- index.html | 16 +++++++++++----- style.css | 41 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 48 insertions(+), 9 deletions(-) diff --git a/index.html b/index.html index 82456b5..8885bf0 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - SB Robotics + HOME @@ -25,15 +25,15 @@
  • - Our History + Gallery
  • - Competition Overview + Vex Robotics
  • - News + Tutorials
  • @@ -43,7 +43,12 @@ - +
    + × + Until further notice, all robotics activities will be fully virtual +
    +

    SOUTH BRUNSWICK HIGH SCHOOL ROBOTICS

    + 750 Logo @@ -57,3 +62,4 @@ + \ No newline at end of file diff --git a/style.css b/style.css index ebabe5b..507c010 100644 --- a/style.css +++ b/style.css @@ -1,13 +1,19 @@ :root{ - --gold: #FFD700; - + --gold1:#FBFCD4; + --gold2:#FFDD03; + --gold3:#FBC403; + --black:#0A0A0A; + --white:#eeeeee; } body{ - background-color: black; + background-color:black; + color:var(--white); + font-family: Garamond; + margin-bottom:100px; } .navbar { - background-color:var(--gold); + background-color:var(--gold3); } .nav-link, .navbar-brand { @@ -32,3 +38,30 @@ body{ width: 50px; height: auto; } +.center{ + margin-top:100px; + margin-left: auto; + margin-right: auto; + text-align: center; + display:block; + +} +.alert { + padding: 20px; + background-color: #f44336; + color: white; +} +.closebtn { + margin-left: 15px; + color: white; + font-weight: bold; + float: right; + font-size: 22px; + line-height: 20px; + cursor: pointer; + transition: 0.3s; +} + +.closebtn:hover { + color: black; +} From 71a0d6c3172753e96405f5cfa30a3edd39dd1f6a Mon Sep 17 00:00:00 2001 From: nick Date: Sun, 20 Sep 2020 15:37:39 -0400 Subject: [PATCH 03/11] fix PR --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 8885bf0..60df37f 100644 --- a/index.html +++ b/index.html @@ -49,6 +49,7 @@

    SOUTH BRUNSWICK HIGH SCHOOL ROBOTICS

    750 Logo + @@ -62,4 +63,3 @@

    SOUTH BRUNSWICK HIGH SCHOOL ROBOTICS

    - \ No newline at end of file From 8c0afe86741b177f1c7308e5a1f05f146aad6058 Mon Sep 17 00:00:00 2001 From: nick Date: Sun, 20 Sep 2020 15:43:14 -0400 Subject: [PATCH 04/11] Fixed isses --- about.html | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ index.html | 4 ++-- 2 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 about.html diff --git a/about.html b/about.html new file mode 100644 index 0000000..4a344d4 --- /dev/null +++ b/about.html @@ -0,0 +1,53 @@ + + + + + + ABOUT + + + + + + + +
    + × + Until further notice, all robotics activities will be fully virtual +
    + + + + \ No newline at end of file diff --git a/index.html b/index.html index 60df37f..62c052b 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - HOME + ABOUT @@ -49,7 +49,7 @@

    SOUTH BRUNSWICK HIGH SCHOOL ROBOTICS

    750 Logo - + From 3c183ed7ee6e4e83f2e172af462764985b7f70ce Mon Sep 17 00:00:00 2001 From: nick Date: Sun, 20 Sep 2020 15:46:45 -0400 Subject: [PATCH 05/11] added all page files --- about.html | 8 ++++---- contact.html | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ gallery.html | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ tutorials.html | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ vex.html | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 216 insertions(+), 4 deletions(-) create mode 100644 contact.html create mode 100644 gallery.html create mode 100644 tutorials.html create mode 100644 vex.html diff --git a/about.html b/about.html index 4a344d4..1028574 100644 --- a/about.html +++ b/about.html @@ -25,19 +25,19 @@
  • - Gallery + Gallery
  • - Vex Robotics + Vex Robotics
  • - Tutorials + Tutorials
  • - Contact Us + Contact Us
    • diff --git a/contact.html b/contact.html new file mode 100644 index 0000000..c48e69d --- /dev/null +++ b/contact.html @@ -0,0 +1,53 @@ + + + + + + CONTACT + + + + + + + +
    + × + Until further notice, all robotics activities will be fully virtual +
    + + + + \ No newline at end of file diff --git a/gallery.html b/gallery.html new file mode 100644 index 0000000..8421013 --- /dev/null +++ b/gallery.html @@ -0,0 +1,53 @@ + + + + + + GALLERY + + + + + + + +
    + × + Until further notice, all robotics activities will be fully virtual +
    + + + + \ No newline at end of file diff --git a/tutorials.html b/tutorials.html new file mode 100644 index 0000000..ce8705e --- /dev/null +++ b/tutorials.html @@ -0,0 +1,53 @@ + + + + + + TUTORIALS + + + + + + + +
    + × + Until further notice, all robotics activities will be fully virtual +
    + + + + \ No newline at end of file diff --git a/vex.html b/vex.html new file mode 100644 index 0000000..da9e52e --- /dev/null +++ b/vex.html @@ -0,0 +1,53 @@ + + + + + + VEX ROBOTICS + + + + + + + +
    + × + Until further notice, all robotics activities will be fully virtual +
    + + + + \ No newline at end of file From 14fcb4deb67365775cb5181f348290bb327c86ed Mon Sep 17 00:00:00 2001 From: nick Date: Sun, 20 Sep 2020 16:24:57 -0400 Subject: [PATCH 06/11] added formating --- about.html | 2 +- contact.html | 2 +- gallery.html | 2 +- index.html | 37 +++++++++++++++++++++++++------------ style.css | 17 ++++++++++++++++- tutorials.html | 2 +- vex.html | 2 +- 7 files changed, 46 insertions(+), 18 deletions(-) diff --git a/about.html b/about.html index 1028574..23b0f73 100644 --- a/about.html +++ b/about.html @@ -18,7 +18,7 @@ -