diff --git a/.bootstraprc b/.bootstraprc index b6968988..927661b5 100644 --- a/.bootstraprc +++ b/.bootstraprc @@ -12,6 +12,7 @@ useFlexbox: false styleLoaders: - style - css + - postcss - sass # Extract styles to stand-alone css file @@ -78,8 +79,6 @@ styles: card: true breadcrumb: true pagination: true - pager: true - labels: true jumbotron: true alert: true progress: true @@ -87,6 +86,7 @@ styles: list-group: true responsive-embed: true close: true + tags: true # Components w/ JavaScript modal: true @@ -96,9 +96,6 @@ styles: # Utility classes utilities: true - utilities-background: true - utilities-spacing: true - utilities-responsive: true ### Bootstrap scripts scripts: diff --git a/config/webpack.common.js b/config/webpack.common.js index bfea786f..4a51cb4d 100644 --- a/config/webpack.common.js +++ b/config/webpack.common.js @@ -318,8 +318,26 @@ module.exports = function (options) { */ new HtmlElementsPlugin({ headTags: require('./head-config.common') - }) + }), + new webpack.ProvidePlugin({ + $: "jquery", + jQuery: "jquery", + "window.jQuery": "jquery", + Tether: "tether", + "window.Tether": "tether", + Tooltip: "exports?Tooltip!bootstrap/js/dist/tooltip", + Alert: "exports?Alert!bootstrap/js/dist/alert", + Button: "exports?Button!bootstrap/js/dist/button", + Carousel: "exports?Carousel!bootstrap/js/dist/carousel", + Collapse: "exports?Collapse!bootstrap/js/dist/collapse", + Dropdown: "exports?Dropdown!bootstrap/js/dist/dropdown", + Modal: "exports?Modal!bootstrap/js/dist/modal", + Popover: "exports?Popover!bootstrap/js/dist/popover", + Scrollspy: "exports?Scrollspy!bootstrap/js/dist/scrollspy", + Tab: "exports?Tab!bootstrap/js/dist/tab", + Util: "exports?Util!bootstrap/js/dist/util" + }) ], /* diff --git a/package.json b/package.json index be9df2c5..6af08e19 100644 --- a/package.json +++ b/package.json @@ -17,33 +17,30 @@ "@angular/platform-server": "2.0.0", "@angular/router": "3.0.0", - "@angularclass/request-idle-callback": "^1.0.7", - "@angularclass/webpack-toolkit": "^1.3.3", "@angularclass/conventions-loader": "^1.0.2", "@angularclass/hmr": "~1.2.0", "@angularclass/hmr-loader": "~3.0.2", - "assets-webpack-plugin": "^3.4.0", - - "http-server": "^0.9.0", - "ie-shim": "^0.1.0", - "rxjs": "5.0.0-beta.12", - "zone.js": "~0.6.23", + "@angularclass/request-idle-callback": "^1.0.7", + "@angularclass/webpack-toolkit": "^1.3.3", "amcharts3": "github:amcharts/amcharts3", "ammap3": "github:amcharts/ammap3", "animate.css": "^3.5.1", - "bootstrap": "4.0.0-alpha.2", - "bootstrap-loader": "1.1.6", + "assets-webpack-plugin": "^3.4.0", + "bootstrap": "4.0.0-alpha.4", + "bootstrap-loader": "2.0.0-beta.12", "chart.js": "^1.1.1", "chartist": "^0.9.7", "ckeditor": "^4.5.9", "core-js": "^2.4.1", "easy-pie-chart": "^2.1.7", "extract-text-webpack-plugin": "2.0.0-beta.3", - "font-awesome": "^4.6.1", + "font-awesome": "^4.6.3", "font-awesome-sass-loader": "^1.0.2", "fullcalendar": "^2.7.2", "google-maps": "^3.2.1", + "http-server": "^0.9.0", + "ie-shim": "^0.1.0", "ionicons": "^2.0.1", "is-electron-renderer": "^2.0.0", "jquery": "^2.2.3", @@ -52,12 +49,15 @@ "leaflet-map": "^0.2.1", "lodash": "^4.12.0", "ng2-bootstrap": "1.1.5", - "ng2-tree": "^0.0.2-7", "ng2-ckeditor": "1.0.7", "ng2-smart-table": "^0.3.1", + "ng2-tree": "^0.0.2-7", "ng2-uploader": "1.1.0", "normalize.css": "^4.1.1", - "tether": "^1.2.4" + "postcss-loader": "^1.0.0", + "rxjs": "5.0.0-beta.12", + "tether": "^1.2.4", + "zone.js": "~0.6.23" }, "devDependencies": { "angular2-template-loader": "^0.5.0", diff --git a/src/app/pages/forms/components/inputs/components/selectInputs/selectInput.scss b/src/app/pages/forms/components/inputs/components/selectInputs/selectInput.scss new file mode 100644 index 00000000..29dd6d60 --- /dev/null +++ b/src/app/pages/forms/components/inputs/components/selectInputs/selectInput.scss @@ -0,0 +1,9 @@ +@import "../../../../../../theme/sass/conf/conf.scss"; + +select.form-control[multiple] { + overflow-y: scroll; +} + +select.form-control { + color: $default; +} diff --git a/src/app/pages/forms/components/inputs/components/selectInputs/selectInputs.component.ts b/src/app/pages/forms/components/inputs/components/selectInputs/selectInputs.component.ts index c1758e69..88b06579 100644 --- a/src/app/pages/forms/components/inputs/components/selectInputs/selectInputs.component.ts +++ b/src/app/pages/forms/components/inputs/components/selectInputs/selectInputs.component.ts @@ -2,6 +2,7 @@ import { Component } from '@angular/core'; @Component({ selector: 'select-inputs', + styles: [require('./selectInput.scss')], template: require('./selectInputs.html') }) export class SelectInputs { diff --git a/src/app/pages/forms/components/layouts/components/horizontalForm/horizontalForm.html b/src/app/pages/forms/components/layouts/components/horizontalForm/horizontalForm.html index cd3479c4..6ab1d094 100644 --- a/src/app/pages/forms/components/layouts/components/horizontalForm/horizontalForm.html +++ b/src/app/pages/forms/components/layouts/components/horizontalForm/horizontalForm.html @@ -12,14 +12,14 @@
-
+
-
+
diff --git a/src/app/pages/forms/components/layouts/components/inlineForm/inlineForm.component.ts b/src/app/pages/forms/components/layouts/components/inlineForm/inlineForm.component.ts index 029f4422..4e11653d 100644 --- a/src/app/pages/forms/components/layouts/components/inlineForm/inlineForm.component.ts +++ b/src/app/pages/forms/components/layouts/components/inlineForm/inlineForm.component.ts @@ -2,6 +2,7 @@ import {Component} from '@angular/core'; @Component({ selector: 'inline-form', + styles: [require('./inlineForm.scss')], template: require('./inlineForm.html'), }) export class InlineForm { diff --git a/src/app/pages/forms/components/layouts/components/inlineForm/inlineForm.html b/src/app/pages/forms/components/layouts/components/inlineForm/inlineForm.html index aef1ec33..a185f675 100644 --- a/src/app/pages/forms/components/layouts/components/inlineForm/inlineForm.html +++ b/src/app/pages/forms/components/layouts/components/inlineForm/inlineForm.html @@ -1,12 +1,16 @@
-
+
-
+
-
- +
+
+ +
+
+
+
- diff --git a/src/app/pages/forms/components/layouts/components/inlineForm/inlineForm.scss b/src/app/pages/forms/components/layouts/components/inlineForm/inlineForm.scss new file mode 100644 index 00000000..3d1e3ce3 --- /dev/null +++ b/src/app/pages/forms/components/layouts/components/inlineForm/inlineForm.scss @@ -0,0 +1,5 @@ +.checkbox { + display: inline-block; + margin-bottom: -12px; + margin-left: 12px; +} diff --git a/src/app/pages/register/register.html b/src/app/pages/register/register.html index 9b873f9c..d5f6f5f6 100644 --- a/src/app/pages/register/register.html +++ b/src/app/pages/register/register.html @@ -34,7 +34,7 @@
-
+
diff --git a/src/app/pages/ui/components/grid/grid.html b/src/app/pages/ui/components/grid/grid.html index 2dde920f..879e19bc 100644 --- a/src/app/pages/ui/components/grid/grid.html +++ b/src/app/pages/ui/components/grid/grid.html @@ -160,21 +160,21 @@
.col-md-4
-
-
.col-md-4 .col-md-offset-4
+
+
.col-md-4 .offset-md-4
-
-
.col-md-3 .col-md-offset-3
+
+
.col-md-3 .offset-md-3
-
-
.col-md-3 .col-md-offset-3
+
+
.col-md-3 .offset-md-3
-
-
.col-md-6 .col-md-offset-3
+
+
.col-md-6 .offset-md-3
diff --git a/src/app/theme/components/baCheckbox/baCheckbox.scss b/src/app/theme/components/baCheckbox/baCheckbox.scss index 13a0fffa..f6a23df0 100644 --- a/src/app/theme/components/baCheckbox/baCheckbox.scss +++ b/src/app/theme/components/baCheckbox/baCheckbox.scss @@ -48,15 +48,11 @@ position: relative; } -label.custom-checkbox > span { - display: block; - margin-top: -13px; - margin-right: 10px; -} +label.custom-checkbox { + margin-bottom: 12px; -.form-horizontal { - .checkbox, .checkbox-inline{ - padding-top: 0; + & > span { + display: block; + margin-right: 10px; } } - diff --git a/src/app/theme/components/baContentTop/baContentTop.html b/src/app/theme/components/baContentTop/baContentTop.html index 59249b0c..208d3bf5 100644 --- a/src/app/theme/components/baContentTop/baContentTop.html +++ b/src/app/theme/components/baContentTop/baContentTop.html @@ -2,8 +2,7 @@

{{ activePageTitle }}

    -
  • - Home
    • -
  • {{ activePageTitle }}
    • +
  • Home
    • +
  • {{ activePageTitle }}
diff --git a/src/app/theme/components/baContentTop/baContentTop.scss b/src/app/theme/components/baContentTop/baContentTop.scss index 11c6bedd..0184ad3c 100644 --- a/src/app/theme/components/baContentTop/baContentTop.scss +++ b/src/app/theme/components/baContentTop/baContentTop.scss @@ -30,6 +30,10 @@ h1.al-title { a { color: $primary-light; } + + &.breadcrumb-item.active { + color: $default; + } } } diff --git a/src/app/theme/components/baPageTop/baPageTop.scss b/src/app/theme/components/baPageTop/baPageTop.scss index ff3fb75c..f41f8d11 100644 --- a/src/app/theme/components/baPageTop/baPageTop.scss +++ b/src/app/theme/components/baPageTop/baPageTop.scss @@ -116,7 +116,6 @@ a.collapse-menu-link { .search { text-shadow: none; - color: $sidebar-text; font-size: 13px; line-height: 25px; transition: all 0.5s ease; @@ -138,6 +137,7 @@ a.collapse-menu-link { margin-right: 13px; } input { + color: $sidebar-text; background: none; border: none; outline: none;