Merge branch 'release/1.2.1'

epfl-si · Aug 29, 2018 · 76cc3b1 · 76cc3b1
2 parents c4cd1a0 + 4aef05c
commit 76cc3b1
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 
 # CHANGELOG
 
+*1.2.1* (2018-08-29)
+  - epfl-news: fix the width of highlighted template (fullscreen)
+  - faculties: increase faculty number to 10 fix
+  - implement styleguide version (1.2.0)
+
 *1.2.0* (2018-08-27)
   - MVC structure improvements for shortcodes
   - Theme translation setup

diff --git a/README.md b/README.md
@@ -20,16 +20,18 @@ Epfl theme (Wordpress)
   4. commit the builds
   5. here you go, you just updated the styleguide version contained in this theme !
 
-## deploying a release
-  Requirements:
+## Create a new release
+  ### Requirements:
   - understand the gitflow logic ([gitflow cheatsheet](https://danielkummer.github.io/git-flow-cheatsheet/))
   - install `git flow` locally [How to install gitflow](https://github.com/nvie/gitflow/wiki/Installation)
+  - initialise git flow in your repo by typing `git flow init`
   - make sure your local branches `master` and `dev` are up-to-date
-  - initialise git flow in your repo `git flow init`
+
+### process
   - start a release: `git flow release start x.x.x`
   - update the following files:
     - `VERSION` with the version number
-    - `CHANGELOG.md` with a description of all the changes since last release
+    - `CHANGELOG.md` with a description of **all the changes since last release**
   - commit them in a "bump version" commit
   - finish the release: `git flow release finish x.x.x`
   - head over this repo on github, on the **release** tab

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.0
+1.2.1
diff --git a/assets/css/base.css b/assets/css/base.css
diff --git a/assets/js/app.bundle.js b/assets/js/app.bundle.js
diff --git a/assets/svg/avatar-placeholder.svg b/assets/svg/avatar-placeholder.svg
diff --git a/shortcodes/epfl_news/view.php b/shortcodes/epfl_news/view.php
@@ -15,8 +15,11 @@
   }
 ?>
 
-<div class="container-full">
+<?php if ("1" == $template): ?>
   <div class="container">
+<?php else: ?>
+  <div class="container-full">
+<?php endif ?>
     <div class="list-group">
       <?php
         foreach($data as $news) {
@@ -177,5 +180,4 @@
 <?php endif; ?>
 
 </div>
-</div>
-</div>
+</div>
diff --git a/shortcodes/faculties/shortcake.php b/shortcodes/faculties/shortcake.php
@@ -7,7 +7,7 @@ function faculties() {
 
 	$fields = [];
 
-	for ($i = 1; $i <= 7; $i++) {
+	for ($i = 1; $i <= 10; $i++) {
 		$fields = array_merge(
 		$fields,
 		[

diff --git a/shortcodes/faculties/view.php b/shortcodes/faculties/view.php
@@ -5,7 +5,7 @@
 <?php if (true): ?>
   <div class="container-full p-lg-5 <?php echo $greyClasses ?>">
     <div class="row">
-      <?php for($i = 1; $i <= 7; $i++): ?>
+      <?php for($i = 1; $i <= 10; $i++): ?>
         <?php if ($data['title'.$i]) : ?>
           <?php $image = get_post($data['image'.$i]); ?>
           <div class="col-sm-4">

diff --git a/style.css b/style.css
@@ -4,7 +4,7 @@ Theme URI:
 Author: Antistatique.net
 Author URI: http://antistatique.net/
 Description: Description
-Version: 1.0.0
+Version: 1.2.1
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Text Domain: epfl