From 8f1bbd2135e294dfc4b3a50a0e36567cef365f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Tessier?= Date: Mon, 2 Jul 2018 15:42:28 +0200 Subject: [PATCH] update --- .../36cd78ae294ba6bface958cc4d4ef1b5.yaml.php | 52 +++++++++++++++++++ logs/popularity/daily.json | 2 +- logs/popularity/monthly.json | 2 +- logs/popularity/totals.json | 2 +- logs/popularity/visitors.json | 2 +- user/themes/r2c/css-compiled/template.css | 4 +- user/themes/r2c/css-compiled/template.min.css | 2 +- user/themes/r2c/js/site.js | 6 ++- user/themes/r2c/scss/template/_section.scss | 5 +- .../r2c/templates/partials/base.html.twig | 28 +--------- 10 files changed, 67 insertions(+), 38 deletions(-) create mode 100644 cache/compiled/files/36cd78ae294ba6bface958cc4d4ef1b5.yaml.php diff --git a/cache/compiled/files/36cd78ae294ba6bface958cc4d4ef1b5.yaml.php b/cache/compiled/files/36cd78ae294ba6bface958cc4d4ef1b5.yaml.php new file mode 100644 index 0000000..24c3c7b --- /dev/null +++ b/cache/compiled/files/36cd78ae294ba6bface958cc4d4ef1b5.yaml.php @@ -0,0 +1,52 @@ + 'Grav\\Common\\File\\CompiledYamlFile', + 'filename' => '/mnt/data/Sites/r2c.net/user/plugins/admin/blueprints/config/media.yaml', + 'modified' => 1529476888, + 'data' => [ + 'title' => 'PLUGIN_ADMIN.MEDIA', + 'form' => [ + 'validation' => 'loose', + 'fields' => [ + 'types' => [ + 'name' => 'medias', + 'type' => 'list', + 'label' => 'PLUGIN_ADMIN.MEDIA_TYPES', + 'style' => 'vertical', + 'key' => 'extension', + 'controls' => 'both', + 'collapsed' => true, + 'fields' => [ + '.extension' => [ + 'type' => 'key', + 'label' => 'PLUGIN_ADMIN.FILE_EXTENSION' + ], + '.type' => [ + 'type' => 'text', + 'label' => 'PLUGIN_ADMIN.TYPE' + ], + '.thumb' => [ + 'type' => 'text', + 'label' => 'PLUGIN_ADMIN.THUMB' + ], + '.mime' => [ + 'type' => 'text', + 'label' => 'PLUGIN_ADMIN.MIME_TYPE', + 'validate' => [ + 'type' => 'lower' + ] + ], + '.image' => [ + 'type' => 'textarea', + 'yaml' => true, + 'label' => 'PLUGIN_ADMIN.IMAGE_OPTIONS', + 'validate' => [ + 'type' => 'yaml' + ] + ] + ] + ] + ] + ] + ] +]; diff --git a/logs/popularity/daily.json b/logs/popularity/daily.json index 8f29de3..53451a6 100644 --- a/logs/popularity/daily.json +++ b/logs/popularity/daily.json @@ -1 +1 @@ -{"02-07-2018":124} \ No newline at end of file +{"02-07-2018":140} \ No newline at end of file diff --git a/logs/popularity/monthly.json b/logs/popularity/monthly.json index 2efb00b..18382cc 100644 --- a/logs/popularity/monthly.json +++ b/logs/popularity/monthly.json @@ -1 +1 @@ -{"07-2018":124} \ No newline at end of file +{"07-2018":140} \ No newline at end of file diff --git a/logs/popularity/totals.json b/logs/popularity/totals.json index ff3deda..1f265c5 100644 --- a/logs/popularity/totals.json +++ b/logs/popularity/totals.json @@ -1 +1 @@ -{"\/":124} \ No newline at end of file +{"\/":140} \ No newline at end of file diff --git a/logs/popularity/visitors.json b/logs/popularity/visitors.json index e396c09..297f777 100644 --- a/logs/popularity/visitors.json +++ b/logs/popularity/visitors.json @@ -1 +1 @@ -{"4b84b15bff6ee5796152495a230e45e3d7e947d9":1530537146} \ No newline at end of file +{"4b84b15bff6ee5796152495a230e45e3d7e947d9":1530538441} \ No newline at end of file diff --git a/user/themes/r2c/css-compiled/template.css b/user/themes/r2c/css-compiled/template.css index 63b495a..839fa00 100644 --- a/user/themes/r2c/css-compiled/template.css +++ b/user/themes/r2c/css-compiled/template.css @@ -1,7 +1,7 @@ #page-wrapper #start { display: -ms-inline-flexbox; display: inline-flex; -ms-flex-wrap: wrap; flex-wrap: wrap; width: 100%; height: 100%; position: relative; } -#page-wrapper #start > div { width: calc(100% /3); text-align: center; outline: 1px solid #ccc; } +#page-wrapper #start > div { width: 500px; height: 50%; text-align: center; outline: 1px solid #ccc; } #page-wrapper #start > div > div { background: red; width: 10px; height: 10px; } -/*# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVtcGxhdGUuY3NzIiwic291cmNlcyI6WyJ0ZW1wbGF0ZS5zY3NzIiwiY29uZmlndXJhdGlvbi9fY29uZmlnLnNjc3MiLCJ0ZW1wbGF0ZS9fc2VjdGlvbi5zY3NzIl0sInNvdXJjZXNDb250ZW50IjpbIi8vY29uZmlndXJhdGlvblxuLy8gQGltcG9ydCBcImNvbmZpZ3VyYXRpb24vbWl4aW5cIjtcbkBpbXBvcnQgXCJjb25maWd1cmF0aW9uL2NvbmZpZ1wiO1xuXG4vL3Jlc2V0JFxuLy8gQGltcG9ydCBcInRlbXBsYXRlL3Jlc2V0XCI7XG5cbi8vIFR5cG9ncmFwaHlcbi8vIEBpbXBvcnQgXCJ0ZW1wbGF0ZS90eXBvZ3JhcGh5XCI7XG5cbi8vIEhlYWRlclxuLy8gQGltcG9ydCBcInRlbXBsYXRlL2hlYWRlclwiO1xuXG4vL3NlY3Rpb25cbkBpbXBvcnQgXCJ0ZW1wbGF0ZS9zZWN0aW9uXCI7XG4vLyBAaW1wb3J0IFwidGVtcGxhdGUvc2VjdGlvbi1tZWRpYS1xdWVyaWVzXCI7XG5cbi8vIEZvb3RlclxuLy8gQGltcG9ydCBcInRlbXBsYXRlL2Zvb3RlclwiO1xuIiwiLy9mb250c1xuLy8gQGluY2x1ZGUgZm9udC1mYWNlKCRTdG9semwtVGhpbiwgJGZpbGUsICRmYW1pbHksICRjYXRlZ29yeSk7XG5cbi8vIEZvbnRzLXNpemVcbi8vICRmSDFcbi8vICRmSDJcbi8vICRmSDNcbi8vICRmcFxuLy8gJGZlbVxuLy8gJGZib2xkXG5cbi8vIGNvbG9yXG5cbi8vd2lkdGhcblxuLy8gJDMzOiBjYWxjKDEwMCUgLyAzKTtcbiIsIiNwYWdlLXdyYXBwZXJ7XG4gICNzdGFydHtcbiAgICAgIGRpc3BsYXk6IGlubGluZS1mbGV4O1xuICAgICAgZmxleC13cmFwOiB3cmFwO1xuICAgICAgd2lkdGg6IDEwMCU7XG4gICAgICBoZWlnaHQ6IDEwMCU7XG4gICAgICBwb3NpdGlvbjogcmVsYXRpdmU7XG4gICAgICAmID4gZGl2e1xuICAgICAgICB3aWR0aDogY2FsYygxMDAlIC8zKTtcbiAgICAgICAgLy8gaGVpZ2h0OjEwcHg7XG4gICAgICAgIHRleHQtYWxpZ246IGNlbnRlcjtcbiAgICAgICAgb3V0bGluZTogMXB4IHNvbGlkICNjY2M7XG4gICAgICAgIC8vIHdpZHRoOiAxMHB4O1xuICAgICAgICAmID4gZGl2IHtcbiAgICAgICAgICBiYWNrZ3JvdW5kOiByZWQ7XG4gICAgICAgICAgd2lkdGg6IDEwcHg7XG4gICAgICAgICAgaGVpZ2h0OiAxMHB4O1xuICAgICAgICB9XG4gICAgICAgIH1cbiAgICB9XG59XG4iXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFFQUEsQUFDRSxhQURXLENBQ1gsTUFBTSxDQUFBLEVBQ0YsT0FBTyxFQUFFLFdBQVcsRUFDcEIsU0FBUyxFQUFFLElBQUksRUFDZixLQUFLLEVBQUUsSUFBSSxFQUNYLE1BQU0sRUFBRSxJQUFJLEVBQ1osUUFBUSxFQUFFLFFBQVEsR0FhbkI7O0FBbkJMLEFBT00sYUFQTyxDQUNYLE1BQU0sR0FNRSxHQUFHLENBQUEsRUFDTCxLQUFLLEVBQUUsYUFBYSxFQUVwQixVQUFVLEVBQUUsTUFBTSxFQUNsQixPQUFPLEVBQUUsY0FBYyxHQU90Qjs7QUFsQlQsQUFhUSxhQWJLLENBQ1gsTUFBTSxHQU1FLEdBQUcsR0FNRCxHQUFHLENBQUMsRUFDTixVQUFVLEVBQUUsR0FBRyxFQUNmLEtBQUssRUFBRSxJQUFJLEVBQ1gsTUFBTSxFQUFFLElBQUksR0FDYiJ9 */ +/*# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVtcGxhdGUuY3NzIiwic291cmNlcyI6WyJ0ZW1wbGF0ZS5zY3NzIiwiY29uZmlndXJhdGlvbi9fY29uZmlnLnNjc3MiLCJ0ZW1wbGF0ZS9fc2VjdGlvbi5zY3NzIl0sInNvdXJjZXNDb250ZW50IjpbIi8vY29uZmlndXJhdGlvblxuLy8gQGltcG9ydCBcImNvbmZpZ3VyYXRpb24vbWl4aW5cIjtcbkBpbXBvcnQgXCJjb25maWd1cmF0aW9uL2NvbmZpZ1wiO1xuXG4vL3Jlc2V0JFxuLy8gQGltcG9ydCBcInRlbXBsYXRlL3Jlc2V0XCI7XG5cbi8vIFR5cG9ncmFwaHlcbi8vIEBpbXBvcnQgXCJ0ZW1wbGF0ZS90eXBvZ3JhcGh5XCI7XG5cbi8vIEhlYWRlclxuLy8gQGltcG9ydCBcInRlbXBsYXRlL2hlYWRlclwiO1xuXG4vL3NlY3Rpb25cbkBpbXBvcnQgXCJ0ZW1wbGF0ZS9zZWN0aW9uXCI7XG4vLyBAaW1wb3J0IFwidGVtcGxhdGUvc2VjdGlvbi1tZWRpYS1xdWVyaWVzXCI7XG5cbi8vIEZvb3RlclxuLy8gQGltcG9ydCBcInRlbXBsYXRlL2Zvb3RlclwiO1xuIiwiLy9mb250c1xuLy8gQGluY2x1ZGUgZm9udC1mYWNlKCRTdG9semwtVGhpbiwgJGZpbGUsICRmYW1pbHksICRjYXRlZ29yeSk7XG5cbi8vIEZvbnRzLXNpemVcbi8vICRmSDFcbi8vICRmSDJcbi8vICRmSDNcbi8vICRmcFxuLy8gJGZlbVxuLy8gJGZib2xkXG5cbi8vIGNvbG9yXG5cbi8vd2lkdGhcblxuLy8gJDMzOiBjYWxjKDEwMCUgLyAzKTtcbiIsIiNwYWdlLXdyYXBwZXJ7XG4gICNzdGFydHtcbiAgICAgIGRpc3BsYXk6IGlubGluZS1mbGV4O1xuICAgICAgZmxleC13cmFwOiB3cmFwO1xuICAgICAgd2lkdGg6IDEwMCU7XG4gICAgICBoZWlnaHQ6IDEwMCU7XG4gICAgICBwb3NpdGlvbjogcmVsYXRpdmU7XG4gICAgICAmID4gZGl2e1xuICAgICAgICB3aWR0aDogNTAwcHg7XG4gICAgICAgIGhlaWdodDogNTAlO1xuICAgICAgICB0ZXh0LWFsaWduOiBjZW50ZXI7XG4gICAgICAgIG91dGxpbmU6IDFweCBzb2xpZCAjY2NjO1xuICAgICAgICAmID4gZGl2IHtcbiAgICAgICAgICBiYWNrZ3JvdW5kOiByZWQ7XG4gICAgICAgICAgd2lkdGg6IDEwcHg7XG4gICAgICAgICAgaGVpZ2h0OiAxMHB4O1xuICAgICAgICB9XG4gICAgICAgIH1cbiAgICB9XG59XG4iXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFFQUEsQUFDRSxhQURXLENBQ1gsTUFBTSxDQUFBLEVBQ0YsT0FBTyxFQUFFLFdBQVcsRUFDcEIsU0FBUyxFQUFFLElBQUksRUFDZixLQUFLLEVBQUUsSUFBSSxFQUNYLE1BQU0sRUFBRSxJQUFJLEVBQ1osUUFBUSxFQUFFLFFBQVEsR0FZbkI7O0FBbEJMLEFBT00sYUFQTyxDQUNYLE1BQU0sR0FNRSxHQUFHLENBQUEsRUFDTCxLQUFLLEVBQUUsS0FBSyxFQUNaLE1BQU0sRUFBRSxHQUFHLEVBQ1gsVUFBVSxFQUFFLE1BQU0sRUFDbEIsT0FBTyxFQUFFLGNBQWMsR0FNdEI7O0FBakJULEFBWVEsYUFaSyxDQUNYLE1BQU0sR0FNRSxHQUFHLEdBS0QsR0FBRyxDQUFDLEVBQ04sVUFBVSxFQUFFLEdBQUcsRUFDZixLQUFLLEVBQUUsSUFBSSxFQUNYLE1BQU0sRUFBRSxJQUFJLEdBQ2IifQ== */ diff --git a/user/themes/r2c/css-compiled/template.min.css b/user/themes/r2c/css-compiled/template.min.css index 3ab95d9..c6e4501 100644 --- a/user/themes/r2c/css-compiled/template.min.css +++ b/user/themes/r2c/css-compiled/template.min.css @@ -1 +1 @@ -#page-wrapper #start{position:relative;display:-ms-inline-flexbox;display:inline-flex;width:100%;height:100%;-ms-flex-wrap:wrap;flex-wrap:wrap}#page-wrapper #start>div{width:calc(100% /3);text-align:center;outline:1px solid #ccc}#page-wrapper #start>div>div{width:10px;height:10px;background:red} \ No newline at end of file +#page-wrapper #start{position:relative;display:-ms-inline-flexbox;display:inline-flex;width:100%;height:100%;-ms-flex-wrap:wrap;flex-wrap:wrap}#page-wrapper #start>div{width:500px;height:50%;text-align:center;outline:1px solid #ccc}#page-wrapper #start>div>div{width:10px;height:10px;background:red} \ No newline at end of file diff --git a/user/themes/r2c/js/site.js b/user/themes/r2c/js/site.js index 464ff8a..2fd6fef 100644 --- a/user/themes/r2c/js/site.js +++ b/user/themes/r2c/js/site.js @@ -5,6 +5,10 @@ $(document).ready(function() { $( function() { - $( "#start > div " ).resizable(); + $( "#start > div " ).resizable({ + resetAxes: true, + maxWidth: 1000, + minWidth: 300 + }); } ); }); diff --git a/user/themes/r2c/scss/template/_section.scss b/user/themes/r2c/scss/template/_section.scss index 08ab20c..d255ade 100644 --- a/user/themes/r2c/scss/template/_section.scss +++ b/user/themes/r2c/scss/template/_section.scss @@ -6,11 +6,10 @@ height: 100%; position: relative; & > div{ - width: calc(100% /3); - // height:10px; + width: 500px; + height: 50%; text-align: center; outline: 1px solid #ccc; - // width: 10px; & > div { background: red; width: 10px; diff --git a/user/themes/r2c/templates/partials/base.html.twig b/user/themes/r2c/templates/partials/base.html.twig index cad293a..ccc0dc6 100644 --- a/user/themes/r2c/templates/partials/base.html.twig +++ b/user/themes/r2c/templates/partials/base.html.twig @@ -16,7 +16,7 @@ {% block stylesheets %} - + {% do assets.addCss('theme://css-compiled/template.css') %} {% endblock %} @@ -24,8 +24,6 @@ {% block javascripts %} {% do assets.addJs('jquery', 101) %} - {% do assets.addJs('theme://js/jquery.treemenu.js', {group:'bottom'}) %} - {% do assets.addJs('theme://js/jquery-1.12.4.js', {group:'bottom'}) %} {% do assets.addJs('theme://js/jquery-ui.js', {group:'bottom'}) %} {% do assets.addJs('theme://js/site.js', {group:'bottom'}) %} {% endblock %} @@ -58,13 +56,6 @@ -
-
- - - -
-
{% endblock %} {% block hero %}{% endblock %} @@ -85,25 +76,8 @@ {% block footer %} - {% endblock %} - -
-
- - -
-
- {% block bottom %} {{ assets.js('bottom') }} {% endblock %}