Skip to content

Commit

Permalink
fix(community-side-navigation): set explicit white background
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrew-K-Lam authored and theetrain committed Jan 8, 2019
1 parent a50d832 commit dc43d66
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 24 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,15 @@
"contributions": [
"tds"
]
},
{
"login": "simpleimpulse",
"name": "Ani",
"avatar_url": "https://avatars2.githubusercontent.com/u/2739819?v=4",
"profile": "https://github.com/simpleimpulse",
"contributions": [
"tds"
]
}
]
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,5 @@ To learn how to make contributions to TDS Community, See the [contributing guide
<!-- prettier-ignore -->
| [<img src="https://avatars0.githubusercontent.com/u/10531523?v=4" width="100px;"/><br /><sub><b>Marco Donnici</b></sub>](https://github.com/marcod1419)<br />[](#tds-marcod1419 "") | [<img src="https://avatars0.githubusercontent.com/u/1375942?v=4" width="100px;"/><br /><sub><b>Ryan Oglesby</b></sub>](http://ryanogles.by)<br />[](#tds-ryanoglesby08 "") | [<img src="https://avatars0.githubusercontent.com/u/12798751?v=4" width="100px;"/><br /><sub><b>Enrico Sacchetti</b></sub>](http://theetrain.ca)<br />[](#tds-theetrain "") | [<img src="https://avatars1.githubusercontent.com/u/9420407?v=4" width="100px;"/><br /><sub><b>Jack Reeves</b></sub>](https://github.com/jackreeves)<br />[](#tds-jackreeves "") | [<img src="https://avatars1.githubusercontent.com/u/5464587?v=4" width="100px;"/><br /><sub><b>Jesse David Peterson</b></sub>](http://www.jes.dav.pet)<br />[](#tds-jesdavpet "") | [<img src="https://avatars1.githubusercontent.com/u/32303524?v=4" width="100px;"/><br /><sub><b>Mujtaba Hasni</b></sub>](https://github.com/mujtabahasni)<br />[](#tds-mujtabahasni "") | [<img src="https://avatars3.githubusercontent.com/u/26413531?v=4" width="100px;"/><br /><sub><b>Anatolii Gorovyi</b></sub>](https://github.com/agorovyi)<br />[](#tds-agorovyi "") |
| :---: | :---: | :---: | :---: | :---: | :---: | :---: |
| [<img src="https://avatars3.githubusercontent.com/u/42220619?v=4" width="100px;"/><br /><sub><b>Christina L.</b></sub>](https://github.com/Christina-Lo)<br />[](#tds-Christina-Lo "") | [<img src="https://avatars0.githubusercontent.com/u/931411?v=4" width="100px;"/><br /><sub><b>Andrew Lam</b></sub>](https://github.com/Andrew-K-Lam)<br />[](#tds-Andrew-K-Lam "") | [<img src="https://avatars0.githubusercontent.com/u/1036187?v=4" width="100px;"/><br /><sub><b>Jordan Raffoul</b></sub>](http://jordanraffoul.com)<br />[](#tds-jraff "") | [<img src="https://avatars2.githubusercontent.com/u/22725151?v=4" width="100px;"/><br /><sub><b>Nicholas Mak</b></sub>](https://github.com/nicmak)<br />[](#tds-nicmak "") | [<img src="https://avatars1.githubusercontent.com/in/2740?v=4" width="100px;"/><br /><sub><b>renovate[bot]</b></sub>](https://github.com/apps/renovate)<br />[](#tds-renovate[bot] "") | [<img src="https://avatars1.githubusercontent.com/u/3803746?v=4" width="100px;"/><br /><sub><b>Mike Bunce</b></sub>](https://github.com/sketchidea)<br />[](#tds-sketchidea "") |
| [<img src="https://avatars3.githubusercontent.com/u/42220619?v=4" width="100px;"/><br /><sub><b>Christina L.</b></sub>](https://github.com/Christina-Lo)<br />[](#tds-Christina-Lo "") | [<img src="https://avatars0.githubusercontent.com/u/931411?v=4" width="100px;"/><br /><sub><b>Andrew Lam</b></sub>](https://github.com/Andrew-K-Lam)<br />[](#tds-Andrew-K-Lam "") | [<img src="https://avatars0.githubusercontent.com/u/1036187?v=4" width="100px;"/><br /><sub><b>Jordan Raffoul</b></sub>](http://jordanraffoul.com)<br />[](#tds-jraff "") | [<img src="https://avatars2.githubusercontent.com/u/22725151?v=4" width="100px;"/><br /><sub><b>Nicholas Mak</b></sub>](https://github.com/nicmak)<br />[](#tds-nicmak "") | [<img src="https://avatars1.githubusercontent.com/in/2740?v=4" width="100px;"/><br /><sub><b>renovate[bot]</b></sub>](https://github.com/apps/renovate)<br />[](#tds-renovate[bot] "") | [<img src="https://avatars1.githubusercontent.com/u/3803746?v=4" width="100px;"/><br /><sub><b>Mike Bunce</b></sub>](https://github.com/sketchidea)<br />[](#tds-sketchidea "") | [<img src="https://avatars2.githubusercontent.com/u/2739819?v=4" width="100px;"/><br /><sub><b>Ani</b></sub>](https://github.com/simpleimpulse)<br />[](#tds-simpleimpulse "") |
<!-- ALL-CONTRIBUTORS-LIST:END -->
2 changes: 1 addition & 1 deletion packages/SideNavigation/SubMenu/SubMenu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const SubMenu = ({ children, label, onClick, id, isOpen, active }) => {
onClick={() => {
onClick(id)
}}
className={active ? styles.active : styles.button}
className={active ? styles.active : styles.buttonDefault}
>
<Box vertical={3} inline horizontal={2} dangerouslyAddClassName={styles.space}>
<ColoredTextProvider>
Expand Down
12 changes: 7 additions & 5 deletions packages/SideNavigation/SubMenu/SubMenu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,22 @@ $font-telus: 'TELUS-Web', 'Helvetica Neue', Helvetica, Arial, sans-serif;
);
}

.active {
button {
background-color: white;
border: none;
width: 100%;
}

.active {
border-left: 4px solid $color-telus-purple;
color: $color-telus-purple;
width: 100%;
&:hover {
background-color: $color-white-lilac;
cursor: pointer;
}
}

.button {
border: none;
width: 100%;
.buttonDefault {
font-family: $font-telus;
color: $color-shuttle-grey;
&:hover {
Expand Down
53 changes: 36 additions & 17 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1397,6 +1397,17 @@
mkdirp "^0.5.1"
rimraf "^2.5.2"

"@mrmlnc/readdir-enhanced@^2.2.1":
version "2.2.1"
resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
dependencies:
call-me-maybe "^1.0.1"
glob-to-regexp "^0.3.0"

"@nodelib/fs.stat@^1.1.2":
version "1.1.3"
resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"

"@samverschueren/stream-to-observable@^0.3.0":
version "0.3.0"
resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
Expand Down Expand Up @@ -3214,6 +3225,10 @@ cachedir@2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.1.0.tgz#b448c32b44cd9c0cd6ce4c419fa5b3c112c02191"

call-me-maybe@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"

caller-callsite@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
Expand Down Expand Up @@ -3485,7 +3500,7 @@ cli-cursor@^1.0.1, cli-cursor@^1.0.2:
dependencies:
restore-cursor "^1.0.1"

cli-cursor@^2.0.0, cli-cursor@^2.1.0:
cli-cursor@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
dependencies:
Expand Down Expand Up @@ -5485,6 +5500,17 @@ fast-diff@^1.1.2:
version "1.2.0"
resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"

fast-glob@^2.0.2:
version "2.2.4"
resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.4.tgz#e54f4b66d378040e0e4d6a68ec36bbc5b04363c0"
dependencies:
"@mrmlnc/readdir-enhanced" "^2.2.1"
"@nodelib/fs.stat" "^1.1.2"
glob-parent "^3.1.0"
is-glob "^4.0.0"
merge2 "^1.2.3"
micromatch "^3.1.10"

fast-json-stable-stringify@^2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
Expand Down Expand Up @@ -6132,6 +6158,10 @@ glob-parent@^3.1.0:
is-glob "^3.1.0"
path-dirname "^1.0.0"

glob-to-regexp@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"

glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
version "7.1.2"
resolved "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
Expand Down Expand Up @@ -8641,14 +8671,6 @@ log-update@^1.0.2:
ansi-escapes "^1.0.0"
cli-cursor "^1.0.2"

log-update@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708"
dependencies:
ansi-escapes "^3.0.0"
cli-cursor "^2.0.0"
wrap-ansi "^3.0.1"

loglevel@^1.4.1:
version "1.6.1"
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
Expand Down Expand Up @@ -8920,6 +8942,10 @@ merge-stream@^1.0.1:
dependencies:
readable-stream "^2.0.1"

merge2@^1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"

merge@1.2.0, merge@^1.1.3, merge@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
Expand All @@ -8946,7 +8972,7 @@ micromatch@^2.3.11, micromatch@^2.3.7:
parse-glob "^3.0.4"
regex-cache "^0.4.2"

micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
version "3.1.10"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
dependencies:
Expand Down Expand Up @@ -13949,13 +13975,6 @@ wrap-ansi@^2.0.0:
string-width "^1.0.1"
strip-ansi "^3.0.1"

wrap-ansi@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"
dependencies:
string-width "^2.1.1"
strip-ansi "^4.0.0"

wrappy@1:
version "1.0.2"
resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
Expand Down

0 comments on commit dc43d66

Please sign in to comment.