瀏覽代碼

update code

Kévin Tessier 5 年之前
父節點
當前提交
aea6f4f6ce

+ 1 - 1
cache/compiled/files/e2debe8a7c302596261150465a999131.yaml.php

@@ -2,7 +2,7 @@
 return [
     '@class' => 'Grav\\Common\\File\\CompiledYamlFile',
     'filename' => '/var/www/html/system/blueprints/user/account.yaml',
-    'modified' => 1529597236,
+    'modified' => 1532585289,
     'data' => [
         'title' => 'Account',
         'form' => [

+ 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":197,"25-07-2018":26,"26-07-2018":54}
+{"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,"25-07-2018":26,"26-07-2018":277}

+ 1 - 1
logs/popularity/monthly.json

@@ -1 +1 @@
-{"07-2018":1068}
+{"07-2018":1291}

+ 1 - 1
logs/popularity/totals.json

@@ -1 +1 @@
-{"\/":1068}
+{"\/":1291}

+ 1 - 1
logs/popularity/visitors.json

@@ -1 +1 @@
-{"79c47964f1cd8a7f86f7fb4e1c1ac6bdb2551b4b":1532588999,"4b84b15bff6ee5796152495a230e45e3d7e947d9":1530699635}
+{"79c47964f1cd8a7f86f7fb4e1c1ac6bdb2551b4b":1532610035,"4b84b15bff6ee5796152495a230e45e3d7e947d9":1530699635}

File diff suppressed because it is too large
+ 9 - 5
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


+ 66 - 58
user/themes/r2c/js/site.js

@@ -9,64 +9,72 @@ function drag() {
 
   $hand.draggable({
     drag: function(){
-
-      // dimension handler
-      var $heighthand = $(this).outerHeight();
-      var $widthhand = $(this).outerWidth();
-
-      // ajust handler
-      var ajustH = $heighthand /2;
-      var ajustW = $widthhand /2;
-
-      // position handler
-      var offset = $(this).offset();
-      var xPos = offset.left + ajustW;
-      var yPos = offset.top - ajustH;
-
-      var xPos2 = xPos + (ajustW * 2);
-      var yPos2 = yPos + (ajustH * 2);
-
-      // top
-      var $recits = $(this).parent('#page').find('#recits');
-      var $itw = $(this).parent('#page').find("#interviews");
-      var $links = $(this).parent('#page').find("#links");
-
-      // bottom
-      var $rs = $(this).parent('#page').find("#reseaux-sociaux");
-      var $stmp = $(this).parent('#page').find("#streetmap");
-      var $img = $(this).parent('#page').find("#images");
-
-      // style
-      var style_recit =  { width: xPos, height : yPos }
-      var style_height =  { height : yPos }
-
-      // app style
-      $recits.css(style_recit);
-      $itw.css(style_height);
-      $links.css(style_height);
-
-      // width div
-      var $w0 = $('html').outerWidth();
-      var $w1_1 = $recits.outerWidth();
-      var $w1_2 = $itw.outerWidth();
-      var $w1_3 = $links.outerWidth();
-
-      var $w2_1 = ($w1_2 + $w1_3) - $w0;
-      var $w2_2 = ($w1_1 + $w1_3) - $w0;
-      var $l2_2 = ($w1_1);
-      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, 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);
-      $img.css($style_img);
+      // handler
+        // dimension handler
+        var $Hhand = $(this).outerHeight();
+        var $Whand = $(this).outerWidth();
+        // ajust handler
+        var ajustH = $Hhand / 2;
+        var ajustW = $Whand / 2;
+
+        // position handler
+        var offset = $(this).offset();
+        var xPos = offset.left + ajustW;
+        var yPos = offset.top - ajustH;
+
+        var xPos2 = xPos + (ajustW * 2);
+        var yPos2 = yPos + (ajustH * 2);
+
+      // Blocs
+        // top
+        var $recits = $(this).parent('#page').find('#recits');
+        var $itw = $(this).parent('#page').find("#interviews");
+        var $img = $(this).parent('#page').find("#images");
+
+        // bottom
+        var $links = $(this).parent('#page').find("#links");
+        var $rs = $(this).parent('#page').find("#reseaux-sociaux");
+        var $stmp = $(this).parent('#page').find("#streetmap");
+        var $bottom = $(this).parent('#page').find(".bottom");
+
+        // dimension blocs
+        var Array_Dw0 = [];
+        var Array_Dw1 = [];
+        var Array_Dw2 = [];
+        var Array_Dw3 = [];
+
+        var Dw0 = $(window).outerWidth(true);
+        var Dw1 = $recits.outerWidth(true);
+        var Dw2 = $itw.outerWidth(true);
+        var Dw3 = $img.outerWidth(true);
+
+        // var Bw1 = (Dw0 - (Dw2 + Dw3));
+        var Bw2 = (Dw0 - (Dw1 + Dw3));
+        var Bw3 = (Dw0 - (Dw1 + Dw2));
+        var Bl3 = Dw1 + Dw2;
+        // app dimension
+        $recits.css({
+          "width": xPos,
+          "height": yPos,
+        });
+        $itw.css({
+          "width": Bw2,
+          "height": yPos,
+        });
+        $img.css({
+          "width": '33%',
+          "height": yPos,
+        });
+        $bottom.css({
+          "top": yPos2,
+        })
+        $links.css({
+          "width": xPos,
+          "top": yPos2,
+        })
+        $rs.css({
+          "width": Bw2,
+        });
     }
   });
 };

+ 3 - 9
user/themes/r2c/scss/configuration/_config.scss

@@ -9,21 +9,15 @@
 // $fem
 // $fbold
 
-// color
-
-//width
-
-// $33: calc(100% / 3);
-
 // header
-$heightH: 25px;
+$heightH: calc(25px + 2.5px);
 
 // taille & position blocs
 
 // height
 $H100: 100%;
 $H50: calc(#{$H100} / 2);
-
+$H50-25: calc(#{$H100} / 2 - #{$heightH});
 // width
 $W100: 100%;
 $W33: calc(#{$W100} / 3);
@@ -40,4 +34,4 @@ $B100: 100%;
 // left
 $L100: 100%;
 $L33: calc(#{$L100} / 3);
-$L66: calc(#{$L100} / 3);
+$L66: calc(#{$L33} * 2);

+ 31 - 49
user/themes/r2c/scss/template/_section.scss

@@ -1,37 +1,48 @@
-.handler{
-  width: 50px;
-  height: 50px;
-  border-radius: 25px;
-  background: blue;
-  position: absolute;
-  left : calc((100%/3) - 25px);
-  top: 50%;
-  z-index: 999;
-}
 body{
   overflow: hidden;
 }
+
 #page{
   height: 100%;
   .navbar{
     width: 100%;
     height: 50px;
   }
+  .handler{
+    width: 50px;
+    height: 50px;
+    border-radius: 25px;
+    background: blue;
+    position: absolute;
+    left : calc((100%/3) - 25px);
+    top: 50%;
+    z-index: 999;
+  }
   #start{
     width: 100%;
     height: calc(100% - 50px);
     .top, .bottom{
+      width: 100%;
+      display: inline-flex;
+      justify-content: space-between;
+    }
+    .top{
       position: relative;
       height: $H50;
     }
+    .bottom{
+      position: absolute;
+      height: auto;
+      bottom: 0;
+    }
     .blocs{
       overflow-y: auto;
-      position: absolute;
+      // position: fixed;
+      margin: 5px;
       width: $W33;
-      height: $H100;
+      // height: $H50-25;
       &:nth-child(1){
         background: red;
-
       }
       &:nth-child(2){
         background: pink;
@@ -39,43 +50,14 @@ body{
       }
       &:nth-child(3){
         background: green;
-        right: 0;
+        // left: $L66;
+        // right: 0;
+      }
+    }
+    .bottom{
+      .blocs{
+        // display: none;
       }
     }
   }
 }
-
-// .top{
-//   height: 50%;
-// }
-// .top, .bottom{
-//   // display: inline-grid;
-//   //   grid-template-columns: auto auto auto;
-// }
-
-
-
-//
-// #start{
-//   height: 100%;
-//   & > div {
-//     position: fixed;
-//     height: 100%;
-//   }
-// }
-//
-// .top, .bottom{
-//   & > div{
-//     position: fixed;
-//     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;
-//     }
-//   }
-// }

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