diff --git a/docs/CSSstyle.css b/docs/CSSstyle.css index 671b91d..8d67b53 100644 --- a/docs/CSSstyle.css +++ b/docs/CSSstyle.css @@ -52,7 +52,7 @@ a:hover { } div.button { - background-color: white; + background-color: gray; border: double black; color: black; padding: 15px 32px; @@ -73,8 +73,8 @@ div.button { text-align: center; text-decoration: none; outline: none; - color: #fff; - background-color: #4CAF50; + color: white; + background-color: gray; border: none; border-radius: 15px; box-shadow: 0 9px #999; @@ -180,7 +180,7 @@ div { width: 100%; display: flex; padding:5vw; - background-color:#FAF9F6 + background-color: #747070 } section.Gallery { diff --git a/docs/index.html b/docs/index.html index 3026205..60974ed 100644 --- a/docs/index.html +++ b/docs/index.html @@ -25,13 +25,11 @@
-<<<<<<< HEAD:docs/StartPage.html - Project team: Hadleigh Jae, Nate Hammer and Jermaine Shields - -======= +

This site will be about of a collection of conspiracies centered around around the Illuminati and the New World Order since these seem to be the basis of government and wide scale theories. Based on the files we have we will see how many and how often these two organizations are coorelated with.

+

- Project team: Hadleigh Jae, N Hammer and Jermaine Shields + Project team: Hadleigh Jae, Nate Hammer and Jermaine Shields

->>>>>>> 91104f4f8252e249e23999bc2d1acf8a5435927f:docs/index.html +