Merge lp:~raoul-snyman/ubuntu-za/za-blurb into lp:ubuntu-za

[Raoul Snyman]

Add a South African flag, a Community world, and some text to each blurb.

[Gustav H Meyer (inetpro)]

review: Approve

=== added file 'files/community-140x140.png'
Binary files files/community-140x140.png	1970-01-01 00:00:00 +0000 and files/community-140x140.png	2015-02-04 21:20:39 +0000 differ
=== added file 'files/za-flag-140x140.png'
Binary files files/za-flag-140x140.png	1970-01-01 00:00:00 +0000 and files/za-flag-140x140.png	2015-02-04 21:20:39 +0000 differ
=== modified file 'pages/index.rst'
--- pages/index.rst	2015-02-04 20:14:39 +0000
+++ pages/index.rst	2015-02-04 21:20:39 +0000
@@ -13,7 +13,7 @@
     <h1>Sawubona Mhlaba! <small>(Hello, world!)</small></h1>
     <p>Ubuntu-ZA is the Ubuntu Local Community in South Africa. We are a diverse set of people located around South Africa (and some abroad) who are enthusiastic about Ubuntu, Linux and Open Source Software.</p>
     <p>Please join us in using, working on, and helping others with Ubuntu.</p>
-    <p><a href="/getting-involved.html" class="btn btn-primary btn-lg" role="button">Get involved &raquo;</a></p>
+    <p><a href="/getting-involved.html" class="btn btn-primary btn-lg" role="button">Get involved <i class="fa fa-chevron-right fw"></i></a></p>
     </div>
 
 .. raw:: html
@@ -27,16 +27,17 @@
     <p><a class="btn btn-primary" href="http://www.ubuntu.com/" role="button">Learn more <i class="fa fa-external-link fa-fw"></i></a></p>
     </div><!-- /.col-lg-4 -->
     <div class="col-lg-4">
-    <img class="img-circle" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Generic placeholder image" style="width: 140px; height: 140px;">
-    <h2>Heading</h2>
-    <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh.</p>
-    <p><a class="btn btn-primary" href="#" role="button">View details &raquo;</a></p>
+    <img class="img-circle" src="/za-flag-140x140.png" alt="South Africa">
+    <h2>South African</h2>
+    <p>Yes, we're a local group! While we are distributed across South Africa (and even the world), this is the home to Ubuntu users in South Africa.</p>
+    <p>South Africa is also the birthplace of Mark Shuttleworth, the man behind Ubuntu. Want to read more on our beautiful country?</p>
+    <p><a class="btn btn-primary" href="http://en.wikipedia.org/wiki/South_Africa" role="button">Learn more <i class="fa fa-external-link fa-fw"></i></a></p>
     </div><!-- /.col-lg-4 -->
     <div class="col-lg-4">
-    <img class="img-circle" src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" alt="Generic placeholder image" style="width: 140px; height: 140px;">
-    <h2>Heading</h2>
-    <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
-    <p><a class="btn btn-primary" href="#" role="button">View details &raquo;</a></p>
+    <img class="img-circle" src="/community-140x140.png" alt="Local Community">
+    <h2>Local Community</h2>
+    <p>Whether you're new to Ubuntu, an old hand, or simply needing some help with some technical wizardry, our community is always eager to lend a hand. We're not exclusive to Ubuntu either, if you use Linux, you're welcome here!</p>
+    <p><a class="btn btn-primary" href="/getting-involved.html" role="button">Get involved <i class="fa fa-chevron-right fw"</a></p>
     </div><!-- /.col-lg-4 -->
     </div><!-- /.row -->
     </div>

=== modified file 'themes/ubuntuza/assets/css/theme.css'
--- themes/ubuntuza/assets/css/theme.css	2015-02-04 18:41:40 +0000
+++ themes/ubuntuza/assets/css/theme.css	2015-02-04 21:20:39 +0000
@@ -98,4 +98,4 @@
 .marketing .col-lg-4 p {
     margin-right: 10px;
     margin-left: 10px;
-}
+}
\ No newline at end of file