Commit dd7c21bc authored by Robbie Averill's avatar Robbie Averill

Merge branch 'feature/CWPT-242-FACMS' into 'develop'

CWPT-242/Adding a new icon set as a new button in the CMS which allows user to apply icon…

See merge request !122
parents 5b2b9deb 87029fc3
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -63,7 +63,7 @@
/******/ __webpack_require__.p = "./";
/******/ // Load entry module and return exports
/******/ return __webpack_require__(__webpack_require__.s = 17);
/******/ return __webpack_require__(__webpack_require__.s = 18);
/******/ })
/************************************************************************/
/******/ ([
......@@ -78,22 +78,22 @@ module.exports = jQuery;
"use strict";
Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_bootstrap_sass_assets_javascripts_bootstrap_collapse__ = __webpack_require__(10);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_bootstrap_sass_assets_javascripts_bootstrap_collapse__ = __webpack_require__(11);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_bootstrap_sass_assets_javascripts_bootstrap_collapse___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_bootstrap_sass_assets_javascripts_bootstrap_collapse__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_bootstrap_sass_assets_javascripts_bootstrap_tab__ = __webpack_require__(12);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_bootstrap_sass_assets_javascripts_bootstrap_tab__ = __webpack_require__(13);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_bootstrap_sass_assets_javascripts_bootstrap_tab___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_bootstrap_sass_assets_javascripts_bootstrap_tab__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_bootstrap_sass_assets_javascripts_bootstrap_dropdown__ = __webpack_require__(11);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_bootstrap_sass_assets_javascripts_bootstrap_dropdown__ = __webpack_require__(12);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_bootstrap_sass_assets_javascripts_bootstrap_dropdown___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2_bootstrap_sass_assets_javascripts_bootstrap_dropdown__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_jquery_highlight_jquery_highlight__ = __webpack_require__(14);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_jquery_highlight_jquery_highlight__ = __webpack_require__(15);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_jquery_highlight_jquery_highlight___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_3_jquery_highlight_jquery_highlight__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__components_navigation__ = __webpack_require__(7);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__components_content__ = __webpack_require__(4);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__components_sitemap__ = __webpack_require__(9);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__components_search__ = __webpack_require__(8);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__components_form__ = __webpack_require__(5);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__components_img__ = __webpack_require__(6);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__components_navigation__ = __webpack_require__(8);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__components_content__ = __webpack_require__(5);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__components_sitemap__ = __webpack_require__(10);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__components_search__ = __webpack_require__(9);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__components_form__ = __webpack_require__(6);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__components_img__ = __webpack_require__(7);
// Define globally exposed module objects
__webpack_require__(13);
__webpack_require__(14);
// Define dependency imports
/* eslint-disable */
......@@ -132,6 +132,12 @@ __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_9__components_img__["a" /* defau
/***/ }),
/* 4 */
/***/ (function(module, exports) {
// removed by extract-text-webpack-plugin
/***/ }),
/* 5 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
......@@ -147,7 +153,7 @@ __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_9__components_img__["a" /* defau
};
/***/ }),
/* 5 */
/* 6 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
......@@ -189,7 +195,7 @@ __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_9__components_img__["a" /* defau
};
/***/ }),
/* 6 */
/* 7 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
......@@ -210,7 +216,7 @@ __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_9__components_img__["a" /* defau
};
/***/ }),
/* 7 */
/* 8 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
......@@ -347,7 +353,7 @@ __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_9__components_img__["a" /* defau
};
/***/ }),
/* 8 */
/* 9 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
......@@ -364,7 +370,7 @@ __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_9__components_img__["a" /* defau
};
/***/ }),
/* 9 */
/* 10 */
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
......@@ -469,7 +475,7 @@ __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_9__components_img__["a" /* defau
};
/***/ }),
/* 10 */
/* 11 */
/***/ (function(module, exports, __webpack_require__) {
/* WEBPACK VAR INJECTION */(function(jQuery) {/* ========================================================================
......@@ -688,7 +694,7 @@ __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_9__components_img__["a" /* defau
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
/***/ }),
/* 11 */
/* 12 */
/***/ (function(module, exports, __webpack_require__) {
/* WEBPACK VAR INJECTION */(function(jQuery) {/* ========================================================================
......@@ -860,7 +866,7 @@ __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_9__components_img__["a" /* defau
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
/***/ }),
/* 12 */
/* 13 */
/***/ (function(module, exports, __webpack_require__) {
/* WEBPACK VAR INJECTION */(function(jQuery) {/* ========================================================================
......@@ -1022,14 +1028,14 @@ __webpack_require__.i(__WEBPACK_IMPORTED_MODULE_9__components_img__["a" /* defau
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(0)))
/***/ }),
/* 13 */
/* 14 */
/***/ (function(module, exports, __webpack_require__) {
/* WEBPACK VAR INJECTION */(function(global) {module.exports = global["jquery"] = __webpack_require__(15);
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(16)))
/* WEBPACK VAR INJECTION */(function(global) {module.exports = global["jquery"] = __webpack_require__(16);
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(17)))
/***/ }),
/* 14 */
/* 15 */
/***/ (function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*
......@@ -1187,7 +1193,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
/***/ }),
/* 15 */
/* 16 */
/***/ (function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
......@@ -11414,7 +11420,7 @@ return jQuery;
/***/ }),
/* 16 */
/* 17 */
/***/ (function(module, exports) {
var g;
......@@ -11441,12 +11447,13 @@ module.exports = g;
/***/ }),
/* 17 */
/* 18 */
/***/ (function(module, exports, __webpack_require__) {
__webpack_require__(1);
__webpack_require__(2);
module.exports = __webpack_require__(3);
__webpack_require__(3);
module.exports = __webpack_require__(4);
/***/ })
......
{
"/js/main.js": "/js/main.js",
"/css/main.css": "/css/main.css",
"/css/editor.css": "/css/editor.css"
"/css/editor.css": "/css/editor.css",
"/css/font-awesome.css": "/css/font-awesome.css"
}
\ No newline at end of file
......@@ -6,40 +6,41 @@
@import "~bootstrap-sass/assets/stylesheets/bootstrap/_media";
@import "~bootstrap-sass/assets/stylesheets/bootstrap/_type";
@import "~bootstrap-sass/assets/stylesheets/bootstrap/_utilities";
@import "_font-awesome";
@import "./_typography";
body.mceContentBody a.ss-broken {
background-color: $brand-danger;
border: 1px solid $brand-danger;
color: $label-color;
padding: 1px;
text-decoration: underline;
background-color: $brand-danger;
border: 1px solid $brand-danger;
color: $label-color;
padding: 1px;
text-decoration: underline;
}
/*# sourceMappingURL=editor.css.map */
.blockquote-footer {
background-color: $gray-lighter;
background-color: $gray-lighter;
}
.maori {
background-color: $alert-danger-bg !important;
background-color: $alert-danger-bg !important;
}
.text-hide {
font: $font-size-base/$line-height-computed $font-family-sans-serif;
color: $text-color;
outline: 1px dotted $text-muted;
font: $font-size-base/$line-height-computed $font-family-sans-serif;
color: $text-color;
outline: 1px dotted $text-muted;
}
.center {
@extend .center-block;
@extend .center-block;
}
.left {
@extend .pull-left;
@extend .pull-left;
}
.right {
@extend .pull-right;
@extend .pull-right;
}
@import "./_variables.scss";
@import "~font-awesome/scss/font-awesome";
......@@ -12,7 +12,8 @@ mix.setPublicPath("dist");
mix.js("src/js/main.js", "dist/js/main.js");
mix
.sass("src/scss/main.scss", "dist/css/main.css")
.sass("src/scss/_editor.scss", "dist/css/editor.css");
.sass("src/scss/_editor.scss", "dist/css/editor.css")
.sass("src/scss/_font-awesome.scss", "dist/css/font-awesome.css");
mix.copy("node_modules/bootstrap-sass/assets/fonts/bootstrap", "dist/fonts");
mix.copy("node_modules/font-awesome/fonts", "dist/fonts");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment