diff --git a/package.json b/package.json index e2006211..608d6bdd 100644 --- a/package.json +++ b/package.json @@ -6,32 +6,33 @@ "homepage": "", "license": "MIT", "dependencies": { - "@angular/http": "2.0.0-rc.1", "@angular/common": "2.0.0-rc.1", "@angular/compiler": "2.0.0-rc.1", "@angular/core": "2.0.0-rc.1", + "@angular/http": "2.0.0-rc.1", "@angular/platform-browser": "2.0.0-rc.1", "@angular/platform-browser-dynamic": "2.0.0-rc.1", "@angular/platform-server": "2.0.0-rc.1", "@angular/router": "2.0.0-rc.1", "@angular/router-deprecated": "2.0.0-rc.1", - "core-js": "^2.2.2", - "normalize.css": "^4.1.1", - "rxjs": "5.0.0-beta.6", - "zone.js": "~0.6.12", "amcharts3": "github:amcharts/amcharts3", "ammap3": "github:amcharts/ammap3", "bootstrap": "^4.0.0-alpha.2", "bootstrap-loader": "^1.0.8", "chartist": "^0.9.7", + "core-js": "^2.2.2", "easy-pie-chart": "^2.1.7", "font-awesome": "^4.6.1", "font-awesome-sass-loader": "^1.0.1", "google-maps": "^3.2.1", "jquery": "^2.2.3", "leaflet-map": "^0.2.1", + "ng2-bootstrap": "^1.0.16", + "ng2-charts": "^1.0.3", + "normalize.css": "^4.1.1", + "rxjs": "5.0.0-beta.6", "tether": "^1.2.4", - "ng2-charts": "^1.0.3" + "zone.js": "~0.6.12" }, "devDependencies": { "angular2-hmr": "~0.6.0", @@ -94,56 +95,42 @@ "webpack-dev-server": "webpack-dev-server", "webdriver-manager": "webdriver-manager", "protractor": "protractor", - "clean": "npm cache clean && npm run rimraf -- node_modules doc typings coverage dist", "clean:dist": "npm run rimraf -- dist", "preclean:install": "npm run clean", "clean:install": "npm set progress=false && npm install", "preclean:start": "npm run clean", "clean:start": "npm start", - "watch": "npm run watch:dev", "watch:dev": "npm run build:dev -- --watch", "watch:dev:hmr": "npm run watch:dev -- --hot", "watch:test": "npm run test -- --auto-watch --no-single-run", "watch:prod": "npm run build:prod -- --watch", - "build": "npm run build:dev", "prebuild:dev": "npm run clean:dist", "build:dev": "webpack --config config/webpack.dev.js --progress --profile --colors --display-error-details --display-cached", "prebuild:prod": "npm run clean:dist", "build:prod": "webpack --config config/webpack.prod.js --progress --profile --colors --display-error-details --display-cached --bail", - "server": "npm run server:dev", "server:dev": "webpack-dev-server --config config/webpack.dev.js --inline --progress --profile --colors --watch --display-error-details --display-cached --content-base src/", "server:dev:hmr": "npm run server:dev -- --hot", "server:prod": "http-server dist --cors", - "webdriver:update": "npm run webdriver-manager update", "webdriver:start": "npm run webdriver-manager start", - "lint": "npm run tslint 'src/**/*.ts'", - "pree2e": "npm run webdriver:update -- --standalone", "e2e": "npm run protractor", "e2e:live": "npm run e2e -- --elementExplorer", - "pretest": "npm run lint", "test": "karma start", - "ci": "npm test && npm run e2e", - "docs": "npm run typedoc -- --options typedoc.json --exclude '**/*.spec.ts' ./src/", - "start": "npm run server:dev", "start:hmr": "npm run server:dev:hmr", - "postinstall": "npm run typings -- install", - "preversion": "npm test", "version": "npm run build", "postversion": "git push && git push --tags" - }, "repository": { "type": "git", diff --git a/src/app/pages/ui/components/buttons/buttons.component.ts b/src/app/pages/ui/components/buttons/buttons.component.ts index 98bf710a..7df748af 100644 --- a/src/app/pages/ui/components/buttons/buttons.component.ts +++ b/src/app/pages/ui/components/buttons/buttons.component.ts @@ -5,11 +5,25 @@ import {FlatButtons} from './components/flatButtons'; import {RaisedButtons} from './components/raisedButtons'; import {SizedButtons} from './components/sizedButtons'; import {DisabledButtons} from './components/disabledButtons'; +import {IconButtons} from './components/iconButtons'; +import {LargeButtons} from './components/largeButtons'; +import {DropdownButtons} from './components/dropdownButtons'; +import {GroupButtons} from './components/groupButtons'; @Component({ selector: 'buttons', encapsulation: ViewEncapsulation.None, - directives: [BaCard, FlatButtons, RaisedButtons, SizedButtons, DisabledButtons], + directives: [ + BaCard, + FlatButtons, + RaisedButtons, + SizedButtons, + DisabledButtons, + IconButtons, + LargeButtons, + DropdownButtons, + GroupButtons + ], styles: [require('./buttons.scss')], template: require('./buttons.html'), }) diff --git a/src/app/pages/ui/components/buttons/buttons.html b/src/app/pages/ui/components/buttons/buttons.html index c0c3384d..99a31848 100644 --- a/src/app/pages/ui/components/buttons/buttons.html +++ b/src/app/pages/ui/components/buttons/buttons.html @@ -24,32 +24,26 @@
-
-
-
-
-
-
+ + + + + + + + +
-
-
-
-
-
-
+ + + + + + + + +
diff --git a/src/app/pages/ui/components/buttons/components/dropdownButtons/dropdownButtons.component.ts b/src/app/pages/ui/components/buttons/components/dropdownButtons/dropdownButtons.component.ts new file mode 100644 index 00000000..4352a5b6 --- /dev/null +++ b/src/app/pages/ui/components/buttons/components/dropdownButtons/dropdownButtons.component.ts @@ -0,0 +1,15 @@ +import {Component, HostListener} from '@angular/core'; +import { DROPDOWN_DIRECTIVES } from 'ng2-bootstrap/ng2-bootstrap'; + +@Component({ + selector: 'dropdown-buttons', + template: require('./dropdownButtons.html'), + directives: [DROPDOWN_DIRECTIVES] +}) + +// TODO: appendToBody does not implemented yet, waiting for it +export class DropdownButtons { + + constructor() { + } +} diff --git a/src/app/pages/ui/components/buttons/components/dropdownButtons/dropdownButtons.html b/src/app/pages/ui/components/buttons/components/dropdownButtons/dropdownButtons.html new file mode 100644 index 00000000..6ee7f133 --- /dev/null +++ b/src/app/pages/ui/components/buttons/components/dropdownButtons/dropdownButtons.html @@ -0,0 +1,181 @@ +
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+ +
Split button dropdowns
+ +
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
diff --git a/src/app/pages/ui/components/buttons/components/dropdownButtons/index.ts b/src/app/pages/ui/components/buttons/components/dropdownButtons/index.ts new file mode 100644 index 00000000..8029ea45 --- /dev/null +++ b/src/app/pages/ui/components/buttons/components/dropdownButtons/index.ts @@ -0,0 +1 @@ +export * from './dropdownButtons.component'; diff --git a/src/app/pages/ui/components/buttons/components/groupButtons/groupButtons.component.ts b/src/app/pages/ui/components/buttons/components/groupButtons/groupButtons.component.ts new file mode 100644 index 00000000..1ff8ee53 --- /dev/null +++ b/src/app/pages/ui/components/buttons/components/groupButtons/groupButtons.component.ts @@ -0,0 +1,11 @@ +import {Component} from '@angular/core'; + +@Component({ + selector: 'group-buttons', + template: require('./groupButtons.html'), +}) +export class GroupButtons { + + constructor() { + } +} diff --git a/src/app/pages/ui/components/buttons/components/groupButtons/groupButtons.html b/src/app/pages/ui/components/buttons/components/groupButtons/groupButtons.html new file mode 100644 index 00000000..ceeb6f62 --- /dev/null +++ b/src/app/pages/ui/components/buttons/components/groupButtons/groupButtons.html @@ -0,0 +1,26 @@ +
+
+ + + +
+
+ +
+ +
diff --git a/src/app/pages/ui/components/buttons/components/groupButtons/index.ts b/src/app/pages/ui/components/buttons/components/groupButtons/index.ts new file mode 100644 index 00000000..86b6d148 --- /dev/null +++ b/src/app/pages/ui/components/buttons/components/groupButtons/index.ts @@ -0,0 +1 @@ +export * from './groupButtons.component'; diff --git a/src/app/pages/ui/components/buttons/components/iconButtons/iconButtons.component.ts b/src/app/pages/ui/components/buttons/components/iconButtons/iconButtons.component.ts new file mode 100644 index 00000000..bd369f11 --- /dev/null +++ b/src/app/pages/ui/components/buttons/components/iconButtons/iconButtons.component.ts @@ -0,0 +1,11 @@ +import {Component} from '@angular/core'; + +@Component({ + selector: 'icon-buttons', + template: require('./iconButtons.html'), +}) +export class IconButtons { + + constructor() { + } +} diff --git a/src/app/pages/ui/components/buttons/components/iconButtons/iconButtons.html b/src/app/pages/ui/components/buttons/components/iconButtons/iconButtons.html new file mode 100644 index 00000000..32fc38ce --- /dev/null +++ b/src/app/pages/ui/components/buttons/components/iconButtons/iconButtons.html @@ -0,0 +1,44 @@ + + +
Buttons with icons
+ + diff --git a/src/app/pages/ui/components/buttons/components/iconButtons/index.ts b/src/app/pages/ui/components/buttons/components/iconButtons/index.ts new file mode 100644 index 00000000..da5cff44 --- /dev/null +++ b/src/app/pages/ui/components/buttons/components/iconButtons/index.ts @@ -0,0 +1 @@ +export * from './iconButtons.component'; diff --git a/src/app/pages/ui/components/buttons/components/largeButtons/index.ts b/src/app/pages/ui/components/buttons/components/largeButtons/index.ts new file mode 100644 index 00000000..d79954af --- /dev/null +++ b/src/app/pages/ui/components/buttons/components/largeButtons/index.ts @@ -0,0 +1 @@ +export * from './largeButtons.component'; diff --git a/src/app/pages/ui/components/buttons/components/largeButtons/largeButtons.component.ts b/src/app/pages/ui/components/buttons/components/largeButtons/largeButtons.component.ts new file mode 100644 index 00000000..73f097c2 --- /dev/null +++ b/src/app/pages/ui/components/buttons/components/largeButtons/largeButtons.component.ts @@ -0,0 +1,11 @@ +import {Component} from '@angular/core'; + +@Component({ + selector: 'large-buttons', + template: require('./largeButtons.html'), +}) +export class LargeButtons { + + constructor() { + } +} diff --git a/src/app/pages/ui/components/buttons/components/largeButtons/largeButtons.html b/src/app/pages/ui/components/buttons/components/largeButtons/largeButtons.html new file mode 100644 index 00000000..4c181022 --- /dev/null +++ b/src/app/pages/ui/components/buttons/components/largeButtons/largeButtons.html @@ -0,0 +1,20 @@ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/src/app/theme/components/pageTop/pageTop.component.ts b/src/app/theme/components/pageTop/pageTop.component.ts index 776e0037..c7856ea2 100644 --- a/src/app/theme/components/pageTop/pageTop.component.ts +++ b/src/app/theme/components/pageTop/pageTop.component.ts @@ -1,4 +1,4 @@ -import {Component} from '@angular/core'; +import {Component, ViewEncapsulation} from '@angular/core'; import {ThemeGlobal} from '../../../theme'; import {ProfilePicturePipe} from '../../pipes'; @@ -10,7 +10,8 @@ import {ScrollPosition} from '../../directives'; styles: [require('./pageTop.scss')], template: require('./pageTop.html'), directives: [MsgCenter, ScrollPosition], - pipes: [ProfilePicturePipe] + pipes: [ProfilePicturePipe], + encapsulation: ViewEncapsulation.None }) export class PageTop { isScrolled:Boolean = false; diff --git a/src/app/theme/components/pageTop/pageTop.html b/src/app/theme/components/pageTop/pageTop.html index d6989b81..5087f903 100644 --- a/src/app/theme/components/pageTop/pageTop.html +++ b/src/app/theme/components/pageTop/pageTop.html @@ -1,3 +1,4 @@ +
diff --git a/src/app/theme/components/pageTop/pageTop.scss b/src/app/theme/components/pageTop/pageTop.scss index 13929369..69bf5c6d 100644 --- a/src/app/theme/components/pageTop/pageTop.scss +++ b/src/app/theme/components/pageTop/pageTop.scss @@ -14,6 +14,10 @@ &.scrolled { @include bg-translucent-dark(0.85); } + + .dropdown-toggle::after { + display: none; + } } a.al-logo { diff --git a/src/app/theme/sass/bootstrap-overrides/_dropdown.scss b/src/app/theme/sass/bootstrap-overrides/_dropdown.scss index 36c87284..304dadd1 100644 --- a/src/app/theme/sass/bootstrap-overrides/_dropdown.scss +++ b/src/app/theme/sass/bootstrap-overrides/_dropdown.scss @@ -5,7 +5,3 @@ .dropdown-menu { font-size: inherit; } - -.dropdown-toggle::after { - display: none; -} \ No newline at end of file