Merge pull request #3 from gdirdu/gh-pages

Cleaned up spacing, fixed merge conflict
girldevelopit · Aug 15, 2016 · 8c59d21 · 8c59d21
2 parents bf69db4 + c8ed63f
commit 8c59d21
Showing 1 changed file with 19 additions and 23 deletions.
diff --git a/index.html b/index.html
@@ -19,7 +19,7 @@
 		<!-- light editor<link rel="stylesheet" href="lib/css/light.css">-->
 		<!-- dark editor--><link rel="stylesheet" href="lib/css/dark.css">
 		<link rel="stylesheet" href="lib/css/zenburn.css">
-		
+
 		<link rel="stylesheet" href="plugin/accessibility-helper/css/accessibility-helper.css">
 
 		<!-- If the query includes 'print-pdf', include the PDF print sheet -->
@@ -34,7 +34,7 @@
 		</script>
 
 		<!-- If use the PDF print sheet so students can print slides-->
-		
+
 		<link rel="stylesheet" href="css/print/pdf.css" type="text/css" media="print">
     <link rel="icon" type="image/x-icon" href="favicon.ico" />
 		<!--[if lt IE 9]>
@@ -48,7 +48,7 @@
 
 		<!-- Any section element inside of this container is displayed as a slide -->
 			<div class="slides">
-        
+
         <!-- Opening -->
 				<section>
 					<h2>Intro to Web Concepts</h2>
@@ -62,7 +62,7 @@ <h4>What is that Web Developer talking about?</h4>
 		          <h2>Welcome!</h2>
 		            <p>Girl Develop It is here to provide affordable and accessible programs to learn software through mentorship and hands-on instruction.</p>
 		        </section>
-				
+
 				<section>
 		            <h2>Some "rules"</h2>
 			            <ul>
@@ -92,7 +92,7 @@ <h2>What we'll cover</h2>
 		            </ul>
 		          </aside>
 		        </section>
-				
+
 		        <section>
 		          <h2>What to expect</h2>
 		          <ul>
@@ -151,9 +151,6 @@ <h3>Step 2: Your computer performs a DNS lookup</h3>
 				</section>
 
 				<section>
-<<<<<<< HEAD
-					<h3>Step 3: The server responds to your request</h3>
-=======
 					<h3>Step 3: Your computer connects to the server</h3>
 					<p>Your computer uses the IP address to find the correct web server and sends a request for a page.</p>
 					<aside class="notes">
@@ -163,7 +160,6 @@ <h3>Step 3: Your computer connects to the server</h3>
 
 				<section>
 					<h3>Step 4: The server reponds to your request</h3>
->>>>>>> 180400de82f1ab5ee4a30c085edcfd6ec7093742
 					<p>The server processes your request and finds the right files. Sometimes it has to "compile" a page from code and other sources, like a database.</p>
 					<aside class="notes">
 						<p>Back-end languages often talk to databases</p>
