add favicons and meetup links

bcnfs · Oct 28, 2015 · cc78ca1 · cc78ca1
1 parent 9e433ab
commit cc78ca1
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 31 deletions.
diff --git a/_includes/head.html b/_includes/head.html
@@ -10,6 +10,11 @@
     <link href="css/zoom.css" rel="stylesheet">
     <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl |+ prepend: site.url }}">
 
+    <!-- Favicons -->
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+
     <!-- Google fonts -->
     <!--<link href='https://fonts.googleapis.com/css?family=Source+Code+Pro:300,700' rel='stylesheet' type='text/css'>
     <link href='https://fonts.googleapis.com/css?family=Work+Sans:300' rel='stylesheet' type='text/css'>-->

diff --git a/_sass/_front.scss b/_sass/_front.scss
@@ -20,21 +20,12 @@ a:hover {
     text-decoration: none;
 }
 
-// text selectors <3
-::selection {
-    background: rgb(255, 255, 165);
-}
-::-moz-selection {
-    background: rgb(255, 255, 165);
-}
-
 // page styles
 .jumbotron {
     font-family: $font-mono;
     color: white;
 }
 .jumbo-bgImage {
-/*     background: url("/images/open-data.jpg") no-repeat center center; */
     background-color: rgb(201, 67, 40);
     background-size: cover;
 }
@@ -49,6 +40,14 @@ a:hover {
     margin-bottom: 30px;
 }
 
+// text selectors <3
+::selection {
+    background: rgb(255, 255, 165);
+}
+::-moz-selection {
+    background: rgb(255, 255, 165);
+}
+
 @media screen and (min-width: $screen-lg-min) {
     .container {
         width: 970px;

diff --git a/_sass/_utilities.scss b/_sass/_utilities.scss
@@ -21,3 +21,10 @@
 .u-marginBottom {
     margin-bottom: 40px;
 }
+
+@media screen and (min-width: $screen-lg-min) {
+    .u-imgSameWidth {
+        height: 160px;
+        width: auto;
+    }
+}
diff --git a/_sass/_variables.scss b/_sass/_variables.scss
@@ -1,6 +1,6 @@
 // General variables
-$font-mono: "Source Code Pro", "Monaco", Courier, monospace;
-$font-sans: "Work Sans", "Helvetica Neue", "Helvetica", Arial, sans-serif;
+$font-mono: "Monaco", "Menlo", Courier, monospace;
+$font-sans: "Helvetica Neue", "Helvetica", Arial, sans-serif;
 
 // Magic media queries from Bootstrap: http://getbootstrap.com/css/
 $screen-sm-min: 768px;

diff --git a/index.html b/index.html
@@ -24,35 +24,31 @@ <h1 class="jumbo-headline u-alignCenter"><strong>Barcelona</strong> Free Softwar
     </div>
     <div class="row">
         <h2 class="u-fontMono u-alignCenter">Last meetups</h2>
-        <div class="col-md-4">
+        <div class="col-md-4 u-alignCenter">
             <img class="u-imgSameWidth" src="images/meetup.jpg" data-action="zoom">
-            <h3 class="meetupTitle">Wikipedia, a creative common</h3>
+            <h3 class="meetupTitle"><a href="http://www.meetup.com/Barcelona-Free-Software/events/222268760/">MySQL in 2015</a></h3>
         </div>
-        <div class="col-md-4">
+        <div class="col-md-4 u-alignCenter">
             <img class="u-imgSameWidth" src="images/tor.jpg" data-action="zoom">
-            <h3 class="meetupTitle">Wikipedia, a creative common</h3>
+            <h3 class="meetupTitle"><a href="http://www.meetup.com/Barcelona-Free-Software/events/221128295/">Tor for first-world European users</a></h3>
         </div>
-        <div class="col-md-4">
+        <div class="col-md-4 u-alignCenter">
             <img class="u-imgSameWidth" src="images/ubuntu.jpg" data-action="zoom">
-            <h3 class="meetupTitle">Wikipedia, a creative common</h3>
+            <h3 class="meetupTitle"><a href="http://www.meetup.com/Barcelona-Free-Software/events/221967219/">Ubuntu Phone Overview</a></h3>
         </div>
     </div>
     <div class="row">
-        <div class="col-md-8">
-            <h2>Collaborators</h2>
-            <img src="https://www.kde.org/media/images/kde.png">
-            <img src="https://www.kde.org/media/images/kde.png">
-            <img src="https://www.kde.org/media/images/kde.png">
-            <img src="https://www.kde.org/media/images/kde.png">
-        </div>
+        <h2>Patrons</h2>
+        <img src="https://www.kde.org/media/images/kde.png">
+        <img src="https://www.kde.org/media/images/kde.png">
+        <img src="https://www.kde.org/media/images/kde.png">
+        <img src="https://www.kde.org/media/images/kde.png">
     </div>
     <div class="row">
-        <div class="col-md-8">
-            <h2>Patrons</h2>
-            <img src="https://www.kde.org/media/images/kde.png">
-            <img src="https://www.kde.org/media/images/kde.png">
-            <img src="https://www.kde.org/media/images/kde.png">
-            <img src="https://www.kde.org/media/images/kde.png">
-        </div>
+        <h2>Collaborators</h2>
+        <img src="https://www.kde.org/media/images/kde.png">
+        <img src="https://www.kde.org/media/images/kde.png">
+        <img src="https://www.kde.org/media/images/kde.png">
+        <img src="https://www.kde.org/media/images/kde.png">
     </div>
 </div>