Skip to content
This repository was archived by the owner on May 4, 2019. It is now read-only.

Commit 9aad5e6

Browse files
MatthewArckMatthewArck
authored
Merge pull request #165 from osu-cass/dev
Dev into Staging
2 parents add9bab + 6a17f57 commit 9aad5e6

27 files changed

+21299
-20405
lines changed

‎package-lock.json

+20,835-19,952
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+28-28
Original file line numberDiff line numberDiff line change
@@ -55,79 +55,79 @@
5555
},
5656
"homepage": "https://github.com/osu-cass/sb-components#readme",
5757
"devDependencies": {
58-
"@commitlint/cli": "^6.1.3",
58+
"@commitlint/cli": "^6.2.0",
5959
"@commitlint/config-conventional": "^6.1.3",
6060
"@osu-cass/tslint-config": "^1.1.1",
61-
"@storybook/addon-a11y": "^3.3.15",
62-
"@storybook/addon-actions": "^3.3.15",
61+
"@storybook/addon-a11y": "^3.4.3",
62+
"@storybook/addon-actions": "^3.4.3",
6363
"@storybook/addon-console": "^1.0.0",
64-
"@storybook/addon-storyshots": "^3.3.15",
65-
"@storybook/addons": "^3.3.15",
66-
"@storybook/channels": "^3.3.15",
67-
"@storybook/cli": "^3.3.15",
68-
"@storybook/react": "^3.3.15",
64+
"@storybook/addon-storyshots": "^3.4.3",
65+
"@storybook/addons": "^3.4.3",
66+
"@storybook/channels": "^3.4.3",
67+
"@storybook/cli": "^3.4.3",
68+
"@storybook/react": "^3.4.3",
6969
"@types/bootstrap": "3.3.32",
70-
"@types/enzyme": "^3.1.9",
70+
"@types/enzyme": "^3.1.10",
7171
"@types/enzyme-adapter-react-16": "^1.0.2",
7272
"@types/google.analytics": "0.0.29",
73-
"@types/jest": "^22.2.0",
73+
"@types/jest": "^22.2.3",
7474
"@types/jquery": "2.0.40",
7575
"@types/jsdom": "^11.0.4",
76-
"@types/node": "^9.4.7",
76+
"@types/node": "^9.6.14",
7777
"@types/react": "^16.0.40",
7878
"@types/react-dom": "^16.0.3",
7979
"@types/react-modal": "3.1.2",
80-
"@types/react-router": "^4.0.23",
80+
"@types/react-router": "^4.0.25",
8181
"@types/react-router-dom": "4.2.5",
8282
"@types/storybook__addon-actions": "~3.0.3",
8383
"@types/storybook__react": "^3.0.7",
8484
"copy-webpack-plugin": "^4.3.1",
85-
"coveralls": "^3.0.0",
86-
"css-loader": "^0.28.8",
85+
"coveralls": "^3.0.1",
86+
"css-loader": "^0.28.11",
8787
"enhanced-resolve": "^4.0.0",
8888
"enzyme": "^3.3.0",
8989
"enzyme-adapter-react-16": "^1.1.1",
90-
"enzyme-to-json": "^3.3.1",
90+
"enzyme-to-json": "^3.3.3",
9191
"extract-text-webpack-plugin": "^3.0.2",
9292
"file-loader": "^1.1.6",
9393
"husky": "^0.14.3",
9494
"identity-obj-proxy": "~3.0.0",
95-
"jest": "~22.4.2",
96-
"jest-cli": "~22.4.2",
97-
"jsdom": "^11.6.2",
95+
"jest": "^22.4.3",
96+
"jest-cli": "^22.4.3",
97+
"jsdom": "^11.10.0",
9898
"jsdom-global": "^3.0.2",
99-
"less": "~2.7.3",
99+
"less": "^3.0.4",
100100
"less-loader": "~4.0.5",
101101
"lint-staged": "^6.0.0",
102-
"postcss-loader": "^2.0.10",
102+
"postcss-loader": "^2.1.5",
103103
"prettier": "~1.9.2",
104104
"react": "~16.2.0",
105105
"react-dom": "~16.2.0",
106106
"react-modal": "3.3.2",
107107
"react-router": "^4.2.0",
108108
"react-router-dom": "4.2.2",
109109
"react-test-renderer": "~16.2.0",
110-
"semantic-release": "^15.1.5",
111-
"source-map-support": "^0.5.4",
110+
"semantic-release": "^15.4.0",
111+
"source-map-support": "^0.5.5",
112112
"style-loader": "^0.19.1",
113113
"stylelint": "^9.2.0",
114114
"stylelint-config-prettier": "^3.2.0",
115115
"stylelint-config-recommended": "^2.1.0",
116-
"ts-jest": "~22.4.1",
116+
"ts-jest": "^22.4.5",
117117
"ts-loader": "^3.5.0",
118-
"tsconfig-paths-webpack-plugin": "^3.0.2",
119-
"tslint": "^5.9.1",
120-
"tslint-language-service": "^0.9.8",
118+
"tsconfig-paths-webpack-plugin": "^3.0.4",
119+
"tslint": "^5.10.0",
120+
"tslint-language-service": "^0.9.9",
121121
"typedoc": "^0.10.0",
122122
"typescript": "~2.7.2",
123-
"url-loader": "0.5.9",
123+
"url-loader": "^1.0.1",
124124
"webpack": "~3.8.1"
125125
},
126126
"dependencies": {
127127
"@sbac/sbac-ui-kit": "github:osu-cass/sbac-global-ui-kit#develop",
128128
"font-awesome": "~4.7.0",
129129
"jquery": "3.2.1",
130-
"moment": "^2.22.0",
130+
"moment": "^2.22.1",
131131
"typeface-pt-sans-caption": "0.0.44",
132132
"typeface-pt-serif": "0.0.44",
133133
"typeface-pt-serif-caption": "0.0.44"

‎src/Assets/Styles/advanced-filter.less

+6-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
border-top: 1px solid @grey-border-color;
99
box-shadow: @box-shadow;
1010
flex-basis: 300px;
11+
padding: 0;
12+
overflow: hidden;
1113

1214
*:not(span) {
1315
font-family: inherit;
@@ -18,7 +20,7 @@
1820
display: flex;
1921
flex-direction: column;
2022
width: 100%;
21-
background-color: @background-color-base;
23+
background-color: @sb-white;
2224
}
2325

2426
div.adv-filter-group {
@@ -27,6 +29,9 @@ div.adv-filter-group {
2729
width: 100%;
2830
z-index: 1;
2931
background-color: @sb-white;
32+
padding: @spacing-unit @spacing-unit 0 @spacing-unit;
33+
background-color: @background-color-base;
34+
border-bottom: 1px solid @grey-border-color;
3035
}
3136

3237
div.filter-title-container {
@@ -136,5 +141,4 @@ div.filter-btn-group > button.btn {
136141
max-height: 30vh;
137142
flex-basis: 150px;
138143
align-content: flex-start;
139-
140144
}

‎src/CsvEntry/CsvEntry.tsx

+20-19
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from "react";
22
import {
3-
ToolTip,
3+
generateTooltip,
44
ItemRevisionModel,
55
CsvRowModel,
66
parseCsv,
@@ -25,26 +25,27 @@ export class CsvEntry extends React.Component<CsvEntryProps, CsvEntryState> {
2525
}
2626

2727
renderHelpButton() {
28+
const helpText: JSX.Element = (
29+
<p>Enter bank key and item id for the items you would like to add</p>
30+
);
31+
const displayText: JSX.Element = (
32+
<button
33+
className="item-nav-btn btn btn-default btn-sm about-item-btn"
34+
role="button"
35+
aria-label="Open help text"
36+
>
37+
<span className="fa fa-info-circle" aria-hidden="true" />
38+
Help
39+
</button>
40+
);
41+
2842
return (
2943
<div className="help-button">
30-
<ToolTip
31-
helpText={
32-
<p>
33-
Enter bank key and item id for the items you would like to add
34-
</p>
35-
}
36-
position="bottom"
37-
side="left"
38-
>
39-
<button
40-
className="item-nav-btn btn btn-default btn-sm about-item-btn"
41-
role="button"
42-
aria-label="Open help text"
43-
>
44-
<span className="fa fa-info-circle" aria-hidden="true" />
45-
Help
46-
</button>
47-
</ToolTip>
44+
{generateTooltip({
45+
helpText,
46+
displayText,
47+
displayIcon: undefined
48+
})}
4849
</div>
4950
);
5051
}

‎src/CsvEntry/__tests__/__snapshots__/CsvEntry.test.tsx.snap

+42-45
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,25 @@ exports[`CsvEntry calls handle csv blur 1`] = `
88
className="help-button"
99
>
1010
<ToolTip
11+
displayText={
12+
<button
13+
aria-label="Open help text"
14+
className="item-nav-btn btn btn-default btn-sm about-item-btn"
15+
role="button"
16+
>
17+
<span
18+
aria-hidden="true"
19+
className="fa fa-info-circle"
20+
/>
21+
Help
22+
</button>
23+
}
1124
helpText={
1225
<p>
1326
Enter bank key and item id for the items you would like to add
1427
</p>
1528
}
16-
position="bottom"
17-
side="left"
18-
>
19-
<button
20-
aria-label="Open help text"
21-
className="item-nav-btn btn btn-default btn-sm about-item-btn"
22-
role="button"
23-
>
24-
<span
25-
aria-hidden="true"
26-
className="fa fa-info-circle"
27-
/>
28-
Help
29-
</button>
30-
</ToolTip>
29+
/>
3130
</div>
3231
<textarea
3332
className="csv-text-entry"
@@ -45,26 +44,25 @@ exports[`CsvEntry calls handle csv change 1`] = `
4544
className="help-button"
4645
>
4746
<ToolTip
47+
displayText={
48+
<button
49+
aria-label="Open help text"
50+
className="item-nav-btn btn btn-default btn-sm about-item-btn"
51+
role="button"
52+
>
53+
<span
54+
aria-hidden="true"
55+
className="fa fa-info-circle"
56+
/>
57+
Help
58+
</button>
59+
}
4860
helpText={
4961
<p>
5062
Enter bank key and item id for the items you would like to add
5163
</p>
5264
}
53-
position="bottom"
54-
side="left"
55-
>
56-
<button
57-
aria-label="Open help text"
58-
className="item-nav-btn btn btn-default btn-sm about-item-btn"
59-
role="button"
60-
>
61-
<span
62-
aria-hidden="true"
63-
className="fa fa-info-circle"
64-
/>
65-
Help
66-
</button>
67-
</ToolTip>
65+
/>
6866
</div>
6967
<textarea
7068
className="csv-text-entry"
@@ -83,26 +81,25 @@ exports[`CsvEntry matches snapshot 1`] = `
8381
className="help-button"
8482
>
8583
<ToolTip
84+
displayText={
85+
<button
86+
aria-label="Open help text"
87+
className="item-nav-btn btn btn-default btn-sm about-item-btn"
88+
role="button"
89+
>
90+
<span
91+
aria-hidden="true"
92+
className="fa fa-info-circle"
93+
/>
94+
Help
95+
</button>
96+
}
8697
helpText={
8798
<p>
8899
Enter bank key and item id for the items you would like to add
89100
</p>
90101
}
91-
position="bottom"
92-
side="left"
93-
>
94-
<button
95-
aria-label="Open help text"
96-
className="item-nav-btn btn btn-default btn-sm about-item-btn"
97-
role="button"
98-
>
99-
<span
100-
aria-hidden="true"
101-
className="fa fa-info-circle"
102-
/>
103-
Help
104-
</button>
105-
</ToolTip>
102+
/>
106103
</div>
107104
<textarea
108105
className="csv-text-entry"

0 commit comments

Comments
 (0)