@@ -201,10 +197,10 @@ <h3>Client Side vs. Server Side</h3>
 							<li><strong>Client Side:</strong> Stuff happening on your computer independently of the server</li>
 							<li><strong>Server Side:</strong> Requests being fulfilled by a server (&#34;send me these documents&#34;)</li>
 							<li class="fragment">For our discussion, think client &#61; browser</li>
-							<li class="fragment">Clients make requests, servers fulfill them</li>						
+							<li class="fragment">Clients make requests, servers fulfill them</li>
 						</ul>
 		          	<br><br>
-		          	<p class="fragment"><small>Remember <a href="index.html#/6">this</a>?</small></p>	
+		          	<p class="fragment"><small>Remember <a href="index.html#/6">this</a>?</small></p>
 	            </section>
 
         	<section>
@@ -244,7 +240,7 @@ <h3>Terms: Server Side - Backend Applications</h3>
 		          <aside class="notes">
 		            <ul>
 		              	<li>CMS - (Web CMS) Wordpress, Drupal. (Enterprise-level) Interwoven</li>
-           				<li>API - like the "drive thru" version of interfacing with a service</li>	
+           				<li>API - like the "drive thru" version of interfacing with a service</li>
 		            </ul>
 		          </aside>
 		        </section>
@@ -336,7 +332,7 @@ <h3>Parsing Languages &amp; Media</h3>
 							<li>PHP</li>
 							<li>Perl</li>
 							<li>Python</li>
-							<li>Also Javascript. (It's complicated)</li>							
+							<li>Also Javascript. (It's complicated)</li>
 							<li>.NET</li>
 							<li>Java</li>
 							<li>ColdFusion</li>
@@ -374,11 +370,11 @@ <h3>Not languages</h3>
 		            	<li><strong>Libraries</strong>, like jQuery &amp; Mootools, are collections of programming shortcuts for a language</li>
 		            	<li><strong>Frameworks</strong>, like Rails and Angular, a collection of assets/tools that helps you work in a particular language</li>
 						<li><strong>Content Management Systems</strong>, like WordPress, are tools that build webpages</li>
-		           		<li><strong>AJAX</strong>, Asynchronous JavaScript And XML, a technique for combining multiple languages to return results from the server without needing to refresh a page.</li>						
+		           		<li><strong>AJAX</strong>, Asynchronous JavaScript And XML, a technique for combining multiple languages to return results from the server without needing to refresh a page.</li>
 		          	</ul>
 					<aside class="notes">
 						<p>Example of AJAX: Airbnb's search results</p>
-					</aside>			        
+					</aside>
 				</section>
 
 		        <section>
@@ -408,7 +404,7 @@ <h3>Considerations before building</h3>
 		            	<li class="fragment">Hosting and a domain name
 		              	<ul class="fragment">
 		                	<li>Domain name registration should not cost more than $15/yr</li>
-		                	<li>Hosting costs depend on the type of website you're creating (ex. small personal websites should not cost more than $50 annually to host)</li>
+		                	<li>Hosting costs depend on the type of website you're creating (ex. small personal websites should not cost more than $60 annually to host)</li>
 		                	<li>Hosting choices may depend on supported server-side tech</li>
 		              	</ul>
 		            	</li>
@@ -432,9 +428,9 @@ <h3>Building a Website</h3>
 					</ul>
 					<aside class="notes">
 						<p>There are multiple methodologies for how to get there, but the touchpoints are generally consistent for every web project</p>
-					</aside>					
+					</aside>
                 </section>
-		      
+
 		    <section>
 		        <section>
 		          	<h3>User Experience &amp; Information Architecture</h3>
@@ -447,7 +443,7 @@ <h3>User Experience &amp; Information Architecture</h3>
 		         	</ul>
 					<aside class="notes">
 						<p>Go down a step for Sitemaps and Decision Tree examples</p>
-					</aside>		         	 
+					</aside>
 		        </section>
 
 		        <section>
@@ -566,7 +562,7 @@ <h3>Server-side languages: What are the differences?</h3>
 		          	</ul>
 					<aside class="notes">
 						<p>Click down for examples of Hello World in multiple languages</p>
-					</aside>		          	
+					</aside>
 		        </section>
 
         <section>
@@ -621,7 +617,7 @@ <h3>Tools of the trade</h3>
 			          	</ul>
 					<aside class="notes">
 						<p>FTP is appropriate for beginning websites, may not be applicable as you get deeper into development in lieu of other deployment methods</p>
-					</aside>				          	
+					</aside>
 			        </section>
 		      	</section>
 
@@ -678,7 +674,7 @@ <h2>Questions?</h2>
 			          	<div style = "font-size:1200%; height:100%; margin-top:40%" class ="blue">?</div>
 			        </section>
 
-			<!-- Chapter Specific Info 		    
+			<!-- Chapter Specific Info
 	                <section>
 	                  	<h3>Connect With Us!</h3>
 						<p style="padding: 20px 0;">
@@ -690,7 +686,7 @@ <h3>Connect With Us!</h3>
 						<p style="padding-bottom: 20px;">
 							<a href="http://www.twitter.com/[CHAPTER-HANDLE]" target="_blank">@[CHAPTER-HANDLE]</a>
 						</p>
-	                </section>	-->	
+	                </section>	-->
 			</div>
 
 			<!-- End of Class Slides -->