Merge branch 'charnpreetsingh185-clean' PR jupyter#152

Fix merge conflict in css file.
PR authors: @cameronoelsen @charnpreetsingh185

Author: willingc

about.html

@@ -209,43 +209,43 @@ <h3 class="col-sm-12 section-header">Sponsors</h3>
                 <div class="col-xs-12 section-center">
                     <div class="col-sm-3 col-xs-6 sponsor">
                         <a href="http://helmsleytrust.org">
-                            <img src="assets/helmsley.svg" class="sponsor-logo" alt="helmsley trust logo"/>                                   </a>
+                            <img src="assets/helmsley.svg" class="company-logo" alt="helmsley trust logo"/>                                   </a>
                     </div>
                     <div class="col-sm-3 col-xs-6 sponsor">
                         <a href="http://www.sloan.org/">
-                            <img src="assets/alfred.svg" class="sponsor-logo" alt="sloan logo"/>
+                            <img src="assets/alfred.svg" class="company-logo" alt="sloan logo"/>
                         </a>
                     </div>
                     <div class="col-sm-3 col-xs-6 sponsor">
                         <a href="https://www.moore.org/">
-                            <img src="assets/moore.svg" class="sponsor-logo" alt="moore foundation logo"/>
+                            <img src="assets/moore.svg" class="company-logo" alt="moore foundation logo"/>
                         </a>
                     </div>
                     <div class="col-sm-3 col-xs-6 sponsor">
                         <a href="https://www.google.com/">
-                            <img src="assets/google-color.svg"  class="sponsor-logo" alt="google logo"/>
+                            <img src="assets/google-color.svg"  class="company-logo" alt="google logo"/>
                         </a>
                     </div>
                 </div>
                 <div class="col-xs-12 section-center">
                     <div class="col-sm-3 col-xs-6 sponsor">
                         <a href="http://developer.rackspace.com/">
-                            <img src="assets/rackspace-color.svg" class="sponsor-logo" alt="rackspace logo"/>
+                            <img src="assets/rackspace-color.svg" class="company-logo" alt="rackspace logo"/>
                         </a>
                     </div>
                     <div class="col-sm-3 col-xs-6 sponsor">
                         <a href="https://www.fastly.com/">
-                            <img src="assets/fastly.svg" class="sponsor-logo" alt="fastly logo"/>
+                            <img src="assets/fastly.svg" class="company-logo" alt="fastly logo"/>
                         </a>
                     </div>
                     <div class="col-sm-3 col-xs-6 sponsor">
                         <a href="http://opendreamkit.org/">
-                            <img src="assets/EC-H2020.svg" class="sponsor-logo" alt="EU logo"/>
+                            <img src="assets/EC-H2020.svg" class="company-logo" alt="EU logo"/>
                         </a>
                     </div>
                     <div class="col-sm-3 col-xs-6 sponsor">
                         <a href="http://www.microsoft.com/">
-                            <img src="assets/microsoft-color.svg" class="sponsor-logo" alt="microsoft logo"/>
+                            <img src="assets/microsoft-color.svg" class="company-logo" alt="microsoft logo"/>
                         </a>
                     </div>
                 </div>
@@ -264,27 +264,27 @@ <h3 class="col-sm-12 section-header">Institutional Partners</h3>
                 <div class="col-xs-12 section-center">
                     <div class="col-sm-3 col-xs-6 sponsor">
                         <a href="http://continuum.io/">
-                            <img src="assets/continuum-color.svg" class="sponsor-logo" height="60" width="200" alt="continuum.io logo">
+                            <img src="assets/continuum-color.svg" class="company-logo" height="60" width="200" alt="continuum.io logo">
                         </a>
                     </div>
                     <div class="col-sm-3 col-xs-6 sponsor">
                         <a href="http://www.bloomberg.com/">
-                            <img src="assets/bloomberg-color.svg" class="sponsor-logo" alt="bloomberg logo">
+                            <img src="assets/bloomberg-color.svg" class="company-logo" alt="bloomberg logo">
                         </a>
                     </div>
                     <div class="col-sm-3 col-xs-6 sponsor">
                         <a href="http://developer.rackspace.com/">
-                            <img src="assets/rackspace-color.svg" class="sponsor-logo" alt="rackspace logo">
+                            <img src="assets/rackspace-color.svg" class="company-logo" alt="rackspace logo">
                         </a>
                     </div>
                     <div class="col-sm-3 col-xs-6 sponsor">
                         <a href="http://www.calpoly.edu/">
-                            <img src="assets/poly-color.svg" class="sponsor-logo" alt="cal poly logo">
+                            <img src="assets/poly-color.svg" class="company-logo" alt="cal poly logo">
                         </a>
                     </div>
                     <div class="col-sm-3 col-sm-offset-4 col-xs-6 sponsor center-block">
                         <a href="http://www.berkeley.edu/">
-                            <img src="assets/berkeley-color.svg" class="sponsor-logo" alt="UC Berkeley logo">
+                            <img src="assets/berkeley-color.svg" class="company-logo" alt="UC Berkeley logo">
                         </a>
                     </div>
                 </div>

css/logo-nav.css

@@ -437,7 +437,7 @@ body {
 .sponsor {
     margin: 16px 0;
 }
-.sponsor-logo {
+.company-logo {
     height: auto;
     width: 75%;
 }
@@ -505,7 +505,7 @@ body {
     display: block;
     height: 80px;
     margin: 0 auto;
-} 
+}
 .resource-name {
      margin-top: 6px;
 }
@@ -766,4 +766,4 @@ body {
     .footer ul {
         float: left;
     }
-}
+}