Browse Source

block-init

Kévin Tessier 5 years ago
parent
commit
89b9500179

+ 1 - 1
logs/popularity/daily.json

@@ -1 +1 @@
-{"02-07-2018":140,"03-07-2018":176,"04-07-2018":10,"11-07-2018":166,"13-07-2018":188,"14-07-2018":111,"17-07-2018":148}
+{"02-07-2018":140,"03-07-2018":176,"04-07-2018":10,"11-07-2018":166,"13-07-2018":188,"14-07-2018":111,"17-07-2018":197}

+ 1 - 1
logs/popularity/monthly.json

@@ -1 +1 @@
-{"07-2018":939}
+{"07-2018":988}

+ 1 - 1
logs/popularity/totals.json

@@ -1 +1 @@
-{"\/":939}
+{"\/":988}

+ 1 - 1
logs/popularity/visitors.json

@@ -1 +1 @@
-{"79c47964f1cd8a7f86f7fb4e1c1ac6bdb2551b4b":1531820217,"4b84b15bff6ee5796152495a230e45e3d7e947d9":1530699635}
+{"79c47964f1cd8a7f86f7fb4e1c1ac6bdb2551b4b":1531829640,"4b84b15bff6ee5796152495a230e45e3d7e947d9":1530699635}

File diff suppressed because it is too large
+ 7 - 1
user/themes/r2c/css-compiled/template.css


File diff suppressed because it is too large
+ 0 - 0
user/themes/r2c/css-compiled/template.min.css


+ 5 - 4
user/themes/r2c/js/site.js

@@ -13,6 +13,7 @@ function drag() {
       // dimension handler
       var $heighthand = $(this).outerHeight();
       var $widthhand = $(this).outerWidth();
+
       // ajust handler
       var ajustH = $heighthand /2;
       var ajustW = $widthhand /2;
@@ -53,15 +54,15 @@ function drag() {
       var $w2_1 = ($w1_2 + $w1_3) - $w0;
       var $w2_2 = ($w1_1 + $w1_3) - $w0;
       var $l2_2 = ($w1_1);
-      var $l2_3 = ($l2_2 + $w1_2);
       var $w2_3 = ($w1_1 + $w1_2) - $w0;
+      var $l2_3 = ($l2_2 + $w1_2);
 
       // style_bottom
       var yPos2 = yPos + (ajustH * 2);
 
-      var $style_rs = { width: xPos, top : yPos2 }
-      var $style_stmp = { width: $w1_2, top : yPos, left : $l2_2 }
-      var $style_img = { width: $w1_3, top : yPos, left : $l2_3 }
+      var $style_rs = { width: xPos, top : yPos2, height: 'auto' }
+      var $style_stmp = { width: $w1_2, top : yPos2, left : $l2_2, height: 'auto' }
+      var $style_img = { width: $w1_3, top : yPos2, left : $l2_3, height: 'auto' }
 
       $rs.css($style_rs);
       $stmp.css($style_stmp);

+ 12 - 9
user/themes/r2c/scss/template/_section.scss

@@ -7,10 +7,7 @@
     #start{
       width: 100%;
       height: calc(100% - 50px);
-      // display: grid;
-      //
       .blocs{
-        // height: calc(100vh/2 - 25px);
         overflow-y: auto;
         &:nth-child(1){
           background: red;
@@ -34,6 +31,9 @@
     }
   }
 
+.top{
+  height: 50%;
+}
 .top, .bottom{
   display: inline-grid;
     grid-template-columns: auto auto auto;
@@ -63,12 +63,15 @@ height: 100%;
 position: fixed;
   & > div{
     position: fixed;
-    height: auto;
+    width: calc(100%/3);
+    top: calc(100%/2 + 25px);
+    height: calc(100%/2 - 25px);
     bottom: 0;
+    &:nth-child(2){
+      left: calc(100%/3);
+    }
+    &:nth-child(3){
+      right: 0;
+    }
   }
 }
-//
-// #reseaux-sociaux{
-//   position: fixed;
-//   height: 100%;
-// }

Some files were not shown because too many files changed in this diff