diff --git a/bower.json b/bower.json index 27278183..42e138f5 100644 --- a/bower.json +++ b/bower.json @@ -8,7 +8,7 @@ "angular-sanitize": "1.4.1-build.4058", "angular-animate": "1.4.1-build.4058", "angular-touch": "1.4.1-build.4058", - "se7en-bootstrap-3": "~0.2.1", + "nine-bootstrap": "https://ghe.ca-tools.org/stf/nine-bootstrap.git#dbf9fee2862daabae3d85b3b97feb0213e7f3b4d", "lodash": "~3.9.3", "oboe": "~2.1.2", "ng-table": "git://github.com/esvit/ng-table.git#bd9ec42172389257fcd312330013302b2696ac2a", diff --git a/res/app/layout/index.js b/res/app/layout/index.js index 7dfec126..7c334e2b 100644 --- a/res/app/layout/index.js +++ b/res/app/layout/index.js @@ -1,7 +1,6 @@ -require('se7en-bootstrap-3') +require('nine-bootstrap') require('./cursor.css') -require('./stf-se7en.css') require('./small.css') require('./stf-styles.css') diff --git a/res/app/layout/stf-se7en.css b/res/app/layout/stf-se7en.css deleted file mode 100644 index f5acbd0a..00000000 --- a/res/app/layout/stf-se7en.css +++ /dev/null @@ -1,32 +0,0 @@ - -.ace_editor ::-webkit-scrollbar-thumb { - /*background: #bbbbbb;*/ - /*background: red;*/ - background: rgba(255, 255, 255, 0.15); -} - -.ace_editor ::-webkit-scrollbar-track { - /*background: red;*/ - background: rgba(255, 255, 255, 0.05); -} - -.input-group-btn .btn { - margin-right: 0; -} - -.widget-container .heading .checkbox-inline { - margin-left: 5px; - margin-right: 10px; -} - -.padded-small { - padding: 5px; -} - -::-webkit-scrollbar { - height: 8px; -} - -input[type="search"].input-sm { - padding: 5px; -} diff --git a/res/web_modules/nine-bootstrap/index.js b/res/web_modules/nine-bootstrap/index.js new file mode 100644 index 00000000..139ef38b --- /dev/null +++ b/res/web_modules/nine-bootstrap/index.js @@ -0,0 +1,7 @@ +require('bootstrap/dist/css/bootstrap.css') + +require('nine-bootstrap/nine-bootstrap.scss') + +require('components-font-awesome/css/font-awesome.css') + +require('font-lato-2-subset') diff --git a/res/web_modules/se7en-bootstrap-3/index.js b/res/web_modules/se7en-bootstrap-3/index.js deleted file mode 100644 index 3c01db5c..00000000 --- a/res/web_modules/se7en-bootstrap-3/index.js +++ /dev/null @@ -1,9 +0,0 @@ -require('se7en-bootstrap-3/build/stylesheets/bootstrap.min.css') -//require('bootstrap/dist/css/bootstrap.css') - -require('se7en-bootstrap-3/build/stylesheets/se7en-font.css') -require('se7en-bootstrap-3/build/stylesheets/style.css') - -require('components-font-awesome/css/font-awesome.css') - -require('font-lato-2-subset') diff --git a/webpack.config.js b/webpack.config.js index 50ee6acc..98c85ff2 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -45,16 +45,17 @@ module.exports = { module: { loaders: [ { test: /\.css$/, loader: 'style!css' }, - { test: /\.less$/, loader: 'style-loader!css-loader!less-loader'}, + { test: /\.scss$/, loader: 'style!css!sass'}, + { test: /\.less$/, loader: 'style!css!less'}, { test: /\.json$/, loader: 'json' }, - { test: /\.jpg$/, loader: 'url-loader?limit=1000&mimetype=image/jpeg' }, - { test: /\.png$/, loader: 'url-loader?limit=1000&mimetype=image/png' }, - { test: /\.gif$/, loader: 'url-loader?limit=1000&mimetype=image/gif' }, - { test: /\.svg/, loader: 'url-loader?limit=1&mimetype=image/svg+xml' }, - { test: /\.woff/, loader: 'url-loader?limit=1&mimetype=application/font-woff' }, - { test: /\.otf/, loader: 'url-loader?limit=1&mimetype=application/font-woff' }, - { test: /\.ttf/, loader: 'url-loader?limit=1&mimetype=application/font-woff' }, - { test: /\.eot/, loader: 'url-loader?limit=1&mimetype=vnd.ms-fontobject' }, + { test: /\.jpg$/, loader: 'url?limit=1000&mimetype=image/jpeg' }, + { test: /\.png$/, loader: 'url?limit=1000&mimetype=image/png' }, + { test: /\.gif$/, loader: 'url?limit=1000&mimetype=image/gif' }, + { test: /\.svg/, loader: 'url?limit=1&mimetype=image/svg+xml' }, + { test: /\.woff/, loader: 'url?limit=1&mimetype=application/font-woff'}, + { test: /\.otf/, loader: 'url?limit=1&mimetype=application/font-woff' }, + { test: /\.ttf/, loader: 'url?limit=1&mimetype=application/font-woff' }, + { test: /\.eot/, loader: 'url?limit=1&mimetype=vnd.ms-fontobject' }, { test: /\.jade$/, loader: 'template-html-loader' }, { test: /\.html$/, loader: 'html-loader' }, { test: /angular\.js$/, loader: 'exports?angular'},