Commit ff208876 authored by Nicolas Widart's avatar Nicolas Widart

Updating assets and modules

parent e4bc6bc4
This diff is collapsed.
...@@ -39,6 +39,10 @@ return [ ...@@ -39,6 +39,10 @@ return [
'AdminLTE.css' => ['theme' => 'vendor/admin-lte/dist/css/AdminLTE.css'], 'AdminLTE.css' => ['theme' => 'vendor/admin-lte/dist/css/AdminLTE.css'],
'AdminLTE.all.skins.css' => ['theme' => 'vendor/admin-lte/dist/css/skins/_all-skins.min.css'], 'AdminLTE.all.skins.css' => ['theme' => 'vendor/admin-lte/dist/css/skins/_all-skins.min.css'],
'asgard.css' => ['theme' => 'css/asgard.css'], 'asgard.css' => ['theme' => 'css/asgard.css'],
//'gridstack.css' => ['module' => 'dashboard:vendor/gridstack/dist/gridstack.min.css'],
'gridstack.css' => ['module' => 'dashboard:gridstack/gridstack.min.css'],
'daterangepicker.css' => ['theme' => 'vendor/admin-lte/plugins/daterangepicker/daterangepicker-bs3.css'],
// Javascript // Javascript
'jquery.js' => ['theme' => 'vendor/jquery/dist/jquery.min.js'], 'jquery.js' => ['theme' => 'vendor/jquery/dist/jquery.min.js'],
'bootstrap.js' => ['theme' => 'vendor/bootstrap/dist/js/bootstrap.min.js'], 'bootstrap.js' => ['theme' => 'vendor/bootstrap/dist/js/bootstrap.min.js'],
...@@ -51,6 +55,15 @@ return [ ...@@ -51,6 +55,15 @@ return [
'app.js' => ['theme' => 'vendor/admin-lte/dist/js/app.js'], 'app.js' => ['theme' => 'vendor/admin-lte/dist/js/app.js'],
'keypressAction.js' => ['module' => 'core:js/keypressAction.js'], 'keypressAction.js' => ['module' => 'core:js/keypressAction.js'],
'ckeditor.js' => ['theme' => 'js/vendor/ckeditor/ckeditor.js'], 'ckeditor.js' => ['theme' => 'js/vendor/ckeditor/ckeditor.js'],
'lodash.js' => ['module' => 'dashboard:vendor/lodash/lodash.min.js'],
'jquery-ui-core.js' => ['module' => 'dashboard:vendor/jquery-ui/ui/minified/core.min.js'],
'jquery-ui-widget.js' => ['module' => 'dashboard:vendor/jquery-ui/ui/minified/widget.min.js'],
'jquery-ui-mouse.js' => ['module' => 'dashboard:vendor/jquery-ui/ui/minified/mouse.min.js'],
'jquery-ui-draggable.js' => ['module' => 'dashboard:vendor/jquery-ui/ui/minified/draggable.min.js'],
'jquery-ui-resizable.js' => ['module' => 'dashboard:vendor/jquery-ui/ui/minified/resizable.min.js'],
//'gridstack.js' => ['module' => 'dashboard:vendor/gridstack/dist/gridstack.min.js'],
'gridstack.js' => ['module' => 'dashboard:gridstack/gridstack.min.js'],
'daterangepicker.js' => ['theme' => 'vendor/admin-lte/plugins/daterangepicker/daterangepicker.js'],
], ],
/* /*
......
{ {
"name": "font-awesome", "name": "font-awesome",
"homepage": "https://github.com/FortAwesome/Font-Awesome", "description": "Font Awesome",
"version": "4.0.3", "version": "4.3.0",
"_release": "4.0.3", "keywords": [],
"homepage": "http://fontawesome.io",
"dependencies": {},
"devDependencies": {},
"license": [
"OFL-1.1",
"MIT",
"CC-BY-3.0"
],
"main": [
"./css/font-awesome.css",
"./fonts/*"
],
"ignore": [
"*/.*",
"*.json",
"src",
"*.yml",
"Gemfile",
"Gemfile.lock",
"*.md"
],
"_release": "4.3.0",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v4.0.3", "tag": "v4.3.0",
"commit": "dc23a94e16a8daa3cbb3c7fa34d63e2812637b8f" "commit": "e9665bad5b5b944da1095faf88209fabbfe725c1"
}, },
"_source": "git://github.com/FortAwesome/Font-Awesome.git", "_source": "git://github.com/FortAwesome/Font-Awesome.git",
"_target": "~4.0.3", "_target": ">= 4.2",
"_originalSource": "font-awesome" "_originalSource": "font-awesome"
} }
\ No newline at end of file
...@@ -30,3 +30,4 @@ src/website/settingslocal.py ...@@ -30,3 +30,4 @@ src/website/settingslocal.py
stunnel.log stunnel.log
.ruby-version .ruby-version
.bundle
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -3,10 +3,11 @@ ...@@ -3,10 +3,11 @@
.@{fa-css-prefix} { .@{fa-css-prefix} {
display: inline-block; display: inline-block;
font-family: FontAwesome; font: normal normal normal @fa-font-size-base/1 FontAwesome; // shortening font declaration
font-style: normal; font-size: inherit; // can't have font-size inherit on line above, so need to override
font-weight: normal; text-rendering: auto; // optimizelegibility throws things off #1094
line-height: 1;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
transform: translate(0, 0); // ensures no half-pixel rendering in firefox
} }
/*! /*!
* Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome * Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/ */
@import "variables"; @import "variables.less";
@import "mixins"; @import "mixins.less";
@import "path"; @import "path.less";
@import "core"; @import "core.less";
@import "larger"; @import "larger.less";
@import "fixed-width"; @import "fixed-width.less";
@import "list"; @import "list.less";
@import "bordered-pulled"; @import "bordered-pulled.less";
@import "spinning"; @import "animated.less";
@import "rotated-flipped"; @import "rotated-flipped.less";
@import "stacked"; @import "stacked.less";
@import "icons"; @import "icons.less";
...@@ -14,6 +14,6 @@ ...@@ -14,6 +14,6 @@
top: (2em / 14); top: (2em / 14);
text-align: center; text-align: center;
&.@{fa-css-prefix}-lg { &.@{fa-css-prefix}-lg {
left: -@fa-li-width + (4em / 14); left: (-@fa-li-width + (4em / 14));
} }
} }
// Mixins // Mixins
// -------------------------- // --------------------------
.fa-icon() {
display: inline-block;
font: normal normal normal @fa-font-size-base/1 FontAwesome; // shortening font declaration
font-size: inherit; // can't have font-size inherit on line above, so need to override
text-rendering: auto; // optimizelegibility throws things off #1094
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
transform: translate(0, 0); // ensures no half-pixel rendering in firefox
}
.fa-icon-rotate(@degrees, @rotation) { .fa-icon-rotate(@degrees, @rotation) {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation);
-webkit-transform: rotate(@degrees); -webkit-transform: rotate(@degrees);
-moz-transform: rotate(@degrees);
-ms-transform: rotate(@degrees); -ms-transform: rotate(@degrees);
-o-transform: rotate(@degrees);
transform: rotate(@degrees); transform: rotate(@degrees);
} }
.fa-icon-flip(@horiz, @vert, @rotation) { .fa-icon-flip(@horiz, @vert, @rotation) {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation, mirror=1); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation, mirror=1);
-webkit-transform: scale(@horiz, @vert); -webkit-transform: scale(@horiz, @vert);
-moz-transform: scale(@horiz, @vert);
-ms-transform: scale(@horiz, @vert); -ms-transform: scale(@horiz, @vert);
-o-transform: scale(@horiz, @vert);
transform: scale(@horiz, @vert); transform: scale(@horiz, @vert);
} }
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
font-family: 'FontAwesome'; font-family: 'FontAwesome';
src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}'); src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}');
src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'), src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'),
url('@{fa-font-path}/fontawesome-webfont.woff2?v=@{fa-version}') format('woff2'),
url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'), url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'),
url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'), url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'),
url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg'); url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg');
......
...@@ -7,3 +7,14 @@ ...@@ -7,3 +7,14 @@
.@{fa-css-prefix}-flip-horizontal { .fa-icon-flip(-1, 1, 0); } .@{fa-css-prefix}-flip-horizontal { .fa-icon-flip(-1, 1, 0); }
.@{fa-css-prefix}-flip-vertical { .fa-icon-flip(1, -1, 2); } .@{fa-css-prefix}-flip-vertical { .fa-icon-flip(1, -1, 2); }
// Hook for IE8-9
// -------------------------
:root .@{fa-css-prefix}-rotate-90,
:root .@{fa-css-prefix}-rotate-180,
:root .@{fa-css-prefix}-rotate-270,
:root .@{fa-css-prefix}-flip-horizontal,
:root .@{fa-css-prefix}-flip-vertical {
filter: none;
}
...@@ -3,10 +3,11 @@ ...@@ -3,10 +3,11 @@
.#{$fa-css-prefix} { .#{$fa-css-prefix} {
display: inline-block; display: inline-block;
font-family: FontAwesome; font: normal normal normal #{$fa-font-size-base}/1 FontAwesome; // shortening font declaration
font-style: normal; font-size: inherit; // can't have font-size inherit on line above, so need to override
font-weight: normal; text-rendering: auto; // optimizelegibility throws things off #1094
line-height: 1;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
transform: translate(0, 0); // ensures no half-pixel rendering in firefox
} }
// Mixins // Mixins
// -------------------------- // --------------------------
@mixin fa-icon() {
display: inline-block;
font: normal normal normal #{$fa-font-size-base}/1 FontAwesome; // shortening font declaration
font-size: inherit; // can't have font-size inherit on line above, so need to override
text-rendering: auto; // optimizelegibility throws things off #1094
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
transform: translate(0, 0); // ensures no half-pixel rendering in firefox
}
@mixin fa-icon-rotate($degrees, $rotation) { @mixin fa-icon-rotate($degrees, $rotation) {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=$rotation); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation});
-webkit-transform: rotate($degrees); -webkit-transform: rotate($degrees);
-moz-transform: rotate($degrees);
-ms-transform: rotate($degrees); -ms-transform: rotate($degrees);
-o-transform: rotate($degrees);
transform: rotate($degrees); transform: rotate($degrees);
} }
@mixin fa-icon-flip($horiz, $vert, $rotation) { @mixin fa-icon-flip($horiz, $vert, $rotation) {
filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=$rotation); filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation});
-webkit-transform: scale($horiz, $vert); -webkit-transform: scale($horiz, $vert);
-moz-transform: scale($horiz, $vert);
-ms-transform: scale($horiz, $vert); -ms-transform: scale($horiz, $vert);
-o-transform: scale($horiz, $vert);
transform: scale($horiz, $vert); transform: scale($horiz, $vert);
} }
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
font-family: 'FontAwesome'; font-family: 'FontAwesome';
src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}'); src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}');
src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'), src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'),
url('#{$fa-font-path}/fontawesome-webfont.woff2?v=#{$fa-version}') format('woff2'),
url('#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}') format('woff'), url('#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}') format('woff'),
url('#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'), url('#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'),
url('#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular') format('svg'); url('#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular') format('svg');
//src: url('#{$fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts // src: url('#{$fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
...@@ -7,3 +7,14 @@ ...@@ -7,3 +7,14 @@
.#{$fa-css-prefix}-flip-horizontal { @include fa-icon-flip(-1, 1, 0); } .#{$fa-css-prefix}-flip-horizontal { @include fa-icon-flip(-1, 1, 0); }
.#{$fa-css-prefix}-flip-vertical { @include fa-icon-flip(1, -1, 2); } .#{$fa-css-prefix}-flip-vertical { @include fa-icon-flip(1, -1, 2); }
// Hook for IE8-9
// -------------------------
:root .#{$fa-css-prefix}-rotate-90,
:root .#{$fa-css-prefix}-rotate-180,
:root .#{$fa-css-prefix}-rotate-270,
:root .#{$fa-css-prefix}-flip-horizontal,
:root .#{$fa-css-prefix}-flip-vertical {
filter: none;
}
/*! /*!
* Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome * Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/ */
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
@import "fixed-width"; @import "fixed-width";
@import "list"; @import "list";
@import "bordered-pulled"; @import "bordered-pulled";
@import "spinning"; @import "animated";
@import "rotated-flipped"; @import "rotated-flipped";
@import "stacked"; @import "stacked";
@import "icons"; @import "icons";
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment