Skip to content

Commit bfed949

Browse files
yankeeinlondonyankeeinlondon
committed
reverted bower v of slider to address css issues
1 parent 3a8c663 commit bfed949

File tree

11 files changed

+622
-7
lines changed

11 files changed

+622
-7
lines changed

‎app/styles/app.scss

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@import 'ui-bootstrap';

‎bower.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
"dependencies": {
44
"ember": "~2.8.0",
55
"ember-cli-shims": "0.1.1",
6-
"seiyria-bootstrap-slider": "~9.2.0",
6+
"seiyria-bootstrap-slider": "~7.1.2",
77
"fontawesome": "^4.6.3",
8-
"jquery": "^3.1.1"
8+
"jquery": "^3.1.1",
9+
"showdown": "^1.4.3"
910
},
1011
"devDependencies": {
1112
"animate.css": "~3.4.0",

‎package.json

+14-4
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,15 @@
3333
],
3434
"license": "MIT",
3535
"devDependencies": {
36+
"bootstrap": "4.0.0-alpha.2",
3637
"broccoli-asset-rev": "^2.4.2",
37-
"demo-helper": "0.2.15",
38+
"chalk": "1.1.3",
39+
"demo-helper": "0.2.17",
3840
"ember-ajax": "^2.0.1",
3941
"ember-cli": "^2.8.0",
4042
"ember-cli-app-version": "^1.0.0",
4143
"ember-cli-dependency-checker": "^1.2.0",
42-
"ember-cli-flash": "^1.3.16",
44+
"ember-cli-flash": "1.3.17",
4345
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
4446
"ember-cli-inject-live-reload": "^1.4.0",
4547
"ember-cli-jshint": "^1.0.0",
@@ -50,10 +52,18 @@
5052
"ember-cli-uglify": "^1.2.0",
5153
"ember-export-application-global": "^1.0.5",
5254
"ember-load-initializers": "^0.5.1",
55+
"ember-modal-dialog": "0.8.8",
5356
"ember-resolver": "^2.0.3",
57+
"ember-tether": "0.3.1",
5458
"loader.js": "^4.0.1",
55-
"ui-icon": "0.11.7",
56-
"ui-input": "^0.10.2"
59+
"ui-bootstrap": "0.1.5",
60+
"ui-bootstrap-plus": "0.0.5",
61+
"ui-button": "2.1.3",
62+
"ui-icon": "0.11.8",
63+
"ui-image": "0.1.10",
64+
"ui-input": "^0.10.3",
65+
"ui-markdown": "0.1.12",
66+
"ui-navigator-service": "0.3.3"
5767
},
5868
"keywords": [
5969
"ember-addon"

‎typings.json

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"globalDependencies": {
3-
"jquery": "registry:dt/jquery#1.10.0+20160908203239"
3+
"jquery": "registry:dt/jquery#1.10.0+20160908203239",
4+
"showdown": "registry:dt/showdown#1.4.1+20160608102004"
5+
},
6+
"globalDevDependencies": {
7+
"bootstrap": "registry:dt/bootstrap#3.3.5+20160619023404",
8+
"chalk": "registry:dt/chalk#0.4.0+20160317120654"
49
}
510
}

‎typings/globals/bootstrap/index.d.ts

+124
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
// Generated by typings
2+
// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1f0791147c6c145227b1778bb26781a79d516917/bootstrap/bootstrap.d.ts
3+
interface ModalOptions {
4+
backdrop?: boolean|string;
5+
keyboard?: boolean;
6+
show?: boolean;
7+
remote?: string;
8+
}
9+
10+
interface ModalOptionsBackdropString {
11+
backdrop?: string; // for "static"
12+
keyboard?: boolean;
13+
show?: boolean;
14+
remote?: string;
15+
}
16+
17+
interface ScrollSpyOptions {
18+
offset?: number;
19+
target?: string;
20+
}
21+
22+
interface TooltipOptions {
23+
animation?: boolean;
24+
html?: boolean;
25+
placement?: string | Function;
26+
selector?: string;
27+
title?: string | Function;
28+
trigger?: string;
29+
template?: string;
30+
delay?: number | Object;
31+
container?: string | boolean;
32+
viewport?: string | Function | Object;
33+
}
34+
35+
interface PopoverOptions {
36+
animation?: boolean;
37+
html?: boolean;
38+
placement?: string | Function;
39+
selector?: string;
40+
trigger?: string;
41+
title?: string | Function;
42+
template?: string;
43+
content?: any;
44+
delay?: number | Object;
45+
container?: string | boolean;
46+
viewport?: string | Function | Object;
47+
}
48+
49+
interface CollapseOptions {
50+
parent?: any;
51+
toggle?: boolean;
52+
}
53+
54+
interface CarouselOptions {
55+
interval?: number;
56+
pause?: string;
57+
wrap?: boolean;
58+
keybord?: boolean;
59+
}
60+
61+
interface TypeaheadOptions {
62+
source?: any;
63+
items?: number;
64+
minLength?: number;
65+
matcher?: (item: any) => boolean;
66+
sorter?: (items: any[]) => any[];
67+
updater?: (item: any) => any;
68+
highlighter?: (item: any) => string;
69+
}
70+
71+
interface AffixOptions {
72+
offset?: number | Function | Object;
73+
target?: any;
74+
}
75+
76+
interface TransitionEventNames {
77+
end: string;
78+
}
79+
80+
interface JQuery {
81+
modal(options?: ModalOptions): JQuery;
82+
modal(options?: ModalOptionsBackdropString): JQuery;
83+
modal(command: string): JQuery;
84+
85+
dropdown(): JQuery;
86+
dropdown(command: string): JQuery;
87+
88+
scrollspy(command: string): JQuery;
89+
scrollspy(options?: ScrollSpyOptions): JQuery;
90+
91+
tab(): JQuery;
92+
tab(command: string): JQuery;
93+
94+
tooltip(options?: TooltipOptions): JQuery;
95+
tooltip(command: string): JQuery;
96+
97+
popover(options?: PopoverOptions): JQuery;
98+
popover(command: string): JQuery;
99+
100+
alert(): JQuery;
101+
alert(command: string): JQuery;
102+
103+
button(): JQuery;
104+
button(command: string): JQuery;
105+
106+
collapse(options?: CollapseOptions): JQuery;
107+
collapse(command: string): JQuery;
108+
109+
carousel(options?: CarouselOptions): JQuery;
110+
carousel(command: string): JQuery;
111+
112+
typeahead(options?: TypeaheadOptions): JQuery;
113+
114+
affix(options?: AffixOptions): JQuery;
115+
116+
emulateTransitionEnd(duration: number): JQuery;
117+
}
118+
119+
interface JQuerySupport {
120+
transition: boolean | TransitionEventNames;
121+
}
122+
123+
declare module "bootstrap" {
124+
}

‎typings/globals/bootstrap/typings.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"resolution": "main",
3+
"tree": {
4+
"src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1f0791147c6c145227b1778bb26781a79d516917/bootstrap/bootstrap.d.ts",
5+
"raw": "registry:dt/bootstrap#3.3.5+20160619023404",
6+
"typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/1f0791147c6c145227b1778bb26781a79d516917/bootstrap/bootstrap.d.ts"
7+
}
8+
}

‎typings/globals/chalk/index.d.ts

+118
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
// Generated by typings
2+
// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/chalk/chalk.d.ts
3+
declare namespace Chalk {
4+
5+
export var enabled: boolean;
6+
export var supportsColor: boolean;
7+
export var styles: ChalkStyleMap;
8+
9+
export function stripColor(value: string): any;
10+
export function hasColor(str: string): boolean;
11+
12+
export interface ChalkChain extends ChalkStyle {
13+
(...text: string[]): string;
14+
}
15+
16+
export interface ChalkStyleElement {
17+
open: string;
18+
close: string;
19+
}
20+
21+
// General
22+
export var reset: ChalkChain;
23+
export var bold: ChalkChain;
24+
export var italic: ChalkChain;
25+
export var underline: ChalkChain;
26+
export var inverse: ChalkChain;
27+
export var strikethrough: ChalkChain;
28+
29+
// Text colors
30+
export var black: ChalkChain;
31+
export var red: ChalkChain;
32+
export var green: ChalkChain;
33+
export var yellow: ChalkChain;
34+
export var blue: ChalkChain;
35+
export var magenta: ChalkChain;
36+
export var cyan: ChalkChain;
37+
export var white: ChalkChain;
38+
export var gray: ChalkChain;
39+
export var grey: ChalkChain;
40+
41+
// Background colors
42+
export var bgBlack: ChalkChain;
43+
export var bgRed: ChalkChain;
44+
export var bgGreen: ChalkChain;
45+
export var bgYellow: ChalkChain;
46+
export var bgBlue: ChalkChain;
47+
export var bgMagenta: ChalkChain;
48+
export var bgCyan: ChalkChain;
49+
export var bgWhite: ChalkChain;
50+
51+
52+
export interface ChalkStyle {
53+
// General
54+
reset: ChalkChain;
55+
bold: ChalkChain;
56+
italic: ChalkChain;
57+
underline: ChalkChain;
58+
inverse: ChalkChain;
59+
strikethrough: ChalkChain;
60+
61+
// Text colors
62+
black: ChalkChain;
63+
red: ChalkChain;
64+
green: ChalkChain;
65+
yellow: ChalkChain;
66+
blue: ChalkChain;
67+
magenta: ChalkChain;
68+
cyan: ChalkChain;
69+
white: ChalkChain;
70+
gray: ChalkChain;
71+
grey: ChalkChain;
72+
73+
// Background colors
74+
bgBlack: ChalkChain;
75+
bgRed: ChalkChain;
76+
bgGreen: ChalkChain;
77+
bgYellow: ChalkChain;
78+
bgBlue: ChalkChain;
79+
bgMagenta: ChalkChain;
80+
bgCyan: ChalkChain;
81+
bgWhite: ChalkChain;
82+
}
83+
84+
export interface ChalkStyleMap {
85+
// General
86+
reset: ChalkStyleElement;
87+
bold: ChalkStyleElement;
88+
italic: ChalkStyleElement;
89+
underline: ChalkStyleElement;
90+
inverse: ChalkStyleElement;
91+
strikethrough: ChalkStyleElement;
92+
93+
// Text colors
94+
black: ChalkStyleElement;
95+
red: ChalkStyleElement;
96+
green: ChalkStyleElement;
97+
yellow: ChalkStyleElement;
98+
blue: ChalkStyleElement;
99+
magenta: ChalkStyleElement;
100+
cyan: ChalkStyleElement;
101+
white: ChalkStyleElement;
102+
gray: ChalkStyleElement;
103+
104+
// Background colors
105+
bgBlack: ChalkStyleElement;
106+
bgRed: ChalkStyleElement;
107+
bgGreen: ChalkStyleElement;
108+
bgYellow: ChalkStyleElement;
109+
bgBlue: ChalkStyleElement;
110+
bgMagenta: ChalkStyleElement;
111+
bgCyan: ChalkStyleElement;
112+
bgWhite: ChalkStyleElement;
113+
}
114+
}
115+
116+
declare module "chalk" {
117+
export = Chalk;
118+
}

‎typings/globals/chalk/typings.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"resolution": "main",
3+
"tree": {
4+
"src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/chalk/chalk.d.ts",
5+
"raw": "registry:dt/chalk#0.4.0+20160317120654",
6+
"typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/7de6c3dd94feaeb21f20054b9f30d5dabc5efabd/chalk/chalk.d.ts"
7+
}
8+
}

0 commit comments

Comments
 (0)