Merge branch 'temp8' into temp8-fixme-get-all-entities-with-postfilter
# Conflicts: # src/Umbraco.Web/Editors/EntityController.cs
This commit is contained in:
Shannon
@@ -141,7 +141,8 @@ gulp.task('dependencies', function () {
|
||||
"name": "flatpickr",
|
||||
"src": [
|
||||
"./node_modules/flatpickr/dist/flatpickr.js",
|
||||
"./node_modules/flatpickr/dist/flatpickr.css"
|
||||
"./node_modules/flatpickr/dist/flatpickr.css",
|
||||
"./node_modules/flatpickr/dist/l10n/*.js"
|
||||
],
|
||||
"base": "./node_modules/flatpickr/dist"
|
||||
},
|
||||
|
||||
@@ -239,7 +239,7 @@ textarea {
|
||||
}
|
||||
|
||||
// Radios and checkboxes on same line
|
||||
// TODO v3: Convert .inline to .control-inline
|
||||
// TODO: v3: Convert .inline to .control-inline
|
||||
.radio.inline,
|
||||
.checkbox.inline {
|
||||
display: inline-block;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
//TODO: WE NEED TO CONVERT ALL OF THESE METHODS TO PROXY TO OUR APPLICATION SINCE MANY CUSTOM APPS USE THIS!
|
||||
// TODO: WE NEED TO CONVERT ALL OF THESE METHODS TO PROXY TO OUR APPLICATION SINCE MANY CUSTOM APPS USE THIS!
|
||||
|
||||
Umbraco.Sys.registerNamespace("Umbraco.Application");
|
||||
|
||||
|
||||
+48
-48
@@ -937,7 +937,7 @@
|
||||
},
|
||||
"ansi-colors": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "http://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
|
||||
"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
|
||||
"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
@@ -955,7 +955,7 @@
|
||||
},
|
||||
"ansi-escapes": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
|
||||
"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
|
||||
"integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
|
||||
"dev": true
|
||||
},
|
||||
@@ -1170,7 +1170,7 @@
|
||||
"array-slice": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
|
||||
"integrity": "sha1-42jqFfibxwaff/uJrsOmx9SsItQ=",
|
||||
"integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
|
||||
"dev": true
|
||||
},
|
||||
"array-sort": {
|
||||
@@ -1216,7 +1216,7 @@
|
||||
"arraybuffer.slice": {
|
||||
"version": "0.0.7",
|
||||
"resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
|
||||
"integrity": "sha1-O7xCdd1YTMGxCAm4nU6LY6aednU=",
|
||||
"integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
|
||||
"dev": true
|
||||
},
|
||||
"asap": {
|
||||
@@ -1269,7 +1269,7 @@
|
||||
"async-limiter": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
|
||||
"integrity": "sha1-ePrtjD0HSrgfIrTphdeehzj3IPg=",
|
||||
"integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
|
||||
"dev": true
|
||||
},
|
||||
"asynckit": {
|
||||
@@ -2379,7 +2379,7 @@
|
||||
},
|
||||
"string_decoder": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
|
||||
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
|
||||
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
@@ -2459,7 +2459,7 @@
|
||||
"content-type": {
|
||||
"version": "1.0.4",
|
||||
"resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
|
||||
"integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=",
|
||||
"integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
|
||||
"dev": true
|
||||
},
|
||||
"continuable-cache": {
|
||||
@@ -2502,7 +2502,7 @@
|
||||
"core-js": {
|
||||
"version": "2.5.7",
|
||||
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
|
||||
"integrity": "sha1-+XJgj/DOrWi4QaFqky0LGDeRgU4=",
|
||||
"integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==",
|
||||
"dev": true
|
||||
},
|
||||
"core-util-is": {
|
||||
@@ -3425,7 +3425,7 @@
|
||||
"doctrine": {
|
||||
"version": "2.1.0",
|
||||
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
|
||||
"integrity": "sha1-XNAfwQFiG0LEzX9dGmYkNxbT850=",
|
||||
"integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"esutils": "^2.0.2"
|
||||
@@ -3953,7 +3953,7 @@
|
||||
"debug": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
|
||||
"integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
|
||||
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"ms": "2.0.0"
|
||||
@@ -3989,7 +3989,7 @@
|
||||
"debug": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
|
||||
"integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
|
||||
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"ms": "2.0.0"
|
||||
@@ -4153,7 +4153,7 @@
|
||||
"source-map": {
|
||||
"version": "0.6.1",
|
||||
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
|
||||
"integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
|
||||
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
|
||||
"dev": true,
|
||||
"optional": true
|
||||
}
|
||||
@@ -4248,7 +4248,7 @@
|
||||
"eslint-scope": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz",
|
||||
"integrity": "sha1-UL8wcekzi83EMzF5Sgy1M/ATYXI=",
|
||||
"integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"esrecurse": "^4.1.0",
|
||||
@@ -4258,13 +4258,13 @@
|
||||
"eslint-utils": {
|
||||
"version": "1.3.1",
|
||||
"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
|
||||
"integrity": "sha1-moUbqJ7nxGA0b5fPiTnHKYgn5RI=",
|
||||
"integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
|
||||
"dev": true
|
||||
},
|
||||
"eslint-visitor-keys": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
|
||||
"integrity": "sha1-PzGA+y4pEBdxastMnW1bXDSmqB0=",
|
||||
"integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
|
||||
"dev": true
|
||||
},
|
||||
"espree": {
|
||||
@@ -4287,7 +4287,7 @@
|
||||
"esquery": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
|
||||
"integrity": "sha1-QGxRZYsfWZGl+bYrHcJbAOPlxwg=",
|
||||
"integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"estraverse": "^4.0.0"
|
||||
@@ -4296,7 +4296,7 @@
|
||||
"esrecurse": {
|
||||
"version": "4.2.1",
|
||||
"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
|
||||
"integrity": "sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8=",
|
||||
"integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"estraverse": "^4.1.0"
|
||||
@@ -4356,7 +4356,7 @@
|
||||
"eventemitter3": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
|
||||
"integrity": "sha1-CQtNbNvWRe0Qv3UNS1QHlC17oWM=",
|
||||
"integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==",
|
||||
"dev": true
|
||||
},
|
||||
"exec-buffer": {
|
||||
@@ -4571,7 +4571,7 @@
|
||||
"fill-range": {
|
||||
"version": "2.2.4",
|
||||
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
|
||||
"integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
|
||||
"integrity": "sha1-6x53OrsFbc2N8r/favWbizqTZWU=",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"is-number": "^2.1.0",
|
||||
@@ -5891,7 +5891,7 @@
|
||||
"global-modules": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
|
||||
"integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
|
||||
"integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"global-prefix": "^1.0.1",
|
||||
@@ -6461,7 +6461,7 @@
|
||||
"gulp-eslint": {
|
||||
"version": "5.0.0",
|
||||
"resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-5.0.0.tgz",
|
||||
"integrity": "sha1-KiaECV93Syz3kxAmIHjFbMehK1I=",
|
||||
"integrity": "sha512-9GUqCqh85C7rP9120cpxXuZz2ayq3BZc85pCTuPJS03VQYxne0aWPIXWx6LSvsGPa3uRqtSO537vaugOh+5cXg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"eslint": "^5.0.1",
|
||||
@@ -7415,7 +7415,7 @@
|
||||
"has-binary2": {
|
||||
"version": "1.0.3",
|
||||
"resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
|
||||
"integrity": "sha1-d3asYn8+p3JQz8My2rfd9eT10R0=",
|
||||
"integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"isarray": "2.0.1"
|
||||
@@ -7566,7 +7566,7 @@
|
||||
"http-proxy": {
|
||||
"version": "1.17.0",
|
||||
"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
|
||||
"integrity": "sha1-etOElGWPhGBeL220Q230EPTlvpo=",
|
||||
"integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"eventemitter3": "^3.0.0",
|
||||
@@ -7860,7 +7860,7 @@
|
||||
"is-absolute": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
|
||||
"integrity": "sha1-OV4a6EsR8mrReV5zwXN45IowFXY=",
|
||||
"integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"is-relative": "^1.0.0",
|
||||
@@ -8155,7 +8155,7 @@
|
||||
"is-relative": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
|
||||
"integrity": "sha1-obtpNc6MXboei5dUubLcwCDiJg0=",
|
||||
"integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"is-unc-path": "^1.0.0"
|
||||
@@ -8164,7 +8164,7 @@
|
||||
"is-resolvable": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
|
||||
"integrity": "sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg=",
|
||||
"integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
|
||||
"dev": true
|
||||
},
|
||||
"is-retry-allowed": {
|
||||
@@ -8212,7 +8212,7 @@
|
||||
"is-unc-path": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
|
||||
"integrity": "sha1-1zHoiY7QkKEsNSrS6u1Qla0yLJ0=",
|
||||
"integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"unc-path-regex": "^0.1.2"
|
||||
@@ -8369,7 +8369,7 @@
|
||||
"json-schema-traverse": {
|
||||
"version": "0.4.1",
|
||||
"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
|
||||
"integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
|
||||
"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
|
||||
"dev": true
|
||||
},
|
||||
"json-stable-stringify-without-jsonify": {
|
||||
@@ -8496,7 +8496,7 @@
|
||||
"source-map": {
|
||||
"version": "0.6.1",
|
||||
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
|
||||
"integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
|
||||
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
|
||||
"dev": true
|
||||
}
|
||||
}
|
||||
@@ -9146,7 +9146,7 @@
|
||||
"make-iterator": {
|
||||
"version": "1.0.1",
|
||||
"resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
|
||||
"integrity": "sha1-KbM/MSqo9UfEpeSQ9Wr87JkTOtY=",
|
||||
"integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"kind-of": "^6.0.2"
|
||||
@@ -9327,7 +9327,7 @@
|
||||
"mimic-fn": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
|
||||
"integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=",
|
||||
"integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
|
||||
"dev": true
|
||||
},
|
||||
"minimatch": {
|
||||
@@ -12855,7 +12855,7 @@
|
||||
"pluralize": {
|
||||
"version": "7.0.0",
|
||||
"resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
|
||||
"integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=",
|
||||
"integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
|
||||
"dev": true
|
||||
},
|
||||
"posix-character-classes": {
|
||||
@@ -13345,7 +13345,7 @@
|
||||
"qjobs": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
|
||||
"integrity": "sha1-xF6cYYAL0IfviNfiVkI73Unl0HE=",
|
||||
"integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
|
||||
"dev": true
|
||||
},
|
||||
"qs": {
|
||||
@@ -13541,7 +13541,7 @@
|
||||
},
|
||||
"string_decoder": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
|
||||
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
|
||||
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
@@ -14039,7 +14039,7 @@
|
||||
"safer-buffer": {
|
||||
"version": "2.1.2",
|
||||
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
|
||||
"integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=",
|
||||
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
|
||||
"dev": true
|
||||
},
|
||||
"sax": {
|
||||
@@ -14226,7 +14226,7 @@
|
||||
"setprototypeof": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
|
||||
"integrity": "sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY=",
|
||||
"integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
|
||||
"dev": true
|
||||
},
|
||||
"shebang-command": {
|
||||
@@ -14516,7 +14516,7 @@
|
||||
"debug": {
|
||||
"version": "3.1.0",
|
||||
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
|
||||
"integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
|
||||
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"ms": "2.0.0"
|
||||
@@ -14796,7 +14796,7 @@
|
||||
"stream-consume": {
|
||||
"version": "0.1.1",
|
||||
"resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz",
|
||||
"integrity": "sha1-0721mMK9CugrjKx6xQsRB6eZbEg=",
|
||||
"integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==",
|
||||
"dev": true
|
||||
},
|
||||
"stream-shift": {
|
||||
@@ -14808,7 +14808,7 @@
|
||||
"streamroller": {
|
||||
"version": "0.7.0",
|
||||
"resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
|
||||
"integrity": "sha1-odG3z4PTmvsNYwSaWsv5NJO99ks=",
|
||||
"integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"date-format": "^1.2.0",
|
||||
@@ -14835,7 +14835,7 @@
|
||||
"readable-stream": {
|
||||
"version": "2.3.6",
|
||||
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
|
||||
"integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
|
||||
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"core-util-is": "~1.0.0",
|
||||
@@ -14850,7 +14850,7 @@
|
||||
"string_decoder": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
|
||||
"integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
|
||||
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"safe-buffer": "~5.1.0"
|
||||
@@ -14867,7 +14867,7 @@
|
||||
"string-width": {
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
|
||||
"integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
|
||||
"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"is-fullwidth-code-point": "^2.0.0",
|
||||
@@ -15409,7 +15409,7 @@
|
||||
"tmp": {
|
||||
"version": "0.0.33",
|
||||
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
|
||||
"integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
|
||||
"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"os-tmpdir": "~1.0.2"
|
||||
@@ -15573,7 +15573,7 @@
|
||||
"type-is": {
|
||||
"version": "1.6.16",
|
||||
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
|
||||
"integrity": "sha1-+JzjQVQcZysl7nrjxz3uOyvlAZQ=",
|
||||
"integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"media-typer": "0.3.0",
|
||||
@@ -15615,7 +15615,7 @@
|
||||
"ultron": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
|
||||
"integrity": "sha1-n+FTahCmZKZSZqHjzPhf02MCvJw=",
|
||||
"integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
|
||||
"dev": true
|
||||
},
|
||||
"unc-path-regex": {
|
||||
@@ -15777,13 +15777,13 @@
|
||||
"upath": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz",
|
||||
"integrity": "sha1-NSVll+RqWB20eT0M5H+prr/J+r0=",
|
||||
"integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==",
|
||||
"dev": true
|
||||
},
|
||||
"uri-js": {
|
||||
"version": "4.2.2",
|
||||
"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
|
||||
"integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
|
||||
"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"punycode": "^2.1.0"
|
||||
@@ -16218,7 +16218,7 @@
|
||||
"ws": {
|
||||
"version": "3.3.3",
|
||||
"resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
|
||||
"integrity": "sha1-8c+E/i1ekB686U767OeF8YeiKPI=",
|
||||
"integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"async-limiter": "~1.0.0",
|
||||
|
||||
+3
-3
@@ -178,7 +178,7 @@
|
||||
|
||||
function loginSubmit(login, password) {
|
||||
|
||||
//TODO: Do validation properly like in the invite password update
|
||||
// TODO: Do validation properly like in the invite password update
|
||||
|
||||
//if the login and password are not empty we need to automatically
|
||||
// validate them - this is because if there are validation errors on the server
|
||||
@@ -242,7 +242,7 @@
|
||||
|
||||
function requestPasswordResetSubmit(email) {
|
||||
|
||||
//TODO: Do validation properly like in the invite password update
|
||||
// TODO: Do validation properly like in the invite password update
|
||||
|
||||
if (email && email.length > 0) {
|
||||
vm.requestPasswordResetForm.email.$setValidity('auth', true);
|
||||
@@ -286,7 +286,7 @@
|
||||
return;
|
||||
}
|
||||
|
||||
//TODO: All of this logic can/should be shared! We should do validation the nice way instead of all of this manual stuff, see: inviteSavePassword
|
||||
// TODO: All of this logic can/should be shared! We should do validation the nice way instead of all of this manual stuff, see: inviteSavePassword
|
||||
authResource.performSetPassword(vm.resetPasswordCodeInfo.resetCodeModel.userId, password, confirmPassword, vm.resetPasswordCodeInfo.resetCodeModel.resetCode)
|
||||
.then(function () {
|
||||
vm.showSetPasswordConfirmation = true;
|
||||
|
||||
+1
-1
@@ -137,7 +137,7 @@ In the following example you see how to run some custom logic before a step goes
|
||||
<div>
|
||||
<umb-button
|
||||
size="xs"
|
||||
button-style="success"
|
||||
button-style="action"
|
||||
type="button"
|
||||
action="vm.initNextStep()"
|
||||
label="Next">
|
||||
|
||||
+2
-2
@@ -14,7 +14,7 @@ Use this directive to render an umbraco button. The directive can be used to gen
|
||||
<umb-button
|
||||
action="vm.clickButton()"
|
||||
type="button"
|
||||
button-style="success"
|
||||
button-style="action"
|
||||
state="vm.buttonState"
|
||||
shortcut="ctrl+c"
|
||||
label="My button"
|
||||
@@ -99,7 +99,7 @@ Use this directive to render an umbraco button. The directive can be used to gen
|
||||
}
|
||||
});
|
||||
|
||||
//TODO: This doesn't seem necessary?
|
||||
// TODO: This doesn't seem necessary?
|
||||
UmbButtonController.$inject = ['$timeout', 'localizationService'];
|
||||
|
||||
function UmbButtonController($timeout, localizationService) {
|
||||
|
||||
+3
-2
@@ -305,8 +305,8 @@
|
||||
var fieldControl = item.control;
|
||||
var fieldErrorKeys = item.errorKeys;
|
||||
|
||||
for (var i = 0; i < fieldErrorKeys.length; i++) {
|
||||
fieldControl.$setValidity(fieldErrorKeys[i], false);
|
||||
for (var j = 0; j < fieldErrorKeys.length; j++) {
|
||||
fieldControl.$setValidity(fieldErrorKeys[j], false);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -442,6 +442,7 @@
|
||||
variants: $scope.content.variants, //set a model property for the dialog
|
||||
skipFormValidation: true, //when submitting the overlay form, skip any client side validation
|
||||
submitButtonLabelKey: "content_unpublish",
|
||||
submitButtonStyle: "warning",
|
||||
submit: function (model) {
|
||||
|
||||
model.submitButtonState = "busy";
|
||||
|
||||
+8
@@ -245,13 +245,21 @@
|
||||
|
||||
function setAuditTrailLogTypeColor(auditTrail) {
|
||||
angular.forEach(auditTrail, function (item) {
|
||||
|
||||
console.log(item.logType);
|
||||
|
||||
switch (item.logType) {
|
||||
case "Save":
|
||||
item.logTypeColor = "primary";
|
||||
break;
|
||||
case "Publish":
|
||||
case "PublishVariant":
|
||||
item.logTypeColor = "success";
|
||||
break;
|
||||
case "Unpublish":
|
||||
case "UnpublishVariant":
|
||||
item.logTypeColor = "warning";
|
||||
break;
|
||||
case "Delete":
|
||||
item.logTypeColor = "danger";
|
||||
break;
|
||||
|
||||
+7
-3
@@ -8,7 +8,7 @@
|
||||
templateUrl: 'views/components/content/umb-variant-content-editors.html',
|
||||
bindings: {
|
||||
page: "<",
|
||||
content: "<", //TODO: Not sure if this should be = since we are changing the 'active' property of a variant
|
||||
content: "<", // TODO: Not sure if this should be = since we are changing the 'active' property of a variant
|
||||
culture: "<",
|
||||
onSelectApp: "&?"
|
||||
},
|
||||
@@ -232,6 +232,10 @@
|
||||
var app = editor.content.apps[i];
|
||||
if (app.alias === "umbContent") {
|
||||
app.active = true;
|
||||
// tell the world that the app has changed (but do it only once)
|
||||
if (e === 0) {
|
||||
selectApp(app);
|
||||
}
|
||||
}
|
||||
else {
|
||||
app.active = false;
|
||||
@@ -239,7 +243,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
//TODO: hacking animation states - these should hopefully be easier to do when we upgrade angular
|
||||
// TODO: hacking animation states - these should hopefully be easier to do when we upgrade angular
|
||||
editor.collapsed = true;
|
||||
editor.loading = true;
|
||||
$timeout(function () {
|
||||
@@ -251,7 +255,7 @@
|
||||
|
||||
/** Closes the split view */
|
||||
function closeSplitView(editorIndex) {
|
||||
//TODO: hacking animation states - these should hopefully be easier to do when we upgrade angular
|
||||
// TODO: hacking animation states - these should hopefully be easier to do when we upgrade angular
|
||||
var editor = vm.editors[editorIndex];
|
||||
editor.loading = true;
|
||||
editor.collapsed = true;
|
||||
|
||||
+1
-1
@@ -46,7 +46,7 @@ Use this directive to construct a main content area inside the main editor windo
|
||||
|
||||
scope.numberOfOverlays = 0;
|
||||
|
||||
//TODO: this shouldn't be a watch, this should be based on an event handler
|
||||
// TODO: this shouldn't be a watch, this should be based on an event handler
|
||||
scope.$watch(function () {
|
||||
return overlayHelper.getNumberOfOverlays();
|
||||
}, function (newValue) {
|
||||
|
||||
+6
-2
@@ -12,7 +12,9 @@
|
||||
scope.editors = [];
|
||||
|
||||
function addEditor(editor) {
|
||||
|
||||
|
||||
console.log("add:", editor)
|
||||
|
||||
editor.animating = true;
|
||||
|
||||
showOverlayOnPrevEditor();
|
||||
@@ -88,7 +90,9 @@
|
||||
}
|
||||
|
||||
function removeEditor(editor) {
|
||||
|
||||
|
||||
console.log("remove: ", editor)
|
||||
|
||||
editor.animating = true;
|
||||
|
||||
$timeout(function(){
|
||||
|
||||
+1
-1
@@ -188,7 +188,7 @@ angular.module('umbraco.directives')
|
||||
e.stopPropagation();
|
||||
var fn = $parse(attrs.onRightClick);
|
||||
scope.$apply(function () {
|
||||
fn(scope, { $event: event });
|
||||
fn(scope, { $event: e });
|
||||
});
|
||||
return false;
|
||||
});
|
||||
|
||||
+3
-3
@@ -10,7 +10,7 @@ angular.module("umbraco.directives")
|
||||
replace: true,
|
||||
link: function (scope, element, attrs) {
|
||||
|
||||
//TODO: A lot of the code below should be shared between the grid rte and the normal rte
|
||||
// TODO: A lot of the code below should be shared between the grid rte and the normal rte
|
||||
|
||||
var promises = [];
|
||||
|
||||
@@ -73,7 +73,7 @@ angular.module("umbraco.directives")
|
||||
|
||||
});
|
||||
|
||||
//TODO: Perhaps we should pin the toolbar for the rte always, regardless of if it's in the grid or not?
|
||||
// TODO: Perhaps we should pin the toolbar for the rte always, regardless of if it's in the grid or not?
|
||||
// this would mean moving this code into the tinyMceService.initializeEditor
|
||||
|
||||
//when we leave the editor (maybe)
|
||||
@@ -116,7 +116,7 @@ angular.module("umbraco.directives")
|
||||
|
||||
loadTinyMce();
|
||||
|
||||
//TODO: This should probably be in place for all RTE, not just for the grid, which means
|
||||
// TODO: This should probably be in place for all RTE, not just for the grid, which means
|
||||
// this code can live in tinyMceService.initializeEditor
|
||||
var tabShownListener = eventsService.on("app.tabChange", function (e, args) {
|
||||
|
||||
|
||||
+1
-1
@@ -131,7 +131,7 @@
|
||||
function onDestroy() {
|
||||
$(window).off('resize.umbImageGravity');
|
||||
if (htmlOverlay) {
|
||||
//TODO: This should be destroyed but this will throw an exception:
|
||||
// TODO: This should be destroyed but this will throw an exception:
|
||||
// "cannot call methods on draggable prior to initialization; attempted to call method 'destroy'"
|
||||
// I've tried lots of things and cannot get this to work, we weren't destroying before so hopefully
|
||||
// there's no mem leaks?
|
||||
|
||||
+8
-1
@@ -40,6 +40,13 @@
|
||||
|
||||
function setMediaLink(){
|
||||
scope.nodeUrl = scope.node.mediaLink;
|
||||
// grab the file name from the URL and use it as the display name in the file link
|
||||
var match = /.*\/(.*)/.exec(scope.nodeUrl);
|
||||
if (match) {
|
||||
scope.nodeFileName = match[1];
|
||||
} else {
|
||||
scope.nodeFileName = scope.nodeUrl;
|
||||
}
|
||||
}
|
||||
|
||||
scope.openMediaType = function (mediaType) {
|
||||
@@ -92,4 +99,4 @@
|
||||
|
||||
angular.module('umbraco.directives').directive('umbMediaNodeInfo', MediaNodeInfoDirective);
|
||||
|
||||
})();
|
||||
})();
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
|
||||
scope.numberOfOverlays = 0;
|
||||
|
||||
//TODO: this shouldn't be a watch, this should be based on an event handler
|
||||
// TODO: this shouldn't be a watch, this should be based on an event handler
|
||||
scope.$watch(function () {
|
||||
return overlayHelper.getNumberOfOverlays();
|
||||
}, function (newValue) {
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@
|
||||
transclude: true,
|
||||
templateUrl: "views/components/tree/umbcontextdialog/umb-context-dialog.html",
|
||||
scope: {
|
||||
title: "<",
|
||||
dialogTitle: "<",
|
||||
currentNode: "<",
|
||||
view: "<"
|
||||
},
|
||||
|
||||
+5
-5
@@ -80,7 +80,7 @@ function umbTreeDirective($q, $rootScope, treeService, notificationsService, use
|
||||
// entire tree again since we already still have it in memory. Of course if the section is different we will
|
||||
// reload it. This saves a lot on processing if someone is navigating in and out of the same section many times
|
||||
// since it saves on data retreival and DOM processing.
|
||||
//TODO: This isn't used!?
|
||||
// TODO: This isn't used!?
|
||||
var lastSection = "";
|
||||
|
||||
/** Helper function to emit tree events */
|
||||
@@ -92,7 +92,7 @@ function umbTreeDirective($q, $rootScope, treeService, notificationsService, use
|
||||
}
|
||||
}
|
||||
|
||||
//TODO: This isn't used!?
|
||||
// TODO: This isn't used!?
|
||||
function clearCache(section) {
|
||||
treeService.clearCache({ section: section });
|
||||
}
|
||||
@@ -235,7 +235,7 @@ function umbTreeDirective($q, $rootScope, treeService, notificationsService, use
|
||||
$scope.loading = true;
|
||||
|
||||
//default args
|
||||
var args = { section: $scope.section, tree: $scope.treealias, cacheKey: $scope.cachekey, isDialog: $scope.isdialog ? $scope.isdialog : false, onlyinitialized: $scope.onlyInitialized };
|
||||
var args = { section: $scope.section, tree: $scope.treealias, cacheKey: $scope.cachekey, isDialog: $scope.isdialog ? $scope.isdialog : false };
|
||||
|
||||
//add the extra query string params if specified
|
||||
if ($scope.customtreeparams) {
|
||||
@@ -300,9 +300,9 @@ function umbTreeDirective($q, $rootScope, treeService, notificationsService, use
|
||||
return '';
|
||||
}
|
||||
|
||||
//TODO: This is called constantly because as a method in a template it's re-evaluated pretty much all the time
|
||||
// TODO: This is called constantly because as a method in a template it's re-evaluated pretty much all the time
|
||||
// it would be better if we could cache the processing. The problem is that some of these things are dynamic.
|
||||
|
||||
|
||||
var css = [];
|
||||
if (node.cssClasses) {
|
||||
_.each(node.cssClasses, function (c) {
|
||||
|
||||
+2
-1
@@ -61,7 +61,7 @@ angular.module("umbraco.directives")
|
||||
return '';
|
||||
}
|
||||
|
||||
//TODO: This is called constantly because as a method in a template it's re-evaluated pretty much all the time
|
||||
// TODO: This is called constantly because as a method in a template it's re-evaluated pretty much all the time
|
||||
// it would be better if we could cache the processing. The problem is that some of these things are dynamic.
|
||||
|
||||
var css = [];
|
||||
@@ -141,6 +141,7 @@ angular.module("umbraco.directives")
|
||||
defined on the tree
|
||||
*/
|
||||
scope.altSelect = function(n, ev) {
|
||||
if(ev.altKey) return false;
|
||||
umbTreeCtrl.emitEvent("treeNodeAltSelect", { element: element, tree: scope.tree, node: n, event: ev });
|
||||
};
|
||||
|
||||
|
||||
+5
-1
@@ -36,10 +36,14 @@ Use this directive to generate color swatches to pick from.
|
||||
scope.setColor = function (color, $index, $event) {
|
||||
scope.selectedColor = color;
|
||||
if (scope.onSelect) {
|
||||
scope.onSelect(color, $index, $event);
|
||||
scope.onSelect(color.color, $index, $event);
|
||||
$event.stopPropagation();
|
||||
}
|
||||
};
|
||||
|
||||
scope.isSelectedColor = function (color) {
|
||||
return scope.selectedColor && color.value === scope.selectedColor.value;
|
||||
}
|
||||
}
|
||||
|
||||
var directive = {
|
||||
|
||||
@@ -54,7 +54,8 @@ function confirmDirective() {
|
||||
scope: {
|
||||
onConfirm: '=',
|
||||
onCancel: '=',
|
||||
caption: '@'
|
||||
caption: '@',
|
||||
confirmButtonStyle: '@'
|
||||
},
|
||||
link: function (scope, element, attr, ctrl) {
|
||||
scope.showCancel = false;
|
||||
|
||||
+17
-8
@@ -92,20 +92,25 @@ Use this directive to render a date time picker
|
||||
}
|
||||
};
|
||||
|
||||
function umbFlatpickrCtrl($element, $timeout, $scope, assetsService) {
|
||||
function umbFlatpickrCtrl($element, $timeout, $scope, assetsService, userService) {
|
||||
var ctrl = this;
|
||||
var loaded = false;
|
||||
var userLocale = null;
|
||||
|
||||
ctrl.$onInit = function() {
|
||||
|
||||
// load css file for the date picker
|
||||
assetsService.loadCss('lib/flatpickr/flatpickr.css', $scope);
|
||||
assetsService.loadCss('lib/flatpickr/flatpickr.css', $scope).then(function () {
|
||||
userService.getCurrentUser().then(function (user) {
|
||||
// init date picker
|
||||
userLocale = user.locale;
|
||||
if (userLocale.indexOf('-') > -1) {
|
||||
userLocale = userLocale.split('-')[0];
|
||||
}
|
||||
loaded = true;
|
||||
grabElementAndRunFlatpickr();
|
||||
|
||||
// load the js file for the date picker
|
||||
assetsService.loadJs('lib/flatpickr/flatpickr.js', $scope).then(function () {
|
||||
// init date picker
|
||||
loaded = true;
|
||||
grabElementAndRunFlatpickr();
|
||||
});
|
||||
});
|
||||
|
||||
};
|
||||
@@ -128,6 +133,10 @@ Use this directive to render a date time picker
|
||||
|
||||
setUpCallbacks();
|
||||
|
||||
if (!ctrl.options.locale) {
|
||||
ctrl.options.locale = userLocale;
|
||||
}
|
||||
|
||||
var fpInstance = new fpLib(element, ctrl.options);
|
||||
|
||||
if (ctrl.onSetup) {
|
||||
@@ -228,4 +237,4 @@ Use this directive to render a date time picker
|
||||
|
||||
angular.module('umbraco.directives').component('umbFlatpickr', umbFlatpickr);
|
||||
|
||||
})();
|
||||
})();
|
||||
|
||||
+2
-2
@@ -301,7 +301,7 @@
|
||||
|
||||
//based on the selection, we need to filter the available composite types list
|
||||
filterAvailableCompositions(selectedContentType, newSelection).then(function () {
|
||||
//TODO: Here we could probably re-enable selection if we previously showed a throbber or something
|
||||
// TODO: Here we could probably re-enable selection if we previously showed a throbber or something
|
||||
});
|
||||
});
|
||||
}
|
||||
@@ -311,7 +311,7 @@
|
||||
|
||||
//based on the selection, we need to filter the available composite types list
|
||||
filterAvailableCompositions(selectedContentType, newSelection).then(function () {
|
||||
//TODO: Here we could probably re-enable selection if we previously showed a throbber or something
|
||||
// TODO: Here we could probably re-enable selection if we previously showed a throbber or something
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -92,7 +92,7 @@
|
||||
vm.culture = null;
|
||||
}
|
||||
|
||||
//TODO: need to figure out what we can do for things like Nested Content
|
||||
// TODO: need to figure out what we can do for things like Nested Content
|
||||
|
||||
var existingClientFiles = checkPendingClientFiles();
|
||||
//create the property to show the list of files currently saved
|
||||
|
||||
+1
-1
@@ -135,7 +135,7 @@
|
||||
!$scope.config.enablePasswordRetrieval && !$scope.showReset;
|
||||
};
|
||||
|
||||
//TODO: I don't think we need this or the cancel button, this can be up to the editor rendering this directive
|
||||
// TODO: I don't think we need this or the cancel button, this can be up to the editor rendering this directive
|
||||
$scope.showCancelBtn = function () {
|
||||
return $scope.config.disableToggle !== true && $scope.config.hasPassword;
|
||||
};
|
||||
|
||||
+2
-2
@@ -42,12 +42,12 @@ function valPropertyMsg(serverValidationManager) {
|
||||
return err.errorMsg;
|
||||
}
|
||||
else {
|
||||
//TODO: localize
|
||||
// TODO: localize
|
||||
return scope.currentProperty.propertyErrorMessage ? scope.currentProperty.propertyErrorMessage : "Property has errors";
|
||||
}
|
||||
|
||||
}
|
||||
//TODO: localize
|
||||
// TODO: localize
|
||||
return "Property has errors";
|
||||
}
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
return {
|
||||
valStatusChanged: function (args) {
|
||||
|
||||
//TODO: Verify this is correct, does $scope.model ever exist?
|
||||
// TODO: Verify this is correct, does $scope.model ever exist?
|
||||
if ($scope.model) {
|
||||
if (!args.form.$valid) {
|
||||
var subViewContent = $element.find(".ng-invalid");
|
||||
|
||||
@@ -8,7 +8,7 @@ angular.module('umbraco.mocks').
|
||||
return [401, null, null];
|
||||
}
|
||||
else {
|
||||
//TODO: return real mocked data
|
||||
// TODO: return real mocked data
|
||||
return [200, [], null];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -130,7 +130,7 @@ function authResource($q, $http, umbRequestHelper, angularHelper) {
|
||||
});
|
||||
}
|
||||
|
||||
//TODO: This validation shouldn't really be done here, the validation on the login dialog
|
||||
// TODO: This validation shouldn't really be done here, the validation on the login dialog
|
||||
// is pretty hacky which is why this is here, ideally validation on the login dialog would
|
||||
// be done properly.
|
||||
var emailRegex = /\S+@\S+\.\S+/;
|
||||
|
||||
@@ -14,7 +14,7 @@ function dashboardResource($q, $http, umbRequestHelper) {
|
||||
*
|
||||
* @description
|
||||
* Retrieves the dashboard configuration for a given section
|
||||
*
|
||||
*
|
||||
* @param {string} section Alias of section to retrieve dashboard configuraton for
|
||||
* @returns {Promise} resourcePromise object containing the user array.
|
||||
*
|
||||
@@ -36,7 +36,7 @@ function dashboardResource($q, $http, umbRequestHelper) {
|
||||
*
|
||||
* @description
|
||||
* Retrieves dashboard content from a remote source for a given section
|
||||
*
|
||||
*
|
||||
* @param {string} section Alias of section to retrieve dashboard content for
|
||||
* @returns {Promise} resourcePromise object containing the user array.
|
||||
*
|
||||
@@ -70,10 +70,18 @@ function dashboardResource($q, $http, umbRequestHelper) {
|
||||
"dashboardApiBaseUrl",
|
||||
"GetRemoteDashboardCss",
|
||||
values);
|
||||
},
|
||||
|
||||
getRemoteXmlData: function (site, url) {
|
||||
//build request values with optional params
|
||||
var values = { site: site, url: url };
|
||||
return umbRequestHelper.resourcePromise(
|
||||
$http.get(
|
||||
umbRequestHelper.getApiUrl(
|
||||
"dashboardApiBaseUrl",
|
||||
"GetRemoteXml",
|
||||
values)), "Failed to get remote xml");
|
||||
}
|
||||
|
||||
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
**/
|
||||
function javascriptLibraryResource($q, $http, umbRequestHelper) {
|
||||
|
||||
var existingLocales = [];
|
||||
var existingLocales = null;
|
||||
|
||||
function getSupportedLocalesForMoment() {
|
||||
function getSupportedLocales() {
|
||||
var deferred = $q.defer();
|
||||
|
||||
if (existingLocales.length === 0) {
|
||||
if (existingLocales === null) {
|
||||
umbRequestHelper.resourcePromise(
|
||||
$http.get(
|
||||
umbRequestHelper.getApiUrl(
|
||||
"backOfficeAssetsApiBaseUrl",
|
||||
"GetSupportedMomentLocales")),
|
||||
"GetSupportedLocales")),
|
||||
"Failed to get cultures").then(function(locales) {
|
||||
existingLocales = locales;
|
||||
deferred.resolve(existingLocales);
|
||||
@@ -29,9 +29,9 @@
|
||||
|
||||
return deferred.promise;
|
||||
}
|
||||
|
||||
|
||||
var service = {
|
||||
getSupportedLocalesForMoment: getSupportedLocalesForMoment
|
||||
getSupportedLocales: getSupportedLocales
|
||||
};
|
||||
|
||||
return service;
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
/**
|
||||
* @ngdoc service
|
||||
* @name umbraco.resources.legacyResource
|
||||
* @description Handles legacy dialog requests
|
||||
**/
|
||||
function legacyResource($q, $http, umbRequestHelper) {
|
||||
|
||||
//the factory object returned
|
||||
return {
|
||||
/** Loads in the data to display the section list */
|
||||
deleteItem: function (args) {
|
||||
|
||||
if (!args.nodeId || !args.nodeType || !args.alias) {
|
||||
throw "The args parameter is not formatted correct, it requires properties: nodeId, nodeType, alias";
|
||||
}
|
||||
|
||||
return umbRequestHelper.resourcePromise(
|
||||
$http.post(
|
||||
umbRequestHelper.getApiUrl(
|
||||
"legacyApiBaseUrl",
|
||||
"DeleteLegacyItem",
|
||||
[{ nodeId: args.nodeId }, { nodeType: args.nodeType }, { alias: args.alias }])),
|
||||
'Failed to delete item ' + args.nodeId);
|
||||
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
angular.module('umbraco.resources').factory('legacyResource', legacyResource);
|
||||
@@ -12,7 +12,7 @@ function treeResource($q, $http, umbRequestHelper) {
|
||||
}
|
||||
return node.childNodesUrl;
|
||||
}
|
||||
|
||||
|
||||
/** internal method to get the tree menu url */
|
||||
function getTreeMenuUrl(node) {
|
||||
if (!node.menuUrl) {
|
||||
@@ -23,7 +23,7 @@ function treeResource($q, $http, umbRequestHelper) {
|
||||
|
||||
//the factory object returned
|
||||
return {
|
||||
|
||||
|
||||
/** Loads in the data to display the nodes menu */
|
||||
loadMenu: function (node) {
|
||||
var treeMenuUrl = getTreeMenuUrl(node);
|
||||
@@ -53,12 +53,9 @@ function treeResource($q, $http, umbRequestHelper) {
|
||||
}
|
||||
|
||||
//create the query string for the tree request, these are the mandatory options:
|
||||
var query = "application=" + options.section + "&tree=" + options.tree + "&isDialog=" + options.isDialog;
|
||||
|
||||
//if you need to load a not initialized tree set this value to false - default is true
|
||||
if (options.onlyinitialized) {
|
||||
query += "&onlyInitialized=" + options.onlyinitialized;
|
||||
}
|
||||
var query = "application=" + options.section
|
||||
+ "&tree=" + options.tree
|
||||
+ "&use=" + (options.isDialog ? "dialog" : "main");
|
||||
|
||||
//the options can contain extra query string parameters
|
||||
if (options.queryString) {
|
||||
@@ -73,7 +70,7 @@ function treeResource($q, $http, umbRequestHelper) {
|
||||
query)),
|
||||
'Failed to retrieve data for application tree ' + options.section);
|
||||
},
|
||||
|
||||
|
||||
/** Loads in the data to display the child nodes for a given node */
|
||||
loadNodes: function (options) {
|
||||
|
||||
|
||||
@@ -358,7 +358,7 @@ angular.module('umbraco.services').factory("editorState", function() {
|
||||
}
|
||||
};
|
||||
|
||||
//TODO: This shouldn't be removed! use getCurrent() method instead of a hacked readonly property which is confusing.
|
||||
// TODO: This shouldn't be removed! use getCurrent() method instead of a hacked readonly property which is confusing.
|
||||
|
||||
//create a get/set property but don't allow setting
|
||||
Object.defineProperty(state, "current", {
|
||||
|
||||
@@ -66,20 +66,26 @@ angular.module('umbraco.services')
|
||||
}
|
||||
|
||||
function getMomentLocales(locales, supportedLocales) {
|
||||
return getLocales(locales, supportedLocales, 'lib/moment/');
|
||||
}
|
||||
|
||||
function getFlatpickrLocales(locales, supportedLocales) {
|
||||
return getLocales(locales, supportedLocales, 'lib/flatpickr/l10n/');
|
||||
}
|
||||
|
||||
function getLocales(locales, supportedLocales, path) {
|
||||
var localeUrls = [];
|
||||
var locales = locales.split(',');
|
||||
for (var i = 0; i < locales.length; i++) {
|
||||
var locale = locales[i].toString().toLowerCase();
|
||||
if (locale !== 'en-us') {
|
||||
|
||||
if (supportedLocales.indexOf(locale + '.js') > -1) {
|
||||
localeUrls.push('lib/moment/' + locale + '.js');
|
||||
localeUrls.push(path + locale + '.js');
|
||||
}
|
||||
if (locale.indexOf('-') > -1) {
|
||||
var majorLocale = locale.split('-')[0] + '.js';
|
||||
if (supportedLocales.indexOf(majorLocale) > -1) {
|
||||
localeUrls.push('lib/moment/' + majorLocale);
|
||||
localeUrls.push(path + majorLocale);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -89,12 +95,13 @@ angular.module('umbraco.services')
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads specific Moment.js Locales.
|
||||
* Loads specific Moment.js and Flatpickr Locales.
|
||||
* @param {any} locales
|
||||
* @param {any} supportedLocales
|
||||
*/
|
||||
function loadLocales(locales, supportedLocales) {
|
||||
var localeUrls = getMomentLocales(locales, supportedLocales);
|
||||
var localeUrls = getMomentLocales(locales, supportedLocales.moment);
|
||||
localeUrls = localeUrls.concat(getFlatpickrLocales(locales, supportedLocales.flatpickr));
|
||||
if (localeUrls.length >= 1) {
|
||||
return service.load(localeUrls, $rootScope);
|
||||
}
|
||||
@@ -104,12 +111,12 @@ angular.module('umbraco.services')
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads in moment.js requirements during the _loadInitAssets call
|
||||
* Loads in locale requirements during the _loadInitAssets call
|
||||
*/
|
||||
function loadMomentLocaleForCurrentUser() {
|
||||
function loadLocaleForCurrentUser() {
|
||||
|
||||
userService.getCurrentUser().then(function (currentUser) {
|
||||
return javascriptLibraryResource.getSupportedLocalesForMoment().then(function (supportedLocales) {
|
||||
return javascriptLibraryResource.getSupportedLocales().then(function (supportedLocales) {
|
||||
return loadLocales(currentUser.locale, supportedLocales);
|
||||
});
|
||||
});
|
||||
@@ -141,7 +148,7 @@ angular.module('umbraco.services')
|
||||
var self = this;
|
||||
return self.loadJs(umbRequestHelper.getApiUrl("serverVarsJs", "", ""), $rootScope).then(function () {
|
||||
initAssetsLoaded = true;
|
||||
return loadMomentLocaleForCurrentUser();
|
||||
return loadLocaleForCurrentUser();
|
||||
});
|
||||
}
|
||||
else {
|
||||
|
||||
@@ -35,7 +35,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
|
||||
return {
|
||||
|
||||
/** Used by the content editor and mini content editor to perform saving operations */
|
||||
//TODO: Make this a more helpful/reusable method for other form operations! we can simplify this form most forms
|
||||
// TODO: Make this a more helpful/reusable method for other form operations! we can simplify this form most forms
|
||||
// = this is already done in the formhelper service
|
||||
contentEditorPerformSave: function (args) {
|
||||
if (!angular.isObject(args)) {
|
||||
@@ -421,7 +421,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
|
||||
*/
|
||||
reBindChangedProperties: function (origContent, savedContent) {
|
||||
|
||||
//TODO: We should probably split out this logic to deal with media/members separately to content
|
||||
// TODO: We should probably split out this logic to deal with media/members separately to content
|
||||
|
||||
//a method to ignore built-in prop changes
|
||||
var shouldIgnore = function (propName) {
|
||||
|
||||
@@ -116,7 +116,7 @@ When building a custom infinite editor view you can use the same components as a
|
||||
</umb-button>
|
||||
<umb-button
|
||||
type="button"
|
||||
button-style="success"
|
||||
button-style="action"
|
||||
label-key="general_submit"
|
||||
action="vm.submit(model)">
|
||||
</umb-button>
|
||||
|
||||
@@ -121,7 +121,7 @@ function formHelper(angularHelper, serverValidationManager, notificationsService
|
||||
}
|
||||
else {
|
||||
|
||||
//TODO: All YSOD handling should be done with an interceptor
|
||||
// TODO: All YSOD handling should be done with an interceptor
|
||||
overlayService.ysod(err);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
angular.module('umbraco.services')
|
||||
.factory('helpService', function ($http, $q, umbRequestHelper) {
|
||||
.factory('helpService', function ($http, $q, umbRequestHelper, dashboardResource) {
|
||||
var helpTopics = {};
|
||||
|
||||
var defaultUrl = "https://our.umbraco.com/rss/help";
|
||||
var tvUrl = "https://umbraco.tv/feeds/help";
|
||||
var defaultUrl = "rss/help";
|
||||
var tvUrl = "feeds/help";
|
||||
|
||||
function getCachedHelp(url){
|
||||
if(helpTopics[url]){
|
||||
@@ -17,16 +17,14 @@ angular.module('umbraco.services')
|
||||
helpTopics[url] = data;
|
||||
}
|
||||
|
||||
function fetchUrl(url){
|
||||
function fetchUrl(site, url){
|
||||
var deferred = $q.defer();
|
||||
var found = getCachedHelp(url);
|
||||
|
||||
if(found){
|
||||
deferred.resolve(found);
|
||||
}else{
|
||||
|
||||
var proxyUrl = "dashboard/feedproxy.aspx?url=" + url;
|
||||
$http.get(proxyUrl).then(function(data){
|
||||
dashboardResource.getRemoteXmlData(site, url).then(function (data) {
|
||||
var feed = $(data.data);
|
||||
var topics = [];
|
||||
|
||||
@@ -41,7 +39,12 @@ angular.module('umbraco.services')
|
||||
|
||||
setCachedHelp(topics);
|
||||
deferred.resolve(topics);
|
||||
|
||||
},
|
||||
function (exception) {
|
||||
console.error('ex from remote data', exception);
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
return deferred.promise;
|
||||
@@ -50,12 +53,12 @@ angular.module('umbraco.services')
|
||||
var service = {
|
||||
findHelp: function (args) {
|
||||
var url = service.getUrl(defaultUrl, args);
|
||||
return fetchUrl(url);
|
||||
return fetchUrl('OUR', url);
|
||||
},
|
||||
|
||||
findVideos: function (args) {
|
||||
var url = service.getUrl(tvUrl, args);
|
||||
return fetchUrl(url);
|
||||
return fetchUrl('TV', url);
|
||||
},
|
||||
|
||||
getContextHelpForPage: function (section, tree, baseurl) {
|
||||
|
||||
@@ -56,7 +56,7 @@ function iconHelper($q, $timeout) {
|
||||
|
||||
{ oldIcon: ".sprTreeSettingDataType", newIcon: "icon-autofill" },
|
||||
|
||||
//TODO:
|
||||
// TODO: Something needs to be done with the old tree icons that are commented out.
|
||||
/*
|
||||
{ oldIcon: ".sprTreeSettingAgent", newIcon: "" },
|
||||
{ oldIcon: ".sprTreeSettingCss", newIcon: "" },
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
angular.module('umbraco.services')
|
||||
.factory('localizationService', function ($http, $q, eventsService, $window, $filter, userService) {
|
||||
|
||||
//TODO: This should be injected as server vars
|
||||
// TODO: This should be injected as server vars
|
||||
var url = "LocalizedText";
|
||||
var resourceFileLoadStatus = "none";
|
||||
var resourceLoadingPromise = [];
|
||||
|
||||
@@ -66,7 +66,7 @@ function mediaHelper(umbRequestHelper) {
|
||||
});
|
||||
|
||||
//for now we'll just return the first image in the collection.
|
||||
//TODO: we should enable returning many to be displayed in the picker if the uploader supports many.
|
||||
// TODO: we should enable returning many to be displayed in the picker if the uploader supports many.
|
||||
if (mediaVal.length && mediaVal.length > 0) {
|
||||
if (!options.imageOnly || (options.imageOnly === true && mediaVal[0].isImage)) {
|
||||
return mediaVal[0].file;
|
||||
|
||||
@@ -22,7 +22,7 @@ function mediaTypeHelper(mediaTypeResource, $q) {
|
||||
|
||||
getAllowedImagetypes: function (mediaId){
|
||||
|
||||
//TODO: This is horribly inneficient - why make one request per type!?
|
||||
// TODO: This is horribly inneficient - why make one request per type!?
|
||||
//This should make a call to c# to get exactly what it's looking for instead of returning every single media type and doing
|
||||
//some filtering on the client side.
|
||||
//This is also called multiple times when it's not needed! Example, when launching the media picker, this will be called twice
|
||||
|
||||
@@ -151,7 +151,7 @@ angular.module('umbraco.services')
|
||||
|
||||
},
|
||||
|
||||
//TODO: This doesn't do anything!
|
||||
// TODO: This doesn't do anything!
|
||||
setCurrent: function (sectionAlias) {
|
||||
|
||||
var currentSection = sectionAlias;
|
||||
|
||||
@@ -680,7 +680,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
|
||||
|
||||
//supported keys to move to the next or prev element (13-enter, 27-esc, 38-up, 40-down, 39-right, 37-left)
|
||||
//supported keys to remove the macro (8-backspace, 46-delete)
|
||||
//TODO: Should we make the enter key insert a line break before or leave it as moving to the next element?
|
||||
// TODO: Should we make the enter key insert a line break before or leave it as moving to the next element?
|
||||
if ($.inArray(e.keyCode, [13, 40, 39]) !== -1) {
|
||||
//move to next element
|
||||
moveSibling(macroElement, true);
|
||||
@@ -1294,7 +1294,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
|
||||
self.createLinkPicker(args.editor, function (currentTarget, anchorElement) {
|
||||
var linkPicker = {
|
||||
currentTarget: currentTarget,
|
||||
anchors: self.getAnchorNames(JSON.stringify(editorState.current.properties)),
|
||||
anchors: editorState.current ? self.getAnchorNames(JSON.stringify(editorState.current.properties)) : [],
|
||||
submit: function (model) {
|
||||
self.insertLinkInEditor(args.editor, model.target, anchorElement);
|
||||
editorService.close();
|
||||
@@ -1358,7 +1358,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s
|
||||
|
||||
self.createAceCodeEditor(args.editor, function () {
|
||||
|
||||
//TODO: CHECK TO SEE WHAT WE NEED TO DO WIT MACROS (See code block?)
|
||||
// TODO: CHECK TO SEE WHAT WE NEED TO DO WIT MACROS (See code block?)
|
||||
/*
|
||||
var html = editor.getContent({source_view: true});
|
||||
html = html.replace(/<span\s+class="CmCaReT"([^>]*)>([^<]*)<\/span>/gm, String.fromCharCode(chr));
|
||||
|
||||
@@ -114,7 +114,7 @@
|
||||
* @returns {Object} Returns the current tour
|
||||
*/
|
||||
function getCurrentTour() {
|
||||
//TODO: This should be reset if a new user logs in
|
||||
// TODO: This should be reset if a new user logs in
|
||||
return currentTour;
|
||||
}
|
||||
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
'alias', 'description', 'thumbnail', 'name', 'id', 'icon', 'trashed',
|
||||
'key', 'parentId', 'alias', 'path', 'allowCultureVariant', 'isElement');
|
||||
|
||||
//TODO: Map these
|
||||
// TODO: Map these
|
||||
saveModel.allowedTemplates = _.map(displayModel.allowedTemplates, function (t) { return t.alias; });
|
||||
saveModel.defaultTemplate = displayModel.defaultTemplate ? displayModel.defaultTemplate.alias : null;
|
||||
var realGroups = _.reject(displayModel.groups, function (g) {
|
||||
|
||||
@@ -177,7 +177,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
|
||||
//show a ysod dialog
|
||||
if (Umbraco.Sys.ServerVariables["isDebuggingEnabled"] === true) {
|
||||
const error = { errorMsg: 'An error occured', data: response.data };
|
||||
//TODO: All YSOD handling should be done with an interceptor
|
||||
// TODO: All YSOD handling should be done with an interceptor
|
||||
overlayService.ysod(error);
|
||||
}
|
||||
else {
|
||||
@@ -270,7 +270,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
|
||||
formHelper.showNotifications(response.data);
|
||||
}
|
||||
|
||||
//TODO: Do we need to pass the result through umbDataFormatter.formatContentGetData? Right now things work so not sure but we should check
|
||||
// TODO: Do we need to pass the result through umbDataFormatter.formatContentGetData? Right now things work so not sure but we should check
|
||||
|
||||
//the data returned is the up-to-date data so the UI will refresh
|
||||
return $q.resolve(response.data);
|
||||
@@ -289,7 +289,7 @@ function umbRequestHelper($http, $q, notificationsService, eventsService, formHe
|
||||
else if (Umbraco.Sys.ServerVariables["isDebuggingEnabled"] === true) {
|
||||
//show a ysod dialog
|
||||
const error = { errorMsg: 'An error occured', data: response.data };
|
||||
//TODO: All YSOD handling should be done with an interceptor
|
||||
// TODO: All YSOD handling should be done with an interceptor
|
||||
overlayService.ysod(error);
|
||||
}
|
||||
else {
|
||||
|
||||
@@ -137,7 +137,7 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
|
||||
navigationService.showSearch();
|
||||
});
|
||||
|
||||
////TODO: remove this it's not a thing
|
||||
//// TODO: remove this it's not a thing
|
||||
//$scope.selectedId = navigationService.currentId;
|
||||
|
||||
var evts = [];
|
||||
@@ -423,7 +423,7 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
|
||||
var path = treeService.getPath(currNode);
|
||||
promises.push($scope.treeApi.syncTree({ path: path, activate: true }));
|
||||
}
|
||||
//TODO: If we want to keep all paths expanded ... but we need more testing since we need to deal with unexpanding
|
||||
// TODO: If we want to keep all paths expanded ... but we need more testing since we need to deal with unexpanding
|
||||
//for (var i = 0; i < expandedPaths.length; i++) {
|
||||
// promises.push($scope.treeApi.syncTree({ path: expandedPaths[i], activate: false, forceReload: true }));
|
||||
//}
|
||||
@@ -441,16 +441,16 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
|
||||
};
|
||||
|
||||
//this reacts to the options item in the tree
|
||||
//TODO: migrate to nav service
|
||||
//TODO: is this used?
|
||||
// TODO: migrate to nav service
|
||||
// TODO: is this used?
|
||||
$scope.searchShowMenu = function (ev, args) {
|
||||
//always skip default
|
||||
args.skipDefault = true;
|
||||
navigationService.showMenu(args);
|
||||
};
|
||||
|
||||
//TODO: migrate to nav service
|
||||
//TODO: is this used?
|
||||
// TODO: migrate to nav service
|
||||
// TODO: is this used?
|
||||
$scope.searchHide = function () {
|
||||
navigationService.hideSearch();
|
||||
};
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
angular.module("umbraco.install").controller("Umbraco.InstallerController",
|
||||
function ($scope, installerService) {
|
||||
|
||||
//TODO: Decouple the service from the controller - the controller should be responsible
|
||||
// TODO: Decouple the service from the controller - the controller should be responsible
|
||||
// for the model (state) and the service should be responsible for helping the controller,
|
||||
// the controller should be passing the model into it's methods for manipulation and not hold
|
||||
// state. We should not be assigning properties from a service to a controller's scope.
|
||||
|
||||
@@ -41,9 +41,9 @@ body {
|
||||
|
||||
#mainwrapper {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
margin: 0;
|
||||
}
|
||||
@@ -56,10 +56,10 @@ body.umb-drawer-is-visible #mainwrapper{
|
||||
position: absolute;
|
||||
top: 0px;
|
||||
bottom: 0px;
|
||||
right: 0px;
|
||||
right: 0px;
|
||||
left: 0px;
|
||||
z-index: 10;
|
||||
margin: 0
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
#umb-notifications-wrapper {
|
||||
@@ -151,17 +151,23 @@ body.umb-drawer-is-visible #mainwrapper{
|
||||
}
|
||||
|
||||
.ui-resizable-e {
|
||||
cursor: e-resize;
|
||||
width: 4px;
|
||||
cursor: col-resize;
|
||||
width: 10px;
|
||||
right: -5px;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
background-color: @gray-10;
|
||||
border: solid 1px @purple-l3;
|
||||
border-top: none;
|
||||
border-bottom: none;
|
||||
position:absolute;
|
||||
z-index:9999 !important;
|
||||
|
||||
&:hover::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
background-color: @gray-8;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
width: 1px;
|
||||
right: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 1101px) {
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
@import "../../lib/bootstrap/less/close.less";
|
||||
|
||||
// Components: Buttons & Alerts
|
||||
@import "../../lib/bootstrap/less/button-groups.less";
|
||||
@import "button-groups.less";
|
||||
@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
|
||||
|
||||
// Components: Nav
|
||||
|
||||
@@ -0,0 +1,229 @@
|
||||
//
|
||||
// Button groups
|
||||
// --------------------------------------------------
|
||||
|
||||
|
||||
// Make the div behave like a button
|
||||
.btn-group {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
.ie7-inline-block();
|
||||
font-size: 0; // remove as part 1 of font-size inline-block hack
|
||||
vertical-align: middle; // match .btn alignment given font-size hack above
|
||||
white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
|
||||
.ie7-restore-left-whitespace();
|
||||
}
|
||||
|
||||
// Space out series of button groups
|
||||
.btn-group + .btn-group {
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
// Optional: Group multiple button groups together for a toolbar
|
||||
.btn-toolbar {
|
||||
font-size: 0; // Hack to remove whitespace that results from using inline-block
|
||||
margin-top: @baseLineHeight / 2;
|
||||
margin-bottom: @baseLineHeight / 2;
|
||||
> .btn + .btn,
|
||||
> .btn-group + .btn,
|
||||
> .btn + .btn-group {
|
||||
margin-left: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
// Float them, remove border radius, then re-add to first and last elements
|
||||
.btn-group > .btn {
|
||||
position: relative;
|
||||
.border-radius(0);
|
||||
}
|
||||
.btn-group > .btn + .btn {
|
||||
margin-left: -1px;
|
||||
}
|
||||
.btn-group > .btn,
|
||||
.btn-group > .dropdown-menu,
|
||||
.btn-group > .popover {
|
||||
font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack
|
||||
}
|
||||
|
||||
// Reset fonts for other sizes
|
||||
.btn-group > .btn-mini {
|
||||
font-size: @fontSizeMini;
|
||||
}
|
||||
.btn-group > .btn-small {
|
||||
font-size: @fontSizeSmall;
|
||||
}
|
||||
.btn-group > .btn-large {
|
||||
font-size: @fontSizeLarge;
|
||||
}
|
||||
|
||||
// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
|
||||
.btn-group > .btn:first-child {
|
||||
margin-left: 0;
|
||||
.border-top-left-radius(@baseBorderRadius);
|
||||
.border-bottom-left-radius(@baseBorderRadius);
|
||||
}
|
||||
// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
|
||||
.btn-group > .btn:last-child,
|
||||
.btn-group > .dropdown-toggle {
|
||||
.border-top-right-radius(@baseBorderRadius);
|
||||
.border-bottom-right-radius(@baseBorderRadius);
|
||||
}
|
||||
// Reset corners for large buttons
|
||||
.btn-group > .btn.large:first-child {
|
||||
margin-left: 0;
|
||||
.border-top-left-radius(@borderRadiusLarge);
|
||||
.border-bottom-left-radius(@borderRadiusLarge);
|
||||
}
|
||||
.btn-group > .btn.large:last-child,
|
||||
.btn-group > .large.dropdown-toggle {
|
||||
.border-top-right-radius(@borderRadiusLarge);
|
||||
.border-bottom-right-radius(@borderRadiusLarge);
|
||||
}
|
||||
|
||||
// On hover/focus/active, bring the proper btn to front
|
||||
.btn-group > .btn:hover,
|
||||
.btn-group > .btn:focus,
|
||||
.btn-group > .btn:active,
|
||||
.btn-group > .btn.active {
|
||||
z-index: 2;
|
||||
}
|
||||
|
||||
// On active and open, don't show outline
|
||||
.btn-group .dropdown-toggle:active,
|
||||
.btn-group.open .dropdown-toggle {
|
||||
outline: 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Split button dropdowns
|
||||
// ----------------------
|
||||
|
||||
// Give the line between buttons some depth
|
||||
.btn-group > .btn + .dropdown-toggle {
|
||||
padding-left: 8px;
|
||||
padding-right: 8px;
|
||||
.box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
|
||||
*padding-top: 5px;
|
||||
*padding-bottom: 5px;
|
||||
}
|
||||
.btn-group > .btn-mini + .dropdown-toggle {
|
||||
padding-left: 5px;
|
||||
padding-right: 5px;
|
||||
*padding-top: 2px;
|
||||
*padding-bottom: 2px;
|
||||
}
|
||||
.btn-group > .btn-small + .dropdown-toggle {
|
||||
*padding-top: 5px;
|
||||
*padding-bottom: 4px;
|
||||
}
|
||||
.btn-group > .btn-large + .dropdown-toggle {
|
||||
padding-left: 12px;
|
||||
padding-right: 12px;
|
||||
*padding-top: 7px;
|
||||
*padding-bottom: 7px;
|
||||
}
|
||||
|
||||
.btn-group.open {
|
||||
|
||||
// The clickable button for toggling the menu
|
||||
// Remove the gradient and set the same inset shadow as the :active state
|
||||
.dropdown-toggle {
|
||||
background-image: none;
|
||||
.box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
|
||||
}
|
||||
|
||||
// Keep the hover's background when dropdown is open
|
||||
.btn.dropdown-toggle {
|
||||
background-color: @btnBackgroundHighlight;
|
||||
}
|
||||
.btn-primary.dropdown-toggle {
|
||||
background-color: @btnPrimaryBackgroundHighlight;
|
||||
}
|
||||
.btn-warning.dropdown-toggle {
|
||||
background-color: @btnWarningBackgroundHighlight;
|
||||
}
|
||||
.btn-danger.dropdown-toggle {
|
||||
background-color: @btnDangerBackgroundHighlight;
|
||||
}
|
||||
.btn-success.dropdown-toggle {
|
||||
background-color: @btnSuccessBackgroundHighlight;
|
||||
}
|
||||
.btn-info.dropdown-toggle {
|
||||
background-color: @btnInfoBackgroundHighlight;
|
||||
}
|
||||
.btn-inverse.dropdown-toggle {
|
||||
background-color: @btnInverseBackgroundHighlight;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Reposition the caret
|
||||
.btn .caret {
|
||||
margin-top: 8px;
|
||||
margin-left: 0;
|
||||
}
|
||||
// Carets in other button sizes
|
||||
.btn-large .caret {
|
||||
margin-top: 6px;
|
||||
}
|
||||
.btn-large .caret {
|
||||
border-left-width: 5px;
|
||||
border-right-width: 5px;
|
||||
border-top-width: 5px;
|
||||
}
|
||||
.btn-mini .caret,
|
||||
.btn-small .caret {
|
||||
margin-top: 8px;
|
||||
}
|
||||
// Upside down carets for .dropup
|
||||
.dropup .btn-large .caret {
|
||||
border-bottom-width: 5px;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
// Account for other colors
|
||||
.btn-primary,
|
||||
.btn-warning,
|
||||
.btn-danger,
|
||||
.btn-info,
|
||||
.btn-success,
|
||||
.btn-inverse {
|
||||
.caret {
|
||||
border-top-color: @white;
|
||||
border-bottom-color: @white;
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
// Vertical button groups
|
||||
// ----------------------
|
||||
|
||||
.btn-group-vertical {
|
||||
display: inline-block; // makes buttons only take up the width they need
|
||||
.ie7-inline-block();
|
||||
}
|
||||
.btn-group-vertical > .btn {
|
||||
display: block;
|
||||
float: none;
|
||||
max-width: 100%;
|
||||
.border-radius(0);
|
||||
}
|
||||
.btn-group-vertical > .btn + .btn {
|
||||
margin-left: 0;
|
||||
margin-top: -1px;
|
||||
}
|
||||
.btn-group-vertical > .btn:first-child {
|
||||
.border-radius(@baseBorderRadius @baseBorderRadius 0 0);
|
||||
}
|
||||
.btn-group-vertical > .btn:last-child {
|
||||
.border-radius(0 0 @baseBorderRadius @baseBorderRadius);
|
||||
}
|
||||
.btn-group-vertical > .btn-large:first-child {
|
||||
.border-radius(@borderRadiusLarge @borderRadiusLarge 0 0);
|
||||
}
|
||||
.btn-group-vertical > .btn-large:last-child {
|
||||
.border-radius(0 0 @borderRadiusLarge @borderRadiusLarge);
|
||||
}
|
||||
@@ -189,11 +189,19 @@ input[type="button"] {
|
||||
}
|
||||
// Success appears as green
|
||||
.btn-success {
|
||||
.buttonBackground(@btnSuccessBackground, @btnSuccessBackgroundHighlight);
|
||||
.buttonBackground(@btnSuccessBackground, @btnSuccessBackgroundHighlight, @btnSuccessType);
|
||||
}
|
||||
// Info appears as a neutral blue
|
||||
.btn-info {
|
||||
.buttonBackground(@btnInfoBackground, @btnInfoBackgroundHighlight);
|
||||
.buttonBackground(@sand-5, @blueDark, @blueExtraDark, @u-white);
|
||||
}
|
||||
// Made for Umbraco, 2019
|
||||
.btn-action {
|
||||
.buttonBackground(@pinkLight, @blueDark, @blueExtraDark, @u-white);
|
||||
}
|
||||
// Made for Umbraco, 2019, used for buttons that has to stand back.
|
||||
.btn-white {
|
||||
.buttonBackground(@btnWhiteBackground, @btnWhiteBackgroundHighlight, @btnWhiteType, @btnWhiteTypeHover);
|
||||
}
|
||||
// Inverse appears as dark gray
|
||||
.btn-inverse {
|
||||
@@ -226,25 +234,27 @@ input[type="button"] {
|
||||
background: @green;
|
||||
color: @white;
|
||||
font-weight: bold;
|
||||
&:hover {
|
||||
&:hover {
|
||||
background: @green-d1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// outlined
|
||||
.btn-outline {
|
||||
border: 1px solid @gray-8;
|
||||
border: 1px solid;
|
||||
border-color: @gray-7;
|
||||
background: @white;
|
||||
color: @black;
|
||||
color: @blueExtraDark;
|
||||
padding: 5px 13px;
|
||||
transition: all .2s linear;
|
||||
}
|
||||
|
||||
.btn-outline:hover,
|
||||
.btn-outline:focus,
|
||||
.btn-outline:active {
|
||||
border-color: @gray-7;
|
||||
background: transparent;
|
||||
color: @black;
|
||||
border-color: @ui-light-type-hover;
|
||||
color: @ui-light-type-hover;
|
||||
background: @white;
|
||||
}
|
||||
|
||||
// Cross-browser Jank
|
||||
|
||||
@@ -113,7 +113,7 @@ a, a:hover{
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
/*
|
||||
.btn-success {
|
||||
color: #ffffff;
|
||||
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
|
||||
@@ -133,7 +133,7 @@ a, a:hover{
|
||||
.btn-success:hover {
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
*/
|
||||
.btn-group > .btn + .dropdown-toggle {
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
@@ -207,14 +207,14 @@ a, a:hover{
|
||||
clear: both;
|
||||
font-weight: normal;
|
||||
line-height: 20px;
|
||||
color: #343434;
|
||||
color: black;
|
||||
white-space: nowrap;
|
||||
cursor:pointer;
|
||||
}
|
||||
|
||||
.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus, .dropdown-submenu:hover > a, .dropdown-submenu:focus > a {
|
||||
color: #000000;
|
||||
background: #f8f8f8;
|
||||
background: #e4e0dd;
|
||||
}
|
||||
|
||||
/****************************/
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
.umb-app-header {
|
||||
background: @purple;
|
||||
background: @blueExtraDark;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
@@ -31,7 +31,7 @@
|
||||
}
|
||||
|
||||
.umb-app-header__action-icon {
|
||||
opacity: 0.6;
|
||||
opacity: 0.8;
|
||||
color: @white;
|
||||
font-size: 22px;
|
||||
}
|
||||
@@ -40,4 +40,3 @@
|
||||
.umb-app-header__action a:focus .umb-app-header__action-icon {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -31,5 +31,5 @@
|
||||
}
|
||||
|
||||
.umb-dashboard__header .umb-tabs-nav .umb-tab > a {
|
||||
padding-bottom: 23px;
|
||||
}
|
||||
padding-bottom: 25px;
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
right: 0;
|
||||
z-index: 10;
|
||||
width: @drawerWidth;
|
||||
background: @gray-9;
|
||||
background: @brownGrayLight;
|
||||
box-shadow: inset 5px 0 20px rgba(0,0,0,.3);
|
||||
}
|
||||
|
||||
|
||||
+18
-10
@@ -16,17 +16,22 @@
|
||||
border-bottom: 1px solid @gray-9;
|
||||
height: @editorHeaderHeight;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.umb-language-picker__toggle:hover {
|
||||
background: @gray-10;
|
||||
color: @ui-option-type;
|
||||
}
|
||||
|
||||
.umb-language-picker__expand {
|
||||
color: @gray-6;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.umb-language-picker__toggle:hover {
|
||||
background: @ui-option-hover;
|
||||
color:@ui-option-type-hover;
|
||||
.umb-language-picker__expand {
|
||||
color: @ui-option-type-hover;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.umb-language-picker__dropdown {
|
||||
width: 100%;
|
||||
background: @white;
|
||||
@@ -46,11 +51,14 @@
|
||||
|
||||
.umb-language-picker__dropdown a:hover,
|
||||
.umb-language-picker__dropdown a:focus {
|
||||
background: @gray-10;
|
||||
background: @ui-option-hover;
|
||||
text-decoration: none;
|
||||
color:@ui-option-type-hover;
|
||||
}
|
||||
|
||||
.umb-language-picker__dropdown-item--current {
|
||||
background-color: @gray-10;
|
||||
border-left: 2px solid @turquoise;
|
||||
}
|
||||
.umb-language-picker__dropdown a.umb-language-picker__dropdown-item--current {
|
||||
//background-color: @gray-10;
|
||||
padding-left: 16px;
|
||||
border-left: 4px solid @ui-light-active-border;
|
||||
color:@ui-light-active-type;
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.umb-card-list li{
|
||||
.umb-card-list li {
|
||||
border-bottom: @gray-10 1px solid;
|
||||
padding-bottom: 3px;
|
||||
display: block;
|
||||
@@ -123,15 +123,15 @@
|
||||
.umb-card-grid .umb-card-grid-item:focus,
|
||||
.umb-card-grid .umb-card-grid-item:hover > *,
|
||||
.umb-card-grid .umb-card-grid-item:focus > * {
|
||||
background: @gray-10;
|
||||
//color: white;
|
||||
background: @ui-option-hover;
|
||||
color: @ui-option-type-hover;
|
||||
cursor: pointer;
|
||||
outline: none;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
.umb-card-grid a {
|
||||
color: @gray-2;
|
||||
color: @ui-option-type;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
@@ -139,7 +139,7 @@
|
||||
font-size: 30px;
|
||||
line-height: 50px;
|
||||
display: block;
|
||||
color: @gray-3;
|
||||
color: @ui-option-type;
|
||||
}
|
||||
|
||||
.umb-card-grid .umb-card-grid-item__loading {
|
||||
@@ -164,9 +164,9 @@
|
||||
}
|
||||
|
||||
.umb-btn-round:hover, .umb-btn-round:hover *{
|
||||
background: @turquoise !important;
|
||||
background: @blueDark !important;
|
||||
color: @white !important;
|
||||
border-color: @turquoise !important;
|
||||
border-color: @blueDark !important;
|
||||
text-decoration:none;
|
||||
}
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
.umb-editor-header {
|
||||
background: @white;
|
||||
position: absolute;
|
||||
padding: 0 20px;
|
||||
padding-left: 20px;
|
||||
z-index: @zIndexEditor;
|
||||
border-bottom: 1px solid @gray-9;
|
||||
width: 100%;
|
||||
@@ -101,9 +101,6 @@ input.umb-editor-header__name-input {
|
||||
padding: 0 10px;
|
||||
background: @white;
|
||||
border: 1px solid @gray-8;
|
||||
&:hover {
|
||||
border-color: @turquoise-d1;
|
||||
}
|
||||
}
|
||||
|
||||
input.umb-editor-header__name-input:disabled {
|
||||
@@ -118,6 +115,14 @@ input.umb-editor-header__name-input:disabled {
|
||||
}
|
||||
|
||||
a.umb-editor-header__close-split-view {
|
||||
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
position: relative;
|
||||
height: 69px;
|
||||
width: 69px;
|
||||
|
||||
font-size: 20px;
|
||||
color: @gray-6;
|
||||
text-decoration: none !important;
|
||||
@@ -127,6 +132,15 @@ a.umb-editor-header__close-split-view:hover {
|
||||
color: @black;
|
||||
}
|
||||
|
||||
.umb-editor-header {
|
||||
.btn-white {
|
||||
height:69px;
|
||||
border-radius: 0;
|
||||
padding-left: 30px;
|
||||
padding-right: 30px;
|
||||
}
|
||||
}
|
||||
|
||||
/* variant switcher */
|
||||
.umb-variant-switcher__toggle {
|
||||
display: flex;
|
||||
@@ -138,22 +152,28 @@ a.umb-editor-header__close-split-view:hover {
|
||||
height: 30px;
|
||||
text-decoration: none !important;
|
||||
font-size: 13px;
|
||||
color: @gray-4;
|
||||
background-color: @white;
|
||||
//color: @gray-4;
|
||||
color: @ui-action-disgrete-type;
|
||||
//background-color: @white;
|
||||
}
|
||||
|
||||
a.umb-variant-switcher__toggle {
|
||||
transition: background-color 0.2s ease-in-out, color 0.2s ease-in-out;
|
||||
transition: color 0.2s ease-in-out;
|
||||
&:hover {
|
||||
background-color: @gray-10;
|
||||
//background-color: @gray-10;
|
||||
color: @ui-action-disgrete-type-hover;
|
||||
.umb-variant-switcher__expand {
|
||||
color: @ui-action-disgrete-type-hover;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.umb-variant-switcher__expand {
|
||||
color: @gray-7;
|
||||
color: @ui-action-disgrete-type;
|
||||
margin-top: 3px;
|
||||
margin-left: 5px;
|
||||
margin-right: -5px;
|
||||
transition: color 0.2s ease-in-out;
|
||||
}
|
||||
|
||||
.umb-variant-switcher__item {
|
||||
@@ -161,27 +181,30 @@ a.umb-variant-switcher__toggle {
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
border-bottom: 1px solid @gray-9;
|
||||
&:hover .umb-variant-switcher__name-wrapper {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
.umb-variant-switcher__item:last-child {
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
.umb-variant-switcher_item--current {
|
||||
color: @ui-light-active-type;
|
||||
}
|
||||
.umb-variant-switcher_item--current .umb-variant-switcher__name-wrapper {
|
||||
background-color: @gray-10;
|
||||
border-left: 2px solid @turquoise;
|
||||
//background-color: @gray-10;
|
||||
border-left: 4px solid @ui-active;
|
||||
}
|
||||
|
||||
.umb-variant-switcher__item:hover,
|
||||
.umb-variant-switcher__item:focus,
|
||||
.umb-variant-switcher__name-wrapper:hover,
|
||||
.umb-variant-switcher__name-wrapper:focus {
|
||||
background-color: @gray-10;
|
||||
.umb-variant-switcher__item:focus {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.umb-variant-switcher_item--not-allowed:not(.umb-variant-switcher_item--current) .umb-variant-switcher__name-wrapper:hover {
|
||||
background-color: @white !important;
|
||||
//background-color: @white !important;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
@@ -211,7 +234,12 @@ a.umb-variant-switcher__toggle {
|
||||
.umb-variant-switcher__split-view {
|
||||
font-size: 13px;
|
||||
display: none;
|
||||
padding: 8px 20px;
|
||||
padding: 16px 20px;
|
||||
|
||||
&:hover {
|
||||
background-color: @ui-option-hover;
|
||||
color: @ui-option-type-hover;
|
||||
}
|
||||
}
|
||||
|
||||
// container
|
||||
@@ -223,7 +251,7 @@ a.umb-variant-switcher__toggle {
|
||||
bottom: @editorFooterHeight;
|
||||
left: 0;
|
||||
overflow: auto;
|
||||
background: @gray-10;
|
||||
background: @brownGrayLight;
|
||||
}
|
||||
|
||||
.umb-editor-wrapper.-no-footer .umb-editor-container {
|
||||
|
||||
+7
@@ -48,10 +48,17 @@
|
||||
padding-right: 10px;
|
||||
}
|
||||
|
||||
.umb-editor-sub-header__content-left .umb-editor-sub-header__section {
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
.umb-editor-sub-header__content-left .umb-editor-sub-header__section:first-child {
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
.umb-editor-sub-header__content-right .umb-editor-sub-header__section {
|
||||
padding-right: 0;
|
||||
}
|
||||
.umb-editor-sub-header__content-right .umb-editor-sub-header__section:last-child {
|
||||
padding-right: 0;
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
background: @gray-10;
|
||||
background: @brownGrayLight;
|
||||
z-index: @zIndexEditor;
|
||||
}
|
||||
|
||||
@@ -44,4 +44,4 @@
|
||||
left: 0;
|
||||
background: rgba(0,0,0,0.4);
|
||||
z-index: @zIndexEditor;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,20 +2,20 @@
|
||||
padding: 15px;
|
||||
box-sizing: border-box;
|
||||
background-color: @turquoise-washed;
|
||||
border: 1px solid @turquoise;
|
||||
border: 1px solid @blueMid;
|
||||
}
|
||||
|
||||
.umb-alert--info {
|
||||
background-color: @turquoise-washed;
|
||||
border: 1px solid @turquoise;
|
||||
background-color: @blueLight;
|
||||
border: 1px solid @blueDark;
|
||||
}
|
||||
|
||||
.umb-alert--warning {
|
||||
background-color: @yellow-washed;
|
||||
border: 1px solid @yellow;
|
||||
background-color: @pinkLight;
|
||||
border: 1px solid @pink;
|
||||
}
|
||||
|
||||
.umb-alert--danger {
|
||||
background-color: @red-washed;
|
||||
border: 1px solid @red;
|
||||
background-color: @pinkLight;
|
||||
border: 1px solid @pink;
|
||||
}
|
||||
|
||||
@@ -13,6 +13,10 @@
|
||||
cursor: pointer;
|
||||
justify-content: space-between;
|
||||
color: @black;
|
||||
|
||||
&:hover .umb-expansion-panel__expand {
|
||||
color: @gray-6;
|
||||
}
|
||||
}
|
||||
|
||||
.umb-expansion-panel__expand {
|
||||
@@ -22,4 +26,4 @@
|
||||
.umb-expansion-panel__content {
|
||||
padding: 20px;
|
||||
border-top: 1px solid @gray-9;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,8 +15,10 @@
|
||||
}
|
||||
|
||||
.umb-overlay .umb-overlay-header {
|
||||
background: @gray-10;
|
||||
//background: @gray-10;
|
||||
border-bottom: 1px solid @purple-l3;
|
||||
//background: @blueExtraDark;
|
||||
//color:@u-white;
|
||||
padding: 10px;
|
||||
margin-top: 0;
|
||||
flex-grow: 0;
|
||||
|
||||
@@ -10,4 +10,5 @@
|
||||
animation-timing-function: ease-in;
|
||||
animation: fadeIn;
|
||||
margin-top: 15px;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
.icon {
|
||||
font-size: 18px;
|
||||
vertical-align: middle;
|
||||
color: @gray-3;
|
||||
//color: @gray-3;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2,7 +2,11 @@
|
||||
display: block;
|
||||
min-width: 100%;
|
||||
width: auto;
|
||||
|
||||
|
||||
.umb-tree-item__label {
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
&:hover ins {
|
||||
visibility: visible;
|
||||
cursor: pointer
|
||||
@@ -14,17 +18,17 @@
|
||||
&:hover .umb-tree-item__label {
|
||||
overflow: hidden;
|
||||
margin-right: 6px;
|
||||
}
|
||||
}
|
||||
|
||||
// Loading Animation
|
||||
// ------------------------
|
||||
.l {
|
||||
width: 100%;
|
||||
height: 1px;
|
||||
height: 2px;
|
||||
overflow: hidden;
|
||||
position: absolute;
|
||||
left: 0;
|
||||
bottom: 0;
|
||||
bottom: -1px;
|
||||
|
||||
div {
|
||||
.umb-loader;
|
||||
@@ -42,13 +46,14 @@
|
||||
|
||||
.umb-tree-item.current > .umb-tree-item__inner {
|
||||
|
||||
background: @turquoise-d1;
|
||||
background: @ui-active;
|
||||
color:@ui-active-type;
|
||||
|
||||
// override small icon color. TODO => check usage
|
||||
// &:before {
|
||||
// color: @turquoise-l2;
|
||||
// }
|
||||
|
||||
&:before {
|
||||
color: @blue;
|
||||
}
|
||||
|
||||
.umb-options {
|
||||
|
||||
&:hover i {
|
||||
@@ -56,8 +61,8 @@
|
||||
}
|
||||
|
||||
i {
|
||||
background: @white;
|
||||
border-color: @turquoise-d1;
|
||||
background: @ui-active-type;
|
||||
//border-color: @ui-active;
|
||||
transition: opacity 120ms ease;
|
||||
}
|
||||
}
|
||||
@@ -65,8 +70,8 @@
|
||||
a,
|
||||
.umb-tree-icon,
|
||||
ins {
|
||||
color: @white !important;
|
||||
background-color: @turquoise-d1;
|
||||
border-color: @turquoise-d1;
|
||||
color: @ui-active-type !important;
|
||||
//background-color: @ui-active;
|
||||
//border-color: @ui-active;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
margin: 0;
|
||||
width: 100%;
|
||||
display: flex;
|
||||
color: @gray-2;
|
||||
}
|
||||
|
||||
.umb-options {
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
a, a:hover {
|
||||
outline: none;
|
||||
text-decoration: none;
|
||||
|
||||
// TODO => confirm not in use
|
||||
|
||||
// TODO: => confirm not in use
|
||||
// &.noSpr {
|
||||
// background-position: 0
|
||||
// }
|
||||
@@ -28,10 +28,11 @@
|
||||
visibility: hidden;
|
||||
text-decoration: none;
|
||||
font-size: 12px;
|
||||
transition: opacity 120ms ease;
|
||||
transition: color 120ms;
|
||||
|
||||
&:hover {
|
||||
opacity: .7;
|
||||
//opacity: .7;
|
||||
color: @ui-option-type-hover;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -86,6 +87,23 @@ body.touch .umb-tree {
|
||||
}
|
||||
}
|
||||
|
||||
// active is equivilant to selected, its the item that is begin affected by the actions performed in the right-click-dialog.
|
||||
.umb-tree-item > .umb-tree-item__inner.active {
|
||||
//background: @ui-selected;
|
||||
border-color: @ui-selected-border;
|
||||
color: @ui-selected-type;
|
||||
a {
|
||||
color: @ui-selected-type;
|
||||
}
|
||||
&:hover {
|
||||
//background: @ui-selected-hover;
|
||||
border-color: @ui-selected-border-hover;
|
||||
color: @ui-selected-type-hover;
|
||||
a {
|
||||
color: @ui-selected-type-hover;
|
||||
}
|
||||
}
|
||||
}
|
||||
.umb-tree-root, .umb-tree-item__inner {
|
||||
padding: 0;
|
||||
position: relative;
|
||||
@@ -93,17 +111,29 @@ body.touch .umb-tree {
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
align-items: center;
|
||||
|
||||
&.active {
|
||||
background: @gray-10;
|
||||
|
||||
border:2px dashed transparent;
|
||||
|
||||
color: @ui-option-type;
|
||||
a {
|
||||
color: @ui-option-type;
|
||||
}
|
||||
|
||||
|
||||
&:hover {
|
||||
background: @gray-10;
|
||||
|
||||
background: @ui-option-hover;
|
||||
|
||||
color: @ui-option-type-hover;
|
||||
a {
|
||||
color: @ui-option-type-hover;
|
||||
}
|
||||
|
||||
> .umb-options {
|
||||
visibility: visible;
|
||||
}
|
||||
|
||||
.umb-tree-icon {
|
||||
color: @ui-option-type-hover;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -245,7 +275,7 @@ body.touch .umb-tree {
|
||||
|
||||
.is-container::before {
|
||||
content: "\e04e";
|
||||
color: @turquoise;
|
||||
color: @blue;
|
||||
font-size: 8px;
|
||||
padding-left: 13px;
|
||||
padding-top: 8px;
|
||||
@@ -273,7 +303,8 @@ body.touch .umb-tree {
|
||||
.umb-tree-icon {
|
||||
vertical-align: middle;
|
||||
margin: 0 13px 0 0;
|
||||
color: @gray-1;
|
||||
//color: @gray-1;
|
||||
color: @ui-option-type;
|
||||
font-size: 20px;
|
||||
|
||||
&.blue {
|
||||
|
||||
@@ -70,13 +70,13 @@
|
||||
}
|
||||
|
||||
.umb-avatar--primary {
|
||||
background-color: @turquoise-l1;
|
||||
color: @white;
|
||||
background-color: @pinkLight;
|
||||
color: @blueExtraDark;
|
||||
}
|
||||
|
||||
.umb-avatar--secondary {
|
||||
background-color: @purple-l3;
|
||||
color: @white;
|
||||
background-color: @pinkLight;
|
||||
color: @blueExtraDark;
|
||||
}
|
||||
|
||||
.umb-avatar--success {
|
||||
@@ -114,4 +114,4 @@ a.umb-avatar-btn .umb-avatar span {
|
||||
font-size: 50px;
|
||||
}
|
||||
|
||||
/*border-radius: 50%; width: 100px; height: 100px; font-size: 50px; text-align: center; display: flex; align-items: center; justify-content: center; background-color: #F3F3F5; border: 2px dashed #A2A1A6; color: #A2A1A6;*/
|
||||
/*border-radius: 50%; width: 100px; height: 100px; font-size: 50px; text-align: center; display: flex; align-items: center; justify-content: center; background-color: #F3F3F5; border: 2px dashed #A2A1A6; color: #A2A1A6;*/
|
||||
|
||||
@@ -10,27 +10,27 @@
|
||||
|
||||
// Colors
|
||||
.umb-badge--primary {
|
||||
background-color: @turquoise;
|
||||
background-color: @blueDark;
|
||||
color: @white;
|
||||
}
|
||||
|
||||
.umb-badge--secondary {
|
||||
background-color: @purple;
|
||||
background-color: @blueExtraDark;
|
||||
color: @white;
|
||||
}
|
||||
|
||||
.umb-badge--gray {
|
||||
background-color: @gray-8;
|
||||
color: @gray-4;
|
||||
background-color: @sand-2;
|
||||
color: @blueDark;
|
||||
}
|
||||
|
||||
.umb-badge--danger {
|
||||
background-color: @red-l1;
|
||||
background-color: @red;
|
||||
color: @white;
|
||||
}
|
||||
|
||||
.umb-badge--warning {
|
||||
background-color: @yellow-d1;
|
||||
background-color: @orange;
|
||||
color: @white;
|
||||
}
|
||||
|
||||
@@ -68,4 +68,4 @@
|
||||
.umb-badge--xl {
|
||||
font-size: 20px;
|
||||
padding: 6px 8px;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,6 +19,13 @@
|
||||
cursor: pointer;
|
||||
text-align: center;
|
||||
justify-content: center;
|
||||
|
||||
color:@ui-action-type;
|
||||
&:hover {
|
||||
color:@ui-action-type-hover;
|
||||
border-color:@ui-action-type-hover;
|
||||
text-decoration:none;
|
||||
}
|
||||
}
|
||||
|
||||
.umb-child-selector__children-container {
|
||||
@@ -44,11 +51,11 @@
|
||||
.umb-child-selector__child-name {
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
/*
|
||||
.umb-child-selector__child-name.-blue {
|
||||
color: @turquoise-d1;
|
||||
}
|
||||
|
||||
*/
|
||||
.umb-child-selector__child-actions {
|
||||
flex: 0 0 50px;
|
||||
text-align: right;
|
||||
|
||||
@@ -57,10 +57,6 @@
|
||||
.umb-color-box__label {
|
||||
background: @white;
|
||||
font-size: 14px;
|
||||
display: flex;
|
||||
flex-flow: column wrap;
|
||||
flex: 1 0 100%;
|
||||
justify-content: flex-end;
|
||||
padding: 1px 5px;
|
||||
min-height: 45px;
|
||||
max-width: 100%;
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
display: inline-flex;
|
||||
}
|
||||
|
||||
.umb-content-grid__item-name:hover {
|
||||
.umb-content-grid__item-name:hover span {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
cursor: pointer;
|
||||
display: block;
|
||||
padding: 4px 10px 0 10px;
|
||||
border-bottom: 2px solid transparent;
|
||||
//border-bottom: 4px solid transparent;
|
||||
min-width: 70px;
|
||||
border-right: 1px solid @gray-9;
|
||||
box-sizing: border-box;
|
||||
@@ -20,6 +20,25 @@
|
||||
justify-content: center;
|
||||
height: @editorHeaderHeight;
|
||||
position: relative;
|
||||
|
||||
color: @ui-active-type;
|
||||
|
||||
&:hover {
|
||||
color: @ui-active-type-hover !important;
|
||||
}
|
||||
|
||||
&::after {
|
||||
content: "";
|
||||
height: 0px;
|
||||
left: 8px;
|
||||
right: 8px;
|
||||
background-color: @ui-light-active-border;
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
border-radius: 3px 3px 0 0;
|
||||
opacity: 0;
|
||||
transition: all .2s linear;
|
||||
}
|
||||
}
|
||||
|
||||
.umb-sub-views-nav-item:focus {
|
||||
@@ -32,8 +51,16 @@
|
||||
}
|
||||
|
||||
.umb-sub-views-nav-item.is-active {
|
||||
color: @turquoise-d1;
|
||||
border-bottom-color: @turquoise-d1;
|
||||
//color: @ui-active;
|
||||
//border-bottom-color: @ui-active;
|
||||
|
||||
//background-color: rgba(@ui-active, 0.25);
|
||||
color: @ui-light-active-type;
|
||||
//border-bottom-color: @ui-active;
|
||||
&::after {
|
||||
opacity: 1;
|
||||
height: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
.show-validation .umb-sub-views-nav-item.-has-error {
|
||||
@@ -53,7 +80,7 @@
|
||||
right: 6px;
|
||||
min-width: 16px;
|
||||
color: @white;
|
||||
background-color: @turquoise-d1;
|
||||
background-color: @ui-active-type;
|
||||
border: 2px solid @white;
|
||||
border-radius: 50%;
|
||||
font-size: 10px;
|
||||
@@ -63,7 +90,7 @@
|
||||
display: block;
|
||||
|
||||
&.-type-alert {
|
||||
background-color: @red-l1;
|
||||
background-color: @red;
|
||||
}
|
||||
&.-type-warning {
|
||||
background-color: @yellow-d2;
|
||||
@@ -98,7 +125,7 @@
|
||||
|
||||
// make dots green the an item is active
|
||||
.umb-sub-views-nav-item.is-active .umb-sub-views-nav-item__more i {
|
||||
background-color: @turquoise-d1;
|
||||
background-color: @ui-active;
|
||||
}
|
||||
|
||||
.umb-sub-views-nav__dropdown.umb-sub-views-nav__dropdown {
|
||||
|
||||
@@ -43,14 +43,14 @@
|
||||
// file select link
|
||||
.file-select {
|
||||
font-size: 15px;
|
||||
color: @turquoise-d1;
|
||||
color: @ui-action-disgrete-type;
|
||||
cursor: pointer;
|
||||
|
||||
margin-top: 10px;
|
||||
|
||||
&:hover {
|
||||
color: @turquoise-d1;
|
||||
text-decoration: underline;
|
||||
color: @ui-action-disgrete-type-hover;
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -13,9 +13,9 @@ span.flatpickr-day:hover {
|
||||
}
|
||||
|
||||
span.flatpickr-day.selected {
|
||||
background-color: @turquoise;
|
||||
background-color: @ui-selected;
|
||||
}
|
||||
|
||||
span.flatpickr-day.selected:hover {
|
||||
background-color: @turquoise-d1;
|
||||
}
|
||||
background-color: @ui-selected-hover;
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
padding: 10px 20px;
|
||||
box-sizing: border-box;
|
||||
flex: 1 1 200px;
|
||||
border: 1px solid transparent;
|
||||
border: 2px dashed transparent;
|
||||
transition: border 0.2s;
|
||||
position: relative;
|
||||
justify-content: space-between;
|
||||
@@ -22,8 +22,24 @@
|
||||
user-select: none;
|
||||
box-shadow: 0 1px 1px 0 rgba(0,0,0,0.16);
|
||||
border-radius: 3px;
|
||||
|
||||
transition: box-shadow 150ms ease-in-out;
|
||||
}
|
||||
|
||||
.umb-folder-grid__folder.-selected {
|
||||
box-shadow: 0 2px 8px 0 darken(@ui-selected-border, 20);
|
||||
|
||||
//background: @ui-selected;
|
||||
color:@ui-selected-type;
|
||||
border-color:@ui-selected-border;
|
||||
|
||||
&:hover {
|
||||
color:@ui-selected-type-hover;
|
||||
border-color:@ui-selected-border-hover;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.umb-folder-grid__folder:focus,
|
||||
.umb-folder-grid__folder:active {
|
||||
text-decoration: none;
|
||||
@@ -31,8 +47,6 @@
|
||||
|
||||
.umb-folder-grid__folder:hover {
|
||||
text-decoration: none;
|
||||
box-shadow: 0 3px 6px 0 rgba(0,0,0,0.16);
|
||||
transition: box-shadow 150ms ease-in-out;
|
||||
}
|
||||
|
||||
.umb-folder-grid__folder-description {
|
||||
@@ -57,7 +71,7 @@
|
||||
.umb-folder-grid__folder-name:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
/*
|
||||
.umb-folder-grid__action {
|
||||
opacity: 0;
|
||||
border: 2px solid @white;
|
||||
@@ -78,3 +92,4 @@
|
||||
opacity: 1;
|
||||
background: @green;
|
||||
}
|
||||
*/
|
||||
|
||||
@@ -28,6 +28,13 @@
|
||||
border: 1px dashed @gray-8;
|
||||
background: none;
|
||||
cursor: pointer;
|
||||
|
||||
color: @ui-option-type;
|
||||
&:hover {
|
||||
color: @ui-option-type-hover;
|
||||
border-color: @ui-option-type-hover;
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
|
||||
.umb-grid-selector__item-content {
|
||||
@@ -48,7 +55,7 @@
|
||||
}
|
||||
|
||||
.umb-grid-selector__item-label.-blue {
|
||||
color: @turquoise-d1;
|
||||
color: @ui-option-type;
|
||||
}
|
||||
|
||||
.umb-grid-selector__item-remove {
|
||||
@@ -56,6 +63,10 @@
|
||||
top: 5px;
|
||||
right: 5px;
|
||||
cursor: pointer;
|
||||
color: @ui-option-type;
|
||||
&:hover {
|
||||
color: @ui-option-type-hover;
|
||||
}
|
||||
}
|
||||
|
||||
.umb-grid-selector__item-default-label {
|
||||
@@ -64,9 +75,15 @@
|
||||
}
|
||||
|
||||
.umb-grid-selector__item-default-label.-blue {
|
||||
color: @turquoise-d1;
|
||||
color: @ui-option-type;
|
||||
&:hover {
|
||||
color: @ui-option-type-hover;
|
||||
}
|
||||
}
|
||||
|
||||
.umb-grid-selector__item-add {
|
||||
color: @turquoise-d1;
|
||||
color: @ui-option-type;
|
||||
&:hover {
|
||||
color: @ui-option-type-hover;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
// TODO General cleanup in !important (Round 2)
|
||||
// TODO: General cleanup in !important (Round 2)
|
||||
|
||||
// Gridview
|
||||
// -------------------------
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
}
|
||||
|
||||
.umb-group-builder__group.-active {
|
||||
border-color: @turquoise;
|
||||
border-color: @ui-active;
|
||||
}
|
||||
|
||||
.umb-group-builder__group.-inherited {
|
||||
@@ -33,10 +33,15 @@
|
||||
align-items: center;
|
||||
cursor: pointer;
|
||||
border: 1px dashed @gray-7;
|
||||
color: @turquoise-d1;
|
||||
color: @ui-action-type;
|
||||
font-weight: bold;
|
||||
position: relative;
|
||||
box-shadow: none;
|
||||
&:hover {
|
||||
color:@ui-action-type-hover;
|
||||
text-decoration: none;
|
||||
border-color: @ui-active-type-hover;
|
||||
}
|
||||
}
|
||||
|
||||
.umb-group-builder__group.-sortable {
|
||||
@@ -61,11 +66,12 @@
|
||||
position: relative;
|
||||
margin-left: auto;
|
||||
font-size: 18px;
|
||||
color: @ui-icon;
|
||||
}
|
||||
|
||||
.umb-group-builder__group-remove:hover {
|
||||
cursor: pointer;
|
||||
color: @turquoise;
|
||||
color: @ui-icon-hover;
|
||||
}
|
||||
|
||||
.umb-group-builder__group-title-wrapper {
|
||||
@@ -296,10 +302,11 @@ input.umb-group-builder__group-title-input:disabled:hover {
|
||||
font-size: 18px;
|
||||
position: relative;
|
||||
cursor: pointer;
|
||||
color: @ui-icon;
|
||||
}
|
||||
|
||||
.umb-group-builder__property-action:hover {
|
||||
color: @turquoise;
|
||||
color: @ui-icon-hover;
|
||||
}
|
||||
|
||||
.umb-group-builder__property-tags {
|
||||
@@ -409,20 +416,21 @@ input.umb-group-builder__group-sort-value {
|
||||
}
|
||||
|
||||
.editor-placeholder {
|
||||
border: 1px dashed @gray-8;
|
||||
border: 1px dashed @ui-action-border;
|
||||
width: 100%;
|
||||
height: 80px;
|
||||
line-height: 80px;
|
||||
text-align: center;
|
||||
display: block;
|
||||
border-radius: 5px;
|
||||
color: @gray-3;
|
||||
font-weight: bold;
|
||||
font-size: 14px;
|
||||
color: @turquoise-d1;
|
||||
|
||||
color: @ui-action-type;
|
||||
|
||||
&:hover {
|
||||
text-decoration: none;
|
||||
color:@ui-action-type-hover;
|
||||
border-color:@ui-action-border-hover;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -493,4 +501,4 @@ input.umb-group-builder__group-sort-value {
|
||||
label.checkbox.no-indent {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
.umb-iconpicker-item.-selected {
|
||||
background: @gray-10;
|
||||
border: solid 1px @turquoise-d1;
|
||||
border: solid 1px @ui-active;
|
||||
border-radius: @baseBorderRadius;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
@@ -4,23 +4,24 @@
|
||||
}
|
||||
|
||||
.umb-insert-code-box {
|
||||
border: 2px solid @gray-10;
|
||||
border: 1px solid @gray-10;
|
||||
padding: 15px 20px;
|
||||
margin-bottom: 10px;
|
||||
border-radius: 3px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.umb-insert-code-box:hover,
|
||||
.umb-insert-code-box:hover,
|
||||
.umb-insert-code-box.-selected {
|
||||
border-color: @turquoise;
|
||||
cursor: pointer;
|
||||
background-color: @ui-option-hover;
|
||||
color: @ui-action-type-hover;
|
||||
//border-color: @ui-action-border-hover;
|
||||
}
|
||||
|
||||
.umb-insert-code-box__title {
|
||||
font-size: 15px;
|
||||
margin-bottom: 5px;
|
||||
font-weight: bold;
|
||||
color: @black;
|
||||
}
|
||||
|
||||
.umb-insert-code-box__description {
|
||||
@@ -31,7 +32,7 @@
|
||||
.umb-insert-code-box__check {
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
background: @gray-10;
|
||||
background: @gray-10;x
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
@@ -34,11 +34,12 @@
|
||||
|
||||
.umb-list-view-settings__create-new {
|
||||
font-size: 13px;
|
||||
color: @turquoise-d1;
|
||||
color: @ui-action-type;
|
||||
}
|
||||
|
||||
.umb-list-view-settings__create-new:hover {
|
||||
color: @turquoise-d1;
|
||||
color: @ui-action-type-hover;
|
||||
border-color: @ui-action-type-hover;
|
||||
}
|
||||
|
||||
.umb-list-view-settings__remove-new {
|
||||
|
||||
@@ -23,16 +23,30 @@
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
cursor: pointer;
|
||||
|
||||
|
||||
border: 2px dashed transparent;
|
||||
box-shadow: 0 1px 1px 0 rgba(0,0,0,.2);
|
||||
|
||||
transition: box-shadow 100ms;
|
||||
|
||||
transition: box-shadow 150ms ease-in-out;
|
||||
}
|
||||
|
||||
.umb-media-grid__item.-file {
|
||||
background-color: @white;
|
||||
}
|
||||
|
||||
.umb-media-grid__item.-selected {
|
||||
box-shadow: 0 2px 8px 0 darken(@ui-selected-border, 20);
|
||||
|
||||
//background: @ui-selected;
|
||||
color:@ui-selected-type;
|
||||
border-color:@ui-selected-border;
|
||||
|
||||
&:hover {
|
||||
color:@ui-selected-type-hover;
|
||||
border-color:@ui-selected-border-hover;
|
||||
}
|
||||
}
|
||||
|
||||
.umb-media-grid__item-file-icon > span {
|
||||
color: @white;
|
||||
background: @gray-4;
|
||||
@@ -45,10 +59,6 @@
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.umb-media-grid__item.-selected {
|
||||
box-shadow: 0 2px 8px 0 rgba(0,0,0,.35);
|
||||
}
|
||||
|
||||
.umb-media-grid__item:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
@@ -90,12 +100,13 @@
|
||||
box-sizing: border-box;
|
||||
font-size: 12px;
|
||||
overflow: hidden;
|
||||
color: @white;
|
||||
color: @black;
|
||||
white-space: nowrap;
|
||||
background: @purple;
|
||||
border-top:1px solid @gray-9;
|
||||
background: @white;
|
||||
transition: opacity 150ms;
|
||||
}
|
||||
|
||||
/*
|
||||
.umb-media-grid__item.-file .umb-media-grid__item-overlay {
|
||||
opacity: 1;
|
||||
color: @gray-4;
|
||||
@@ -105,9 +116,9 @@
|
||||
.umb-media-grid__item.-file:hover .umb-media-grid__item-overlay,
|
||||
.umb-media-grid__item.-file.-selected .umb-media-grid__item-overlay {
|
||||
color: @white;
|
||||
background: @purple;
|
||||
background: @blueExtraDark;
|
||||
}
|
||||
|
||||
*/
|
||||
.umb-media-grid__info {
|
||||
margin-right: 5px;
|
||||
}
|
||||
@@ -134,7 +145,7 @@
|
||||
font-size: 40px !important;
|
||||
transform: translate(-50%,-50%);
|
||||
}
|
||||
|
||||
/*
|
||||
.umb-media-grid__checkmark {
|
||||
position: absolute;
|
||||
z-index: 2;
|
||||
@@ -152,7 +163,7 @@
|
||||
color: @white;
|
||||
transition: background 100ms;
|
||||
}
|
||||
|
||||
*/
|
||||
.umb-media-grid__edit {
|
||||
position: absolute;
|
||||
opacity: 0;
|
||||
|
||||
@@ -71,12 +71,12 @@
|
||||
margin-right: 5px;
|
||||
font-size: 13px;
|
||||
font-weight: bold;
|
||||
color: @gray-5;
|
||||
color: @ui-action-type;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.umb-node-preview__action:hover {
|
||||
color: @turquoise;
|
||||
color: @ui-action-type-hover;
|
||||
text-decoration: none;
|
||||
opacity: 1;
|
||||
}
|
||||
@@ -90,14 +90,16 @@
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border: 1px dashed @gray-7;
|
||||
color: @turquoise-d1;
|
||||
color: @ui-action-type;
|
||||
font-weight: bold;
|
||||
padding: 5px 15px;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.umb-node-preview-add:hover {
|
||||
color: @turquoise-d1;
|
||||
color: @ui-action-type-hover;
|
||||
border-color: @ui-action-type-hover;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.umb-editor-wrapper .umb-node-preview-add {
|
||||
@@ -112,4 +114,4 @@
|
||||
.umb-node-preview-add {
|
||||
max-width: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
position: relative;
|
||||
width: 500px;
|
||||
height: 300px;
|
||||
border: 2px dashed @gray-8;
|
||||
border: 2px dashed @ui-action-border;
|
||||
border-radius: 3px;
|
||||
background: @white;
|
||||
display: flex;
|
||||
@@ -22,10 +22,9 @@
|
||||
align-items: center;
|
||||
margin-bottom: 30px;
|
||||
transition: 100ms box-shadow ease, 100ms border ease;
|
||||
|
||||
&:hover,
|
||||
|
||||
&.drag-over {
|
||||
border-color: @turquoise;
|
||||
border-color: @ui-action-border-hover;
|
||||
border-style: solid;
|
||||
box-shadow: 0 3px 8px rgba(0,0,0, .1);
|
||||
transition: 100ms box-shadow ease, 100ms border ease;
|
||||
@@ -34,18 +33,19 @@
|
||||
|
||||
.umb-upload-local__dropzone i {
|
||||
display: block;
|
||||
color: @gray-8;
|
||||
color: @ui-action-type;
|
||||
font-size: 110px;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.umb-upload-local__select-file {
|
||||
font-weight: bold;
|
||||
color: @turquoise-d1;
|
||||
color: @ui-action-type;
|
||||
cursor: pointer;
|
||||
|
||||
&:hover {
|
||||
text-decoration: underline;
|
||||
color: @ui-action-type-hover;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
}
|
||||
|
||||
.umb-progress-circle__highlight--primary {
|
||||
stroke: @turquoise;
|
||||
stroke: @blue;
|
||||
}
|
||||
|
||||
.umb-progress-circle__highlight--secondary {
|
||||
|
||||
@@ -14,24 +14,54 @@
|
||||
}
|
||||
|
||||
.umb-tab > a {
|
||||
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
position: relative;
|
||||
|
||||
cursor: pointer;
|
||||
border-bottom: 2px solid transparent;
|
||||
color: @gray-3;
|
||||
//border-bottom: 4px solid transparent;
|
||||
color: @ui-light-type;
|
||||
padding: 5px 20px 15px 20px;
|
||||
transition: color 150ms ease-in-out;
|
||||
&:focus {
|
||||
color: @ui-light-type-hover;
|
||||
}
|
||||
&:hover {
|
||||
color: @ui-light-type-hover;
|
||||
text-decoration: none;
|
||||
}
|
||||
&::after {
|
||||
content: "";
|
||||
height: 0px;
|
||||
left: 14px;
|
||||
right: 14px;
|
||||
background-color: @ui-light-active-border;
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
border-radius: 3px 3px 0 0;
|
||||
opacity: 0;
|
||||
transition: all .2s linear;
|
||||
}
|
||||
}
|
||||
|
||||
.umb-tab > a:hover,
|
||||
.umb-tab > a:focus {
|
||||
color: @black;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.umb-tab--active > a,
|
||||
.umb-tab--active > a:hover,
|
||||
.umb-tab--active > a:focus {
|
||||
color: @black;
|
||||
border-bottom-color: @turquoise;
|
||||
.umb-tab--active > a {
|
||||
color: @ui-light-active-type;
|
||||
//border-bottom-color: @ui-active;
|
||||
/*
|
||||
&:focus {
|
||||
border-bottom-color: @ui-active;
|
||||
}
|
||||
&:hover {
|
||||
border-bottom-color: @ui-active-type-hover;
|
||||
}
|
||||
*/
|
||||
&::after {
|
||||
opacity: 1;
|
||||
height: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
.show-validation .umb-tab--error > a,
|
||||
@@ -72,4 +102,4 @@
|
||||
display: inline-block;
|
||||
margin: 0 5px 0 0;
|
||||
opacity: .6;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -133,4 +133,4 @@
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -201,7 +201,7 @@ input[type="color"],
|
||||
margin-bottom: @baseLineHeight / 2;
|
||||
font-size: @baseFontSize;
|
||||
line-height: @baseLineHeight;
|
||||
color: @gray-3;
|
||||
color: @gray-2;
|
||||
.border-radius(@inputBorderRadius);
|
||||
vertical-align: middle;
|
||||
box-sizing: border-box;
|
||||
@@ -243,11 +243,12 @@ input[type="color"],
|
||||
.uneditable-input {
|
||||
background-color: @inputBackground;
|
||||
border: 1px solid @inputBorder;
|
||||
|
||||
.transition(~"border linear .2s, box-shadow linear .2s");
|
||||
|
||||
// Focus state
|
||||
&:focus {
|
||||
border-color: none;
|
||||
border-color: @inputBorderFocus;
|
||||
outline: 0;
|
||||
outline: none \9; /* IE6-9 */
|
||||
}
|
||||
@@ -368,7 +369,7 @@ textarea {
|
||||
}
|
||||
|
||||
// Radios and checkboxes on same line
|
||||
// TODO v3: Convert .inline to .control-inline
|
||||
// TODO: v3: Convert .inline to .control-inline
|
||||
.radio.inline,
|
||||
.checkbox.inline {
|
||||
display: inline-block;
|
||||
|
||||
@@ -3,14 +3,6 @@
|
||||
|
||||
.umb-listview{width: auto !important;}
|
||||
|
||||
.dropdown-menu > li > a:hover,
|
||||
.dropdown-menu > li > a:focus,
|
||||
.dropdown-submenu:hover > a,
|
||||
.dropdown-submenu:focus > a {
|
||||
color: @black;
|
||||
background: @gray-10;
|
||||
}
|
||||
|
||||
.umb-listview table {
|
||||
border: 1px solid @gray-8;
|
||||
}
|
||||
@@ -254,8 +246,8 @@
|
||||
|
||||
.list-view-add-layout {
|
||||
margin-top: 10px;
|
||||
color: @turquoise-d1;
|
||||
border: 1px dashed @gray-8;
|
||||
color: @ui-action-disgrete-type;
|
||||
border: 1px dashed @ui-action-disgrete-border;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
@@ -265,4 +257,6 @@
|
||||
|
||||
.list-view-add-layout:hover {
|
||||
text-decoration: none;
|
||||
color: @ui-action-disgrete-type-hover;
|
||||
border-color: @ui-action-disgrete-border-hover;
|
||||
}
|
||||
|
||||
@@ -120,7 +120,7 @@ h5.-black {
|
||||
margin: 20px;
|
||||
}
|
||||
.umb-control-group {
|
||||
border-bottom: 1px solid @gray-10;
|
||||
border-bottom: 1px solid @gray-11;
|
||||
padding-bottom: 20px;
|
||||
margin-bottom: 15px !important;
|
||||
}
|
||||
@@ -495,7 +495,7 @@ table thead a {
|
||||
// ------------------------
|
||||
|
||||
.umb-loader{
|
||||
background-color: @turquoise-d1;
|
||||
background-color: @blue;
|
||||
margin-top:0;
|
||||
margin-left:-100%;
|
||||
-moz-animation-name:bounce_loadingProgressG;
|
||||
@@ -519,7 +519,7 @@ animation-duration:1s;
|
||||
animation-iteration-count:infinite;
|
||||
animation-timing-function:linear;
|
||||
width:100%;
|
||||
height:1px;
|
||||
height:2px;
|
||||
}
|
||||
|
||||
|
||||
@@ -671,4 +671,3 @@ input[type=checkbox]:checked + .input-label--small {
|
||||
width: 1px !important;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
|
||||
@@ -515,28 +515,39 @@
|
||||
|
||||
// Button backgrounds
|
||||
// ------------------
|
||||
.buttonBackground(@startColor, @endColor, @textColor: #fff) {
|
||||
.buttonBackground(@startColor, @hoverColor: @startColor, @textColor: #fff, @textColorHover: @textColor) {
|
||||
// gradientBar will set the background to a pleasing blend of these, to support IE<=9
|
||||
.gradientBar(@startColor, @endColor, @textColor);
|
||||
*background-color: @endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */
|
||||
//.gradientBar(@startColor, @endColor, @textColor);
|
||||
|
||||
color: @textColor;
|
||||
border-color: @startColor @startColor darken(@startColor, 15%);
|
||||
border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
|
||||
|
||||
background-color: @startColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */
|
||||
.reset-filter();
|
||||
|
||||
// button states
|
||||
&:hover, &:focus, &:active {
|
||||
background-color: darken(@startColor, 2%);
|
||||
|
||||
.caret {
|
||||
border-top-color: @textColor;
|
||||
border-bottom-color: @textColor;
|
||||
}
|
||||
|
||||
// in these cases the gradient won't cover the background, so we override
|
||||
&:hover, &:focus, &:active, &.active, &.disabled, &[disabled] {
|
||||
color: @textColor;
|
||||
*background-color: darken(@endColor, 5%);
|
||||
&:hover, &:focus, &:active, &.active {
|
||||
color: @textColorHover;
|
||||
background-color: @hoverColor;
|
||||
}
|
||||
|
||||
|
||||
&.disabled, &[disabled] {
|
||||
color: @white;
|
||||
background-color: @sand-2;
|
||||
}
|
||||
/*
|
||||
// IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
|
||||
&:active,
|
||||
&.active {
|
||||
background-color: darken(@endColor, 10%) e("\9");
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
// Navbar vertical align
|
||||
|
||||
@@ -233,6 +233,12 @@
|
||||
|
||||
.dropdown-menu > li > a {
|
||||
padding: 8px 20px;
|
||||
color: @ui-option-type;
|
||||
}
|
||||
|
||||
.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus, .dropdown-submenu:hover > a, .dropdown-submenu:focus > a {
|
||||
color: @ui-option-type-hover;
|
||||
background: @ui-option-hover;
|
||||
}
|
||||
|
||||
.nav-tabs .dropdown-menu {
|
||||
|
||||
@@ -230,21 +230,33 @@
|
||||
//
|
||||
// Media picker
|
||||
// --------------------------------------------------
|
||||
|
||||
.umb-mediapicker > div {
|
||||
border: 1px solid @inputBorder;
|
||||
}
|
||||
.umb-mediapicker-single > div {
|
||||
width:144px;
|
||||
}
|
||||
.umb-mediapicker-multi > div {
|
||||
width:100%;
|
||||
}
|
||||
|
||||
|
||||
.umb-mediapicker .add-link {
|
||||
display: flex;
|
||||
justify-content:center;
|
||||
align-items:center;
|
||||
width: 120px;
|
||||
//width: 120px;
|
||||
text-align: center;
|
||||
color: @gray-8;
|
||||
border: 2px @gray-8 dashed;
|
||||
color: @gray-9;
|
||||
border: 2px @gray-9 dashed;
|
||||
text-decoration: none;
|
||||
|
||||
transition: all 150ms ease-in-out;
|
||||
|
||||
&:hover {
|
||||
color: @turquoise-d1;
|
||||
border-color: @turquoise;
|
||||
color: @ui-action-disgrete-type-hover;
|
||||
border-color: @ui-action-disgrete-type-hover;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -283,7 +295,9 @@
|
||||
}
|
||||
|
||||
.umb-mediapicker .add-link-square {
|
||||
height: 120px;
|
||||
height: 100px;
|
||||
width: 100px;
|
||||
margin: 10px;
|
||||
}
|
||||
|
||||
|
||||
@@ -330,19 +344,28 @@
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
padding: 2px;
|
||||
padding: 5px;
|
||||
margin: 5px;
|
||||
background: @white;
|
||||
border: 1px solid @gray-10;
|
||||
//border: 1px solid @gray-10;
|
||||
max-width: 100%;
|
||||
}
|
||||
.umb-mediapicker {
|
||||
|
||||
.umb-sortable-thumbnails li {
|
||||
border:none;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
.umb-mediapicker .umb-sortable-thumbnails li {
|
||||
flex-direction: column;
|
||||
margin: 0 0 5px 5px;
|
||||
padding: 5px;
|
||||
}
|
||||
/*.umb-mediapicker .umb-sortable-thumbnails li.add-wrapper {
|
||||
padding: 0px;
|
||||
}*/
|
||||
|
||||
.umb-sortable-thumbnails li:hover a {
|
||||
display: flex;
|
||||
@@ -445,6 +468,9 @@
|
||||
align-items: center;
|
||||
margin-left: 5px;
|
||||
text-decoration: none;
|
||||
|
||||
//border-color: @inputBorder;
|
||||
.box-shadow(0 1px 2px rgba(0,0,0,0.25));
|
||||
}
|
||||
|
||||
.umb-sortable-thumbnails .umb-sortable-thumbnails__action.-red {
|
||||
@@ -819,16 +845,16 @@
|
||||
// Tags
|
||||
// --------------------------------------------------
|
||||
.umb-tags{
|
||||
border: @gray-10 solid 1px;
|
||||
border: @inputBorder solid 1px;
|
||||
padding: 10px;
|
||||
font-size: 13px;
|
||||
text-shadow: none;
|
||||
|
||||
.tag{
|
||||
.tag {
|
||||
cursor: default;
|
||||
margin: 7px;
|
||||
padding: 10px;
|
||||
background: @turquoise;
|
||||
background: @blueDark;
|
||||
position: relative;
|
||||
|
||||
.icon-trash{
|
||||
|
||||
@@ -42,7 +42,6 @@
|
||||
}
|
||||
|
||||
.umb-rte .mce-tinymce .mce-edit-area {
|
||||
border: 1px solid @gray-8 !important;
|
||||
border-radius: 0px !important;
|
||||
}
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user