GNOME.org
 

[guadec-web] Given some love to schedule and about Almeria pages

commit 4205a9974704a26dd3ab84110ba41472507c96a6
Author: Oliver Gutierrez <ogutsua gmail com>
Date:   Tue May 29 17:11:30 2018 +0100

    Given some love to schedule and about Almeria pages

 content/pages/about-the-city.md |  17 +++---
 content/pages/schedule.md       | 115 ++++++++++++++++++++++++++++++++++++++--
 src/sass/screen.sass            |   9 ++--
 3 files changed, 127 insertions(+), 14 deletions(-)
---
diff --git a/content/pages/about-the-city.md b/content/pages/about-the-city.md
index ddd11a1..76ecede 100644
--- a/content/pages/about-the-city.md
+++ b/content/pages/about-the-city.md
@@ -2,29 +2,32 @@ Title: About Almería
 Date: 20180525
 
 
-[![][tabernas]](https://commons.wikimedia.org/wiki/File:TabernasDesert.jpg){:align="center"}
+![](https://upload.wikimedia.org/wikipedia/commons/thumb/c/c6/TabernasDesert.jpg/800px-TabernasDesert.jpg){:width="100%"}
 
-[tabernas]: 
https://upload.wikimedia.org/wikipedia/commons/thumb/c/c6/TabernasDesert.jpg/800px-TabernasDesert.jpg
 
+![](https://upload.wikimedia.org/wikipedia/commons/thumb/8/82/Puerta_Purchena._Almer%C3%ADa.jpg/320px-Puerta_Purchena._Almer%C3%ADa.jpg){:width="300px"
 align="right"}
 
-[Almería](https://en.wikipedia.org/wiki/Almer%C3%ADa) is a sunny, lovely city on the Southeast coast of 
Spain. Looking over the Mediterranean sea, the city was founded in 955 by Abd-ar-Rahman III, who ordered the 
construction of the famous [Alcazaba (the Citadel)](https://en.wikipedia.org/wiki/Alcazaba_of_Almer%C3%ADa), 
one of the largest moorish castles in Europe. The modern city has grown over the hills that surround the 
Alcazaba, staying true to its visual and architectural tradition.
 
-![](https://upload.wikimedia.org/wikipedia/commons/thumb/8/82/Puerta_Purchena._Almer%C3%ADa.jpg/320px-Puerta_Purchena._Almer%C3%ADa.jpg){:width="300px"
  align="right"}
+[Almería](https://en.wikipedia.org/wiki/Almer%C3%ADa) is a sunny, lovely city on the Southeast coast of 
Spain. Looking over the Mediterranean sea, the city was founded in 955 by Abd-ar-Rahman III, who ordered the 
construction of the famous [Alcazaba (the Citadel)](https://en.wikipedia.org/wiki/Alcazaba_of_Almer%C3%ADa), 
one of the largest moorish castles in Europe. The modern city has grown over the hills that surround the 
Alcazaba, staying true to its visual and architectural tradition.
 
 
 Almería is also the administrative capital of the homonymous province and part of the [Autonomous Community 
of Andalusia](https://en.wikipedia.org/wiki/Andalusia). The region is famous for its prolific production of 
vegetables, having [over 100000 acres of greenhouses in the Poniente 
province](https://en.wikipedia.org/wiki/Poniente_Almeriense#/media/File:Plastic_sea,_Almer%C3%ADa_Spain.jpg). 
Almería also hosts scientific research facilities like the [Calar Alto Astronomy 
Observatory](http://www.caha.es/), the [Almería Solar 
Platform](https://en.wikipedia.org/wiki/Plataforma_Solar_de_Almer%C3%ADa) and the [Experimental Station of 
Arid Zones](http://www.eeza.csic.es/en/).
 
 
+![](https://upload.wikimedia.org/wikipedia/commons/thumb/a/ab/Museo_de_La_Guitarra._Almeria.jpg/320px-Museo_de_La_Guitarra._Almeria.jpg){:width="300px"
 align="right"}
+
+
 The city has about 195000 inhabitants who are welcoming to visitors and always happy to enjoy the city's 
excellent weather with a vibrant day and night life. Some famous almerians are Nicolás Salmerón y Alonso, the 
third president of the first Spanish Republic; musicians such as [Antonio de 
Torres](https://en.wikipedia.org/wiki/Antonio_de_Torres_Jurado), considered the father of the modern Spanish 
guitar; José Padilla, best known as “Maestro Padilla”, Manolo Escobar; and more recently José Fernández 
Torres “Tomatito” -one of the best flamenco guitarists in the world-; and David Bisbal, the famous pop singer.
 
-![](https://upload.wikimedia.org/wikipedia/commons/thumb/a/ab/Museo_de_La_Guitarra._Almeria.jpg/320px-Museo_de_La_Guitarra._Almeria.jpg){:width="300px"
  align="right"}
 
 Almería is also famous for its [popularity with the filmmaking 
industry](https://www.turismodealmeria.org/wp-content/uploads/2016/04/land-of-film.pdf). A good number of 
world famous films have been shot in the incomparable and varied landscapes and towns of the province. Since 
the sixties, Almería has attracted an enormous amount of films, commercial video and videoclips. Recent films 
like Exodus and TV series like Game of Thrones or Penny Dreadful have filmed here.
 
 
+![](https://upload.wikimedia.org/wikipedia/commons/thumb/8/81/Calle_Almedina._Casco_antiguo_Almer%C3%ADa.jpg/309px-Calle_Almedina._Casco_antiguo_Almer%C3%ADa.jpg){:width="300px"
 align="right"}
+
+
 [Aldous Huxley visited Almería in 1929](http://www.almediam.org/PDF/Huxley.pdf). He was so taken by Almería 
that he wrote a sonnet about it:
 
-<img align="right" 
src="https://upload.wikimedia.org/wikipedia/commons/thumb/8/81/Calle_Almedina._Casco_antiguo_Almer%C3%ADa.jpg/309px-Calle_Almedina._Casco_antiguo_Almer%C3%ADa.jpg";
 />{:width="300px"  align="right"}
 

Winds have no moving emblems here, bud scour
A vacant darkness, un untempered ligth;

@@ -49,4 +52,4 @@ And if you believe being at the South of Spain can be very hot... well, maybe it
 
 Give yourself an opportunity to fall in love with Almería :)
 
-![](https://upload.wikimedia.org/wikipedia/commons/thumb/c/c8/Almer%C3%ADa%2C_Spain_-_panoramio_-_antocon.jpg/800px-Almer%C3%ADa%2C_Spain_-_panoramio_-_antocon.jpg){:align="center"}
+![](https://upload.wikimedia.org/wikipedia/commons/thumb/c/c8/Almer%C3%ADa%2C_Spain_-_panoramio_-_antocon.jpg/800px-Almer%C3%ADa%2C_Spain_-_panoramio_-_antocon.jpg){:width="100%"}
diff --git a/content/pages/schedule.md b/content/pages/schedule.md
index 9fd0435..70eae3e 100644
--- a/content/pages/schedule.md
+++ b/content/pages/schedule.md
@@ -7,17 +7,124 @@ We're putting the detailed talk schedule together right now. In the mean time,
 this is a rough outline of what events to expect on which days at GUADEC this
 year:
 
+<div style="overflow: auto;">
+    <table class="table table-striped table-bordered schedule">
+        <thead class="thead-dark">
+            <tr>
+                <th scope="col"></th>
+                <th scope="col">Thursday 5th</th>
+                <th scope="col">Friday 6th</th>
+                <th scope="col">Saturday 7th</th>
+                <th scope="col">Sunday 8th</th>
+                <th scope="col">Monday 9th</th>
+                <th scope="col">Tuesday 10th</th>
+                <th scope="col">Wednesday 11th</th>
+            </tr>
+        </thead>
+            <tr>
+                <th scope="row">Core days</th>
+                <td></td>
+                <td>☑</td>
+                <td>☑</td>
+                <td>☑</td>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
 
+            <tr>
+                <th scope="row">Hacking & BoFs</th>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td>☑</td>
+                <td>☑</td>
+                <td>☑</td>
+            </tr>
+
+            <tr>
+                <th scope="row">AGM</th>
+                <td></td>
+                <td></td>
+                <td>Evening</td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+
+            <tr>
+                <th scope="row">Lightning talks</th>
+                <td></td>
+                <td>Interns</td>
+                <td></td>
+                <td>General</td>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+
+            <tr>
+                <th scope="row">Lunches (at cafeteria)</th>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+
+            <tr>
+                <th scope="row">Bus service (from CIVITAS to campus)</th>
+                <td></td>
+                <td>☑</td>
+                <td>☑</td>
+                <td>☑</td>
+                <td></td>
+                <td></td>
+                <td></td>
+            </tr>
+
+            <tr>
+                <th scope="row">Planned childcare service</th>
+                <td></td>
+                <td>☑</td>
+                <td>☑</td>
+                <td>☑</td>
+                <td>☑</td>
+                <td>☑</td>
+                <td>☑</td>
+            </tr>
+
+            <tr>
+                <th>Social events</th>
+                <td>Welcome party & pre-registration</td>
+                <td>Beach party</td>
+                <td>Cultural show & picnic</td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td>Outdoor tourism activites</td>
+            </tr>
+        <tbody>
+        </tbody>
+    </table>
+</div>
+
+<!--
 &nbsp;| Thursday 5th | Friday 6th | Saturday 7th | Sunday 8th  | Monday 9th | Tuesday 10th | Wednesday 11th  
+<<<<<<< Updated upstream
 ------|:------------:|:----------:|:------------:|:-----------:|:----------:|:------------:|:--------------:
 Core days |          |          ☑ |            ☑ |           ☑ |            |              |  
 Hacking & BoFs |     |            |              |             |          ☑ |            ☑ | ☑
-AGM   |              |            |      Evening |             |            |              | 
-Lightning talks |    |    Interns |              |     General |            |              | 
+AGM   |              |            |      Evening |             |            |              |
+Lightning talks |    |    Interns |              |     General |            |              |
 Lunches <br/> (at cafeteria)| | ☑ |            ☑ |           ☑ |          ☑ |            ☑ | ☑
 Bus service  <br/> (from CIVITAS<br/> to campus)|  | ☑ | ☑ | ☑ |            |              |  
 Planned childcare<br/> service |  | ☑ |        ☑ |           ☑ |          ☑ |            ☑ | ☑
 Social events | Welcome party<br /> & pre-registration  | Beach<br/> party | Cultural show<br/> & picnic |  
|  |  | Outdoor tourism<br/>activites
+-->
 
-
-We will be adding more details in the upcoming days.
\ No newline at end of file
+We will be adding more details in the upcoming days.
diff --git a/src/sass/screen.sass b/src/sass/screen.sass
index 14497c8..cdd3332 100644
--- a/src/sass/screen.sass
+++ b/src/sass/screen.sass
@@ -62,9 +62,12 @@ table
 img
     max-width: 100%
 
-img.sponsorlogo
-    width: 200px !important
-    max-width: 200px !important
+    &.sponsorlogo
+        width: 200px !important
+        max-width: 200px !important
+
+    &[align=right]
+        margin-left: 10px
 
 .btn-website
     background-color: $headerbg
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]