Merge remote-tracking branch 'upstream/master'

aswanthkoleri · aswanthkoleri · commit 4b849f9c4183 · 2017-12-11T02:43:32.000+05:30
diff --git a/index.html b/index.html
@@ -64,7 +64,7 @@
             </div>
         </nav>
 
-            <div class="container-fluid" style="padding-bottom: 10%;">
+            <div class="container-fluid fullpage" style="padding-bottom: 10%;">
                 <div class="row col-md-8 col-md-offset-2">
                     <div id="scene" style="position: relative;">
                     <img src="static/img/gears.gif" class="parallax-width" data-depth="0.1" style="position: relative;">
diff --git a/static/css/cards.css b/static/css/cards.css
@@ -1183,7 +1183,7 @@ fCWicAAAAADLoXP7) format('woff'), url('static/fonts/Avenir-Medium.ttf')  format(
   padding: 20px;
 }
 .fullpage{
-  height: 90vh;
+  height: 100%;
 }
 
 #about{
diff --git a/static/css/main.css b/static/css/main.css
@@ -277,7 +277,7 @@ li{
 
 
 #faq {
-  background-image: url(../img/collage.jpg);
+  background-image: url(../img/collage1.jpg);
   background-size: cover;
   background-repeat: no-repeat;
   color:#fff;
diff --git a/static/img/collage1.jpg b/static/img/collage1.jpg

Original file line number	Diff line number	Diff line change
`@@ -1183,7 +1183,7 @@ fCWicAAAAADLoXP7) format('woff'), url('static/fonts/Avenir-Medium.ttf') format(`
`1183`	`1183`	`padding: 20px;`
`1184`	`1184`	`}`
`1185`	`1185`	`.fullpage{`
`1186`		`- height: 90vh;`
	`1186`	`+ height: 100%;`
`1187`	`1187`	`}`
`1188`	`1188`
`1189`	`1189`	`#about{`