Gitlab CSE Unil

Commit 8906dafb authored by M. Chardon's avatar M. Chardon
Browse files

concat lib css et js

correction import
parent cf1fc902
...@@ -122,7 +122,7 @@ module.exports = function(grunt) { ...@@ -122,7 +122,7 @@ module.exports = function(grunt) {
files: [ files: [
{ {
expand: true, expand: true,
cwd: "lib/jujug42-bootstrap-colorpicker/dist/img/", cwd: "lib/bootstrap-colorpicker/dist/img/",
src: ["**"], src: ["**"],
dest: '../img/' dest: '../img/'
}, },
...@@ -212,9 +212,10 @@ module.exports = function(grunt) { ...@@ -212,9 +212,10 @@ module.exports = function(grunt) {
files: { files: {
"../css/libs.css": [ "../css/libs.css": [
"lib/jquery-file-upload/css/jquery.fileupload.css", "lib/jquery-file-upload/css/jquery.fileupload.css",
"lib/jujug42-bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css", "lib/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css",
"lib/bootstrap-spinedit/css/bootstrap-spinedit.css", "lib/bootstrap-spinedit/css/bootstrap-spinedit.css",
"lib/whhg-font/css/whhg.css" "lib/whhg-font/css/whhg.css",
"lib/select2-bootstrap/select2-bootstrap.css"
] ]
} }
} }
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
"jquery.hotkeys": "git://github.com/jeresig/jquery.hotkeys.git#~0.2.0", "jquery.hotkeys": "git://github.com/jeresig/jquery.hotkeys.git#~0.2.0",
"sortablejs": "~1.6.0", "sortablejs": "~1.6.0",
"select2": "~4.0", "select2": "~4.0",
"select2-bootstrap": "~1.3.0",
"zeroclipboard": "~2.3.0", "zeroclipboard": "~2.3.0",
"blueimp-file-upload": "~9.20.0" "blueimp-file-upload": "~9.20.0"
} }
......
...@@ -36,11 +36,11 @@ requirejs.config({ ...@@ -36,11 +36,11 @@ requirejs.config({
location: '../_src/lib/paper/dist', location: '../_src/lib/paper/dist',
main: 'paper-core' main: 'paper-core'
}/*, }/*,
{ {
name: 'typeahead', name: 'jquery.typeahead',
location: '../_src/lib/typeahead.js/dist', location: '../_src/lib/typeahead.js/dist',
main: 'typeahead.jquery' main: 'typeahead.jquery'
}*/], }*/],
paths: { paths: {
adim: '../_src/adim', adim: '../_src/adim',
tools: '../_src/adim/tools', tools: '../_src/adim/tools',
...@@ -54,7 +54,7 @@ requirejs.config({ ...@@ -54,7 +54,7 @@ requirejs.config({
underscore: '../_src/lib/underscore/underscore-min', underscore: '../_src/lib/underscore/underscore-min',
paper: '../_src/lib/paper/dist/paper-core', paper: '../_src/lib/paper/dist/paper-core',
signals: '../_src/lib/signals/dist/signals.min', signals: '../_src/lib/signals/dist/signals.min',
FileSaver: '../_src/lib/FileSaver/FileSaver', FileSaver: '../_src/lib/FileSaver/FileSaver.min',
canvasToBlob: '../_src/lib/blueimp-canvas-to-blob/js/canvas-to-blob.min', canvasToBlob: '../_src/lib/blueimp-canvas-to-blob/js/canvas-to-blob.min',
zeroclipboard: '../_src/lib/zeroclipboard/dist/ZeroClipboard.min', zeroclipboard: '../_src/lib/zeroclipboard/dist/ZeroClipboard.min',
bloodhound: '../_src/lib/typeahead.js/dist/bloodhound', bloodhound: '../_src/lib/typeahead.js/dist/bloodhound',
...@@ -70,10 +70,10 @@ requirejs.config({ ...@@ -70,10 +70,10 @@ requirejs.config({
'jquery.fileupload-proc': "../_src/lib/jquery-file-upload/js/jquery.fileupload-process", 'jquery.fileupload-proc': "../_src/lib/jquery-file-upload/js/jquery.fileupload-process",
'jquery.mousewheel': "../_src/lib/jquery-mousewheel/jquery.mousewheel.min", 'jquery.mousewheel': "../_src/lib/jquery-mousewheel/jquery.mousewheel.min",
'jquery.autoGrowInput': "../_src/lib/jquery.autoGrowInput/jquery.autoGrowInput", 'jquery.autoGrowInput': "../_src/lib/jquery.autoGrowInput/jquery.autoGrowInput",
// 'jquery.typeahead': "../_src/lib/typeahead.js/dist/typeahead.jquery.min", // 'jquery.typeahead': "../_src/lib/typeahead.js/dist/typeahead.jquery.min",
'jquery.hotkeys': "../_src/lib/jquery.hotkeys/jquery.hotkeys.min", 'jquery.hotkeys': "../_src/lib/jquery.hotkeys/jquery.hotkeys.min",
'jquery.select2': "../_src/lib/select2/dist/js/select2.full", 'jquery.select2': "../_src/lib/select2/dist/js/select2.full",
'jquery-migrate': '//code.jquery.com/jquery-migrate-3.0.0', //'jquery-migrate': '//code.jquery.com/jquery-migrate-3.0.0',
'jquery.bootstrap': "../_src/lib/bootstrap/dist/js/bootstrap.min", 'jquery.bootstrap': "../_src/lib/bootstrap/dist/js/bootstrap.min",
'bootstrap.colorpicker': "../_src/lib/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.min", 'bootstrap.colorpicker': "../_src/lib/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.min",
...@@ -95,7 +95,7 @@ requirejs.config({ ...@@ -95,7 +95,7 @@ requirejs.config({
//'jquery.typeahead': { deps: ["jquery"]}, //'jquery.typeahead': { deps: ["jquery"]},
'jquery.hotkeys': { deps: ["jquery"]}, 'jquery.hotkeys': { deps: ["jquery"]},
'jquery.bootstrap': { deps: ["jquery"] }, 'jquery.bootstrap': { deps: ["jquery"] },
'jquery-migrate': { deps: ['jquery'], exports: 'jQuery' }, //'jquery-migrate': { deps: ['jquery'], exports: 'jQuery' },
'bootstrap.colorpicker': { deps: ["jquery.bootstrap"] }, 'bootstrap.colorpicker': { deps: ["jquery.bootstrap"] },
'bootstrap.slider': { deps: ["jquery.bootstrap"] }, 'bootstrap.slider': { deps: ["jquery.bootstrap"] },
'bootstrap.spinedit': { deps: ["jquery.bootstrap"] }, 'bootstrap.spinedit': { deps: ["jquery.bootstrap"] },
......
...@@ -80,8 +80,8 @@ ...@@ -80,8 +80,8 @@
} }
/*! /*!
* Bootstrap Colorpicker * Bootstrap Colorpicker v2.5.1
* http://mjolnic.github.io/bootstrap-colorpicker/ * https://itsjavi.com/bootstrap-colorpicker/
* *
* Originally written by (c) 2012 Stefan Petre * Originally written by (c) 2012 Stefan Petre
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0
...@@ -89,29 +89,29 @@ ...@@ -89,29 +89,29 @@
* *
*/ */
.colorpicker-saturation { .colorpicker-saturation {
float: left;
width: 100px; width: 100px;
height: 100px; height: 100px;
cursor: crosshair;
background-image: url("../img/bootstrap-colorpicker/saturation.png"); background-image: url("../img/bootstrap-colorpicker/saturation.png");
cursor: crosshair;
float: left;
} }
.colorpicker-saturation i { .colorpicker-saturation i {
position: absolute;
top: 0;
left: 0;
display: block; display: block;
width: 5px;
height: 5px; height: 5px;
margin: -4px 0 0 -4px; width: 5px;
border: 1px solid #000; border: 1px solid #000;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
-moz-border-radius: 5px; -moz-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
position: absolute;
top: 0;
left: 0;
margin: -4px 0 0 -4px;
} }
.colorpicker-saturation i b { .colorpicker-saturation i b {
display: block; display: block;
width: 5px;
height: 5px; height: 5px;
width: 5px;
border: 1px solid #fff; border: 1px solid #fff;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
-moz-border-radius: 5px; -moz-border-radius: 5px;
...@@ -119,73 +119,75 @@ ...@@ -119,73 +119,75 @@
} }
.colorpicker-hue, .colorpicker-hue,
.colorpicker-alpha { .colorpicker-alpha {
float: left;
width: 15px; width: 15px;
height: 100px; height: 100px;
margin-bottom: 4px; float: left;
margin-left: 4px;
cursor: row-resize; cursor: row-resize;
margin-left: 4px;
margin-bottom: 4px;
} }
.colorpicker-hue i, .colorpicker-hue i,
.colorpicker-alpha i { .colorpicker-alpha i {
display: block;
height: 1px;
background: #000;
border-top: 1px solid #fff;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
display: block;
width: 100%; width: 100%;
height: 1px;
margin-top: -1px; margin-top: -1px;
background: #000;
border-top: 1px solid #fff;
} }
.colorpicker-hue { .colorpicker-hue {
background-image: url("../img/bootstrap-colorpicker/hue.png"); background-image: url("../img/bootstrap-colorpicker/hue.png");
} }
.colorpicker-alpha { .colorpicker-alpha {
display: none;
background-image: url("../img/bootstrap-colorpicker/alpha.png"); background-image: url("../img/bootstrap-colorpicker/alpha.png");
display: none;
}
.colorpicker-saturation,
.colorpicker-hue,
.colorpicker-alpha {
background-size: contain;
} }
.colorpicker { .colorpicker {
top: 0;
left: 0;
z-index: 2500;
min-width: 130px;
padding: 4px; padding: 4px;
min-width: 130px;
margin-top: 1px; margin-top: 1px;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
*zoom: 1; z-index: 2500;
} }
.colorpicker:before, .colorpicker:before,
.colorpicker:after { .colorpicker:after {
display: table; display: table;
line-height: 0;
content: ""; content: "";
line-height: 0;
} }
.colorpicker:after { .colorpicker:after {
clear: both; clear: both;
} }
.colorpicker:before { .colorpicker:before {
position: absolute; content: '';
top: -7px;
left: 6px;
display: inline-block; display: inline-block;
border-left: 7px solid transparent;
border-right: 7px solid transparent; border-right: 7px solid transparent;
border-bottom: 7px solid #ccc; border-bottom: 7px solid #ccc;
border-left: 7px solid transparent;
border-bottom-color: rgba(0, 0, 0, 0.2); border-bottom-color: rgba(0, 0, 0, 0.2);
content: ''; position: absolute;
top: -7px;
left: 6px;
} }
.colorpicker:after { .colorpicker:after {
position: absolute; content: '';
top: -6px;
left: 7px;
display: inline-block; display: inline-block;
border-left: 6px solid transparent;
border-right: 6px solid transparent; border-right: 6px solid transparent;
border-bottom: 6px solid #ffffff; border-bottom: 6px solid #ffffff;
border-left: 6px solid transparent; position: absolute;
content: ''; top: -6px;
left: 7px;
} }
.colorpicker div { .colorpicker div {
position: relative; position: relative;
...@@ -206,24 +208,39 @@ ...@@ -206,24 +208,39 @@
.colorpicker-color div { .colorpicker-color div {
height: 10px; height: 10px;
} }
.colorpicker-selectors {
display: none;
height: 10px;
margin-top: 5px;
clear: both;
}
.colorpicker-selectors i {
cursor: pointer;
float: left;
height: 10px;
width: 10px;
}
.colorpicker-selectors i + i {
margin-left: 3px;
}
.colorpicker-element .input-group-addon i, .colorpicker-element .input-group-addon i,
.colorpicker-element .add-on i { .colorpicker-element .add-on i {
display: inline-block; display: inline-block;
width: 16px; cursor: pointer;
height: 16px; height: 16px;
vertical-align: text-top; vertical-align: text-top;
cursor: pointer; width: 16px;
} }
.colorpicker.colorpicker-inline { .colorpicker.colorpicker-inline {
position: relative; position: relative;
z-index: auto;
display: inline-block; display: inline-block;
float: none; float: none;
z-index: auto;
} }
.colorpicker.colorpicker-horizontal { .colorpicker.colorpicker-horizontal {
width: 110px; width: 110px;
height: auto;
min-width: 110px; min-width: 110px;
height: auto;
} }
.colorpicker.colorpicker-horizontal .colorpicker-saturation { .colorpicker.colorpicker-horizontal .colorpicker-saturation {
margin-bottom: 4px; margin-bottom: 4px;
...@@ -233,24 +250,24 @@ ...@@ -233,24 +250,24 @@
} }
.colorpicker.colorpicker-horizontal .colorpicker-hue, .colorpicker.colorpicker-horizontal .colorpicker-hue,
.colorpicker.colorpicker-horizontal .colorpicker-alpha { .colorpicker.colorpicker-horizontal .colorpicker-alpha {
float: left;
width: 100px; width: 100px;
height: 15px; height: 15px;
margin-bottom: 4px; float: left;
margin-left: 0;
cursor: col-resize; cursor: col-resize;
margin-left: 0px;
margin-bottom: 4px;
} }
.colorpicker.colorpicker-horizontal .colorpicker-hue i, .colorpicker.colorpicker-horizontal .colorpicker-hue i,
.colorpicker.colorpicker-horizontal .colorpicker-alpha i { .colorpicker.colorpicker-horizontal .colorpicker-alpha i {
display: block;
height: 15px;
background: #ffffff;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
display: block;
width: 1px; width: 1px;
height: 15px;
margin-top: 0;
background: #ffffff;
border: none; border: none;
margin-top: 0px;
} }
.colorpicker.colorpicker-horizontal .colorpicker-hue { .colorpicker.colorpicker-horizontal .colorpicker-hue {
background-image: url("../img/bootstrap-colorpicker/hue-horizontal.png"); background-image: url("../img/bootstrap-colorpicker/hue-horizontal.png");
...@@ -258,15 +275,40 @@ ...@@ -258,15 +275,40 @@
.colorpicker.colorpicker-horizontal .colorpicker-alpha { .colorpicker.colorpicker-horizontal .colorpicker-alpha {
background-image: url("../img/bootstrap-colorpicker/alpha-horizontal.png"); background-image: url("../img/bootstrap-colorpicker/alpha-horizontal.png");
} }
.colorpicker.colorpicker-hidden { .colorpicker-right:before {
display: none; left: auto;
right: 6px;
}
.colorpicker-right:after {
left: auto;
right: 7px;
} }
.colorpicker.colorpicker-visible { .colorpicker-no-arrow:before {
border-right: 0;
border-left: 0;
}
.colorpicker-no-arrow:after {
border-right: 0;
border-left: 0;
}
.colorpicker.colorpicker-visible,
.colorpicker-alpha.colorpicker-visible,
.colorpicker-saturation.colorpicker-visible,
.colorpicker-hue.colorpicker-visible,
.colorpicker-selectors.colorpicker-visible {
display: block; display: block;
} }
.colorpicker.colorpicker-hidden,
.colorpicker-alpha.colorpicker-hidden,
.colorpicker-saturation.colorpicker-hidden,
.colorpicker-hue.colorpicker-hidden,
.colorpicker-selectors.colorpicker-hidden {
display: none;
}
.colorpicker-inline.colorpicker-visible { .colorpicker-inline.colorpicker-visible {
display: inline-block; display: inline-block;
} }
/*# sourceMappingURL=bootstrap-colorpicker.css.map */
span.spinedit .glyphicon-chevron-down { span.spinedit .glyphicon-chevron-down {
position: relative; position: relative;
...@@ -6550,3 +6592,416 @@ span.input-group-addon.spinedit .glyphicon-chevron-down { ...@@ -6550,3 +6592,416 @@ span.input-group-addon.spinedit .glyphicon-chevron-down {
.icon-fontstencil:before { .icon-fontstencil:before {
content: '\f7f3'; content: '\f7f3';
} }
/**
* Select2 Bootstrap CSS
* Compatible with Select2 3.3.2, 3.4.1, 3.4.2 and Twitter Bootstrap 3.0.0
* MIT License
*/
/**
* Reset Bootstrap 3 .form-control styles which - if applied to the
* original <select>-element the Select2-plugin may be run against -
* are copied to the .select2-container.
*
* 1. Overwrite .select2-container's original display:inline-block
* with Bootstrap 3's default for .form-control, display:block;
* courtesy of @juristr (@see https://github.com/fk/select2-bootstrap-css/pull/1)
*/
.select2-container.form-control {
background: transparent;
border: none;
display: block;
/* 1 */
margin: 0;
padding: 0;
}
/**
* Adjust Select2 inputs to fit Bootstrap 3 default .form-control appearance.
*/
.select2-container .select2-choices .select2-search-field input,
.select2-container .select2-choice,
.select2-container .select2-choices {
background: none;
padding: 0;
border-color: #cccccc;
border-radius: 4px;
color: #555555;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
background-color: white;
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.select2-search input {
border-color: #cccccc;
border-radius: 4px;
color: #555555;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
background-color: white;
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.select2-container .select2-choices .select2-search-field input {
-webkit-box-shadow: none;
box-shadow: none;
}
/**
* Adjust Select2 input heights to match the Bootstrap default.
*/
.select2-container .select2-choice {
height: 34px;
line-height: 1.42857;
}
/**
* Address Multi Select2's height which - depending on how many elements have been selected -
* may grown higher than their initial size.
*/
.select2-container.select2-container-multi.form-control {
height: auto;
}
/**
* Address Bootstrap 3 control sizing classes
* @see http://getbootstrap.com/css/#forms-control-sizes
*/
.select2-container.input-sm .select2-choice,
.input-group-sm .select2-container .select2-choice {
height: 30px;
line-height: 1.5;
border-radius: 3px;
}
.select2-container.input-lg .select2-choice,
.input-group-lg .select2-container .select2-choice {
height: 45px;
line-height: 1.33;
border-radius: 6px;
}
.select2-container-multi .select2-choices .select2-search-field input {
height: 32px;
}
.select2-container-multi.input-sm .select2-choices .select2-search-field input,
.input-group-sm .select2-container-multi .select2-choices .select2-search-field input {
height: 28px;
}
.select2-container-multi.input-lg .select2-choices .select2-search-field input,
.input-group-lg .select2-container-multi .select2-choices .select2-search-field input {
height: 43px;
}
/**
* Adjust height and line-height for .select2-search-field amd multi-select Select2 widgets.
*
* 1. Class repetition to address missing .select2-chosen in Select2 < 3.3.2.
*/
.select2-container-multi .select2-choices .select2-search-field input {
margin: 0;
}
.select2-chosen,
.select2-choice > span:first-child,
.select2-container .select2-choices .select2-search-field input {
padding: 6px 12px;
}
.input-sm .select2-chosen,
.input-group-sm .select2-chosen,
.input-sm .select2-choice > span:first-child,
.input-group-sm .select2-choice > span:first-child,
.input-sm .select2-choices .select2-search-field input,
.input-group-sm .select2-choices .select2-search-field input {
padding: 5px 10px;
}
.input-lg .select2-chosen,
.input-group-lg .select2-chosen,
.input-lg .select2-choice > span:first-child,
.input-group-lg .select2-choice > span:first-child,
.input-lg .select2-choices .select2-search-field input,
.input-group-lg .select2-choices .select2-search-field input {
padding: 10px 16px;
}
.select2-container-multi .select2-choices .select2-search-choice {
margin-top: 5px;