changed css

data/resultats.yaml

@@ -43,8 +43,8 @@
     time: "20:30"
     home: gris
     away: rouge
-    home_points: ~
+    home_points: 8
-    away_points: ~
+    away_points: 10
 
 -
     date: 2016/06/23  # year/month/day

script/views/mainPage.js

@@ -4,7 +4,7 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], fu
     mainPageLogo.view = function(){
         return m('div.uk-grid.uk-hidden-small', [
             m('div.uk-large-1-3.uk-medium-2-3.uk-container-center', [
-                m('div.uk-cover-background', {style: 'height: 500px; width: 500px; background-size: 500px; background-image: url(images/phenix_logo.png);'})
+                m('div.uk-cover-background', {style: 'height: 400px; width: 400px; background-size: 400px; background-image: url(images/logosansfond.JPG);'})
             ])
         ]);
     };

script/views/rulesPage.js

@@ -2,26 +2,23 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], fu
 
     var rulesPage = {};
 
-    rulesPage.missionTest = function(){
+    rulesPage.missionText = function(){
         return "La ligue de balle Les Phénix a été fondée en 2004 afin "+
                "d'offrir aux membres de la communauté gaie et lesbienne et à "+
                "leurs amis hétéros l'opportunité de s'amuser et de pratiquer "+
                "un sport dans une ambiance amicale et décontractée. "+
                "L'ouverture d'esprit, la camaraderie et le plaisir de "+
-               "pratiquer un sport à l'extérieur caractérisent cette ligue."
+               "pratiquer un sport à l'extérieur caractérisent cette ligue.";
     };
 
-    rulesPage.mission = function(){
+    rulesPage.logo = function(){
-        return  m('div.uk-panel.uk-panel-box.uk-panel-box-secondary', [
+        var style = 'height: 250px; width: 250px; background-size: 250px; background-image: url(images/logosansfond.JPG);';
-                            m('h2', 'Mission'),
+        return m('div.uk-cover-background.uk-container-center', {style: style});
-                            m('p', rulesPage.missionTest())
-                    ]);
-
     };
 
     rulesPage.rules = function(){
         return  m('div.uk-panel.uk-panel-box.uk-panel-box-secondary', [
-                    m('h2', 'Règlements 2015'),
+                    m('h2', 'Règlements 2016'),
                     m('ul',[
                         m('li', m('h3', 'Règlements généraux')),
                         m('li',  m('h3','Règles et procédures')),
@@ -30,14 +27,32 @@ define(['m', '_', 'util', 'resultParser', 'views/topNavBar', 'views/footer'], fu
                 ]);
     };
 
+    rulesPage.logoAndRules = function(){
+        return  m('div.uk-grid.uk-margin',[
+                    m('div.uk-width-large-1-3',
+                        rulesPage.logo()),
+                    m('div.uk-width-large-2-3',
+                        rulesPage.rules()
+                    )
+                    ]
+                );
+    };
+
+    rulesPage.mission = function(){
+        return m('div.uk-panel.uk-panel-box.uk-panel-box-secondary', [
+            m('h2', 'Mission'),
+            m('p', rulesPage.missionText())
+        ]);
+    };
+
     rulesPage.view  = function(){
         return [
                 m.component(topNavBar),
 
                 m('div.uk-margin-top.uk-margin-bottom.uk-grid',
                 m('div.uk-width-large-3-5.uk-container-center', [
-                    rulesPage.mission(),
+                    rulesPage.logoAndRules(),
-                    rulesPage.rules()
+                    rulesPage.mission()
                 ])),
                 m.component(footer)
             ];

scss/_custom_uikit.scss

@@ -2,6 +2,17 @@
 @import "uikit/scss/uikit-mixins.scss";
 @import "uikit/scss/core/variables.scss";
 
+// Phenix colors
+
+$navbar-background: #f08d28; //#dabd5e;
+// $foo: ; // #f8c694;
+
+$panel-box-background: #fce3ca;
+$table-striped-background: #fce3ca;
+$navbar-nav-active-background: #fce3ca;
+$navbar-nav-hover-background: #fce3ca;
+$panel-box-secondary-background: #fce3ca;
+
 // Defaults
 @import "uikit/scss/core/base.scss";