Merge squashed changes

xenon92 · Jan 20, 2019 · ef15d47 · ef15d47
1 parent fced305
commit ef15d47
Show file tree

Hide file tree

Showing 19 changed files with 33 additions and 39 deletions.
diff --git a/CNAME b/CNAME
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 Website - Resurrection Remix OS
 ---
 
+This repository holds the source code
 
-The website can be accessed through the following URLs:
-> - http://www.resurrectionremix.com
-> - http://xenon92.github.io/resurrectionremix-website/
+The site is actually hosted on an external server, and can be viewed [here](https://resurrectionremix.com)
 
+It is updated everytime a new commit is pushed here
 
 #### Resources
 > - [Bootstrap](https://github.com/twbs)

diff --git a/assets/rrabout.png b/assets/rrabout.png
diff --git a/assets/rrbugs.png b/assets/rrbugs.png
diff --git a/assets/rrdownload.png b/assets/rrdownload.png
diff --git a/assets/rrfb.png b/assets/rrfb.png
diff --git a/assets/rrg+.png b/assets/rrg+.png
diff --git a/assets/rrgithub.png b/assets/rrgithub.png
diff --git a/assets/rrinstall.png b/assets/rrinstall.png
diff --git a/assets/rrlogo.png b/assets/rrlogo.png
diff --git a/assets/rrsocial.png b/assets/rrsocial.png
diff --git a/assets/rrsource.png b/assets/rrsource.png
diff --git a/assets/rrteam.png b/assets/rrteam.png
diff --git a/assets/rrtg.png b/assets/rrtg.png
diff --git a/assets/rrthanks.png b/assets/rrthanks.png
diff --git a/assets/rrtwitter.png b/assets/rrtwitter.png
diff --git a/css/style.css b/css/style.css
@@ -69,7 +69,7 @@ body {
 }
 
 ::selection {
-    background: #f0bf00;
+    background: #F1505A;
     color: #333;
 }
 
@@ -311,9 +311,10 @@ em {
 
 .navbar-inverse .navbar-inner {
     background-repeat: repeat;
-    background-color: #010101;
+    opacity: 0.9;
+    background-color: #000000;
     /* 0b333f */
-    border-color: #000000;
+    border-color: transparent;
 }
 
 .navbar-wrapper {
@@ -332,9 +333,9 @@ ul#menu-main>li>a {
 }
 
 ul#menu-main>li>a:hover {
-    background: #c82428;
+    background: #212121;
     padding: 9px 15px;
-    border-radius: 3px;
+    border-radius: 28px;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
 }
@@ -426,7 +427,7 @@ ul#menu-main>li>a:hover {
 }
 
 #headerwrap input[type=submit]:hover, #headerwrap input[type=submit]:active {
-    background: #43413e !important;
+    background: #212121 !important;
 }
 
 
@@ -611,7 +612,7 @@ section#features .span3 {
 
 section#features .span3:hover {
     color: #ffffff;
-    background: #010101;
+    background: #212121;
     box-shadow: 1px 1px 6px #000000;
 }
 
@@ -844,7 +845,7 @@ section#credits h2.featurette-heading {
 }
 
 #theme-form input[type=submit]:hover, #theme-form input[type=submit]:active {
-    background: #43413e !important;
+    background: #212121 !important;
 }
 
 #theme-form textarea {
@@ -899,6 +900,7 @@ hr.featurette-divider {
 footer {
     text-align: center;
     color: #ffffff;
+    letter-spacing: 1px;
     font-weight: bold;
 }
 
@@ -941,7 +943,7 @@ footer p {
     border: 0;
     font-family: 'Roboto Condensed', monospace;
     opacity: 0.4;
-    border-radius: 0;
+    border-radius: 24;
 }
 
 .carousel-control:link, .carousel-control:visited {
@@ -999,6 +1001,7 @@ footer p {
     width: 225px;
     height: 20px;
     text-shadow: none;
+    letter-spacing: 3px;
     font-size: 1.3125em;
     /* 21px */
     padding: 1em 0.25em;
@@ -1007,21 +1010,22 @@ footer p {
     display: block;
     border: 0;
     text-transform: none;
-    background: #c82428 !important;
-    border-radius: 3px;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
+    background: #151515 !important;
+    border-radius: 36px;
+    -moz-border-radius: 36px;
+    -webkit-border-radius: 36px;
     box-shadow: none;
     -moz-box-shadow: none;
     -webkit-box-shadow: none;
 }
 
 .btn:link, .btn:visited {
-    color: #fff;
+    color: #c82428;
+    font-style: bold;
 }
 
 .btn:hover {
-    background: #010101 !important;
+    background: #212121 !important;
 }
 
 .navbar-inverse .btn-navbar {

diff --git a/index.html b/index.html
@@ -21,6 +21,7 @@
 	-->
 	<html lang="en">
 	<head>
+        <meta name="theme-color" content="#000000">
 		<meta charset="utf-8">
 		<title>
 			Resurrection Remix OS | Get Resurrected
@@ -46,6 +47,13 @@
 			padding-top: 35px; /* 60px to make the container go all the way to the bottom of the topbar */
 		}
 	</style>
+        <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+        <script>
+            (adsbygoogle = window.adsbygoogle || []).push({
+            google_ad_client: "ca-pub-6660944894347757",
+            enable_page_level_ads: true
+        });
+        </script>
 	<link href="css/bootstrap-responsive.css" rel="stylesheet">
 	<!-- Favicon -->
 	<link href="img/favicon.png" rel="shortcut icon">
@@ -594,23 +602,6 @@ <h2>
 		</div>
 		<!-- /.container -->
 	</section>
-    <!-- Global site tag (gtag.js) - Google Analytics -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-77237517-1"></script>
-    <script>
-        window.dataLayer = window.dataLayer || [];
-        function gtag(){dataLayer.push(arguments);}
-        gtag('js', new Date());
-
-        gtag('config', 'UA-77237517-1');
-        </script>
-    <!-- Google AdSense -->
-    <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
-    <script>
-        (adsbygoogle = window.adsbygoogle || []).push({
-        google_ad_client: "ca-pub-4751497475727925",
-        enable_page_level_ads: true
-        });
-    </script>
 	<!--******************** Team Section ********************-->
 	<section class="single-page scrollblock" id="team">
 		<div class="container">
@@ -778,8 +769,8 @@ <h2 class="featurette-heading">
 						</p>
 						<p style="font-size:11px;">
 							This is an open source website, available at
-							<a class="github-source-link" href="https://github.com/xenon92/resurrectionremix-website" target="_blank">
-								Shubhang's Github
+							<a class="github-source-link" href="https://github.com/westcripp/resurrectionremix.github.io" target="_blank">
+								Altan's Github
 							</a>
 						</p>
 					</div>

diff --git a/js/bootstrap.js b/js/bootstrap.js
@@ -2265,4 +2265,4 @@
   })
 
 
-}(window.jQuery);
+}(window.jQuery);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2265,4 +2265,4 @@
		})


		}(window.jQuery);
		}(window.jQuery);