diff --git a/trunk/src/AppBundle/Resources/assets/.DS_Store b/trunk/src/AppBundle/Resources/assets/.DS_Store index 18058820..bdecf2b8 100644 Binary files a/trunk/src/AppBundle/Resources/assets/.DS_Store and b/trunk/src/AppBundle/Resources/assets/.DS_Store differ diff --git a/trunk/src/AppBundle/Resources/assets/less/config.codekit3 b/trunk/src/AppBundle/Resources/assets/less/config.codekit3 index fdf91205..7685b60e 100644 --- a/trunk/src/AppBundle/Resources/assets/less/config.codekit3 +++ b/trunk/src/AppBundle/Resources/assets/less/config.codekit3 @@ -7,7 +7,7 @@ "uuidString": "6A3496EF-3E8F-4635-B4D3-CCBE002AF7B5" } ], -"creatorBuild": "25568", +"creatorBuild": "26330", "files": { "\/css\/tripsfont.css": { "aP": 1, @@ -444,6 +444,7 @@ "animateCSSInjections": 1, "autoBuildNewItems": 1, "autoprefixerBrowserString": "> 1%, last 2 versions, Firefox ESR, Opera 12.1", + "autoprefixerEnableIEGrid": 0, "babelAuxiliaryCommentAfter": "", "babelAuxiliaryCommentBefore": "", "babelConfigFileHandlingType": 0, @@ -840,6 +841,10 @@ "active": 0, "optionString": "{'setWithoutGet': true, 'getWithoutSet': false}" }, + "array-bracket-newline": { + "active": 0, + "optionString": "{'multiline': true, 'minItems': null}" + }, "array-bracket-spacing": { "active": 0, "optionString": "'never', {'singleValue': false, 'objectsInArrays': false, 'arraysInArrays': false}" @@ -848,6 +853,10 @@ "active": 0, "optionString": "" }, + "array-element-newline": { + "active": 0, + "optionString": "'always'" + }, "arrow-body-style": { "active": 0, "optionString": "'as-needed', {'requireReturnForObjectLiteral': false}" @@ -944,6 +953,10 @@ "active": 0, "optionString": "'always', {'null': 'always'}" }, + "for-direction": { + "active": 0, + "optionString": "" + }, "func-call-spacing": { "active": 0, "optionString": "'never'" @@ -960,10 +973,18 @@ "active": 0, "optionString": "'expression'" }, + "function-paren-newline": { + "active": 0, + "optionString": "'multiline'" + }, "generator-star-spacing": { "active": 0, "optionString": "{'before': true, 'after': false}" }, + "getter-return": { + "active": 0, + "optionString": "{'allowImplicit': false}" + }, "global-require": { "active": 0, "optionString": "" @@ -988,6 +1009,10 @@ "active": 0, "optionString": "'^[a-z]+([A-Z][a-z]+)*$', {'properties': false, 'onlyDeclarations': true}" }, + "implicit-arrow-linebreak": { + "active": 0, + "optionString": "'beside'" + }, "indent": { "active": 0, "optionString": "4, {'SwitchCase': 0, 'VariableDeclarator': 1, 'outerIIFEBody': 1, }" @@ -1020,9 +1045,9 @@ "active": 0, "optionString": "{'beforeBlockComment': true}" }, - "lines-around-directive": { + "lines-between-class-members": { "active": 0, - "optionString": "{'before': 'always', 'after': 'always'}" + "optionString": "'always', {exceptAfterSingleLine: false}" }, "max-depth": { "active": 0, @@ -1052,6 +1077,10 @@ "active": 0, "optionString": "{'max': 1}" }, + "multiline-comment-style": { + "active": 0, + "optionString": "'starred-block'" + }, "multiline-ternary": { "active": 0, "optionString": "'always'" @@ -1064,14 +1093,6 @@ "active": 0, "optionString": "" }, - "newline-after-var": { - "active": 0, - "optionString": "'always'" - }, - "newline-before-return": { - "active": 0, - "optionString": "" - }, "newline-per-chained-call": { "active": 0, "optionString": "{'ignoreChainWithDepth': 2}" @@ -1092,6 +1113,10 @@ "active": 0, "optionString": "{'allow': ['~'], 'int32Hint': true}" }, + "no-buffer-constructor": { + "active": 0, + "optionString": "" + }, "no-caller": { "active": 0, "optionString": "" @@ -1108,6 +1133,10 @@ "active": 1, "optionString": "" }, + "no-compare-neg-zero": { + "active": 0, + "optionString": "" + }, "no-cond-assign": { "active": 1, "optionString": "'except-parens'" @@ -1392,6 +1421,10 @@ "active": 0, "optionString": "" }, + "no-prototype-builtins": { + "active": 0, + "optionString": "" + }, "no-redeclare": { "active": 1, "optionString": "{'builtinGlobals': false}" @@ -1588,6 +1621,10 @@ "active": 0, "optionString": "" }, + "nonblock-statement-body-position": { + "active": 0, + "optionString": "'beside'" + }, "object-curly-newline": { "active": 0, "optionString": "{'ObjectExpression': {'multiline': true}, 'ObjectPattern': {'multiline': true}}" @@ -1624,6 +1661,10 @@ "active": 0, "optionString": "{'blocks': 'always', 'switches': 'always', 'classes': 'always'}" }, + "padding-line-between-statements": { + "active": 0, + "optionString": "{blankLine: 'always', prev:'*', next:'return'}" + }, "prefer-arrow-callback": { "active": 0, "optionString": "" @@ -1692,6 +1733,10 @@ "active": 0, "optionString": "{'before': false, 'after': true}" }, + "semi-style": { + "active": 0, + "optionString": "'last'" + }, "sort-imports": { "active": 0, "optionString": "{'ignoreCase': false, 'ignoreMemberSort': true, 'memberSyntaxSortOrder': ['none', 'all', 'multiple', 'single']}" @@ -1732,6 +1777,10 @@ "active": 0, "optionString": "'safe'" }, + "switch-colon-spacing": { + "active": 0, + "optionString": "{'after': true, 'before': false}" + }, "symbol-description": { "active": 0, "optionString": "" @@ -2144,7 +2193,8 @@ "createSourceMap": 0, "minifyOutput": 1, "outputStyle": 0, - "syntaxCheckerStyle": 1 + "syntaxCheckerStyle": 1, + "transpilerStyle": 1 }, "languageDefaultsCSS": { "autoOutputAction": 0, @@ -2177,6 +2227,7 @@ "noEscapeInAttributes": 0, "outputFormat": 2, "outputStyle": 0, + "shouldRunCacheBuster": 0, "useCDATA": 0, "useDoubleQuotes": 0, "useUnixNewlines": 0 @@ -2187,7 +2238,8 @@ "autoOutputPathRelativePath": "", "autoOutputPathReplace1": "", "autoOutputPathReplace2": "", - "autoOutputPathStyle": 0 + "autoOutputPathStyle": 0, + "quality": 100 }, "languageDefaultsJS": { "autoOutputAction": 0, @@ -2211,21 +2263,14 @@ "orderOutput": 0, "outputStyle": 1 }, - "languageDefaultsJSX": { - "autoOutputAction": 0, - "autoOutputPathFilenamePattern": "*.js", - "autoOutputPathRelativePath": "", - "autoOutputPathReplace1": "jsx", - "autoOutputPathReplace2": "js", - "autoOutputPathStyle": 0 - }, "languageDefaultsKIT": { "autoOutputAction": 0, "autoOutputPathFilenamePattern": "*.html", "autoOutputPathRelativePath": "", "autoOutputPathReplace1": "", "autoOutputPathReplace2": "", - "autoOutputPathStyle": 0 + "autoOutputPathStyle": 0, + "shouldRunCacheBuster": 0 }, "languageDefaultsLESS": { "allowInsecureImports": 0, @@ -2257,13 +2302,13 @@ "enableFootnotes": 1, "enableLabels": 1, "enableSmartQuotes": 1, - "escapeLineBreaks": 0, "maskEmailAddresses": 1, "outputFormat": 0, "outputStyle": 0, "parseMetadata": 1, "processHTML": 0, "randomFootnoteNumbers": 0, + "shouldRunCacheBuster": 0, "useCompatibilityMode": 0 }, "languageDefaultsOTHER": { @@ -2272,7 +2317,8 @@ "autoOutputPathRelativePath": "", "autoOutputPathReplace1": "", "autoOutputPathReplace2": "", - "autoOutputPathStyle": 0 + "autoOutputPathStyle": 0, + "shouldRunCacheBuster": 0 }, "languageDefaultsPNG": { "autoOutputAction": 0, @@ -2280,7 +2326,9 @@ "autoOutputPathRelativePath": "", "autoOutputPathReplace1": "", "autoOutputPathReplace2": "", - "autoOutputPathStyle": 0 + "autoOutputPathStyle": 0, + "optimizerType": 1, + "quality": 100 }, "languageDefaultsPUG": { "autoOutputAction": 0, @@ -2290,7 +2338,8 @@ "autoOutputPathReplace2": "", "autoOutputPathStyle": 0, "compileDebug": 1, - "outputStyle": 0 + "outputStyle": 0, + "shouldRunCacheBuster": 0 }, "languageDefaultsSASS": { "autoOutputAction": 0, @@ -2318,7 +2367,8 @@ "logicless": 0, "outputFormat": 0, "outputStyle": 1, - "railsCompatible": 0 + "railsCompatible": 0, + "shouldRunCacheBuster": 0 }, "languageDefaultsSTYLUS": { "autoOutputAction": 0, @@ -2365,9 +2415,11 @@ }, "languageDefaultsUserDefined": [ ], + "overrideExternalServerCSS": 0, "previewPathAddition": "", "skippedFoldersString": "log, _logs, logs, _cache, cache, \/storage\/framework\/sessions, node_modules", "sourceFolderName": "source", + "susyVersion": 3, "uglifyDefinesString": "", "uglifyFlags2": { "ascii-only": {