@asd20/ui 3.2.541 → 3.2.543

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/src/components/organisms/Asd20PageFooter/index.vue +8 -4
  3. package/src/components/organisms/Asd20TertiaryHeader/index.vue +1 -0
  4. package/src/helpers/organization.js +11 -2
package/package.json CHANGED
@@ -5,7 +5,7 @@
5
5
  "*.scss",
6
6
  "*.vue"
7
7
  ],
8
- "version": "3.2.541",
8
+ "version": "3.2.543",
9
9
  "private": false,
10
10
  "license": "MIT",
11
11
  "repository": {
package/src/components/organisms/Asd20PageFooter/index.vue CHANGED
@@ -129,8 +129,12 @@ import Asd20SocialMenu from '../../../components/molecules/Asd20SocialMenu'
129
129
  import Asd20Logo from '../../../components/atoms/Asd20Logo'
130
130
  import Asd20DistrictLogo from '../../../components/atoms/Asd20DistrictLogo'
131
131
  import organizationAddress from '../../../data/organization-address.json'
132
- import organizationTitle from '../../../helpers/organizationTitle'
133
- import organizationSubtitle from '../../../helpers/organizationSubtitle'
132
+ import {
133
+ organizationLevel,
134
+ organizationName,
135
+ } from '../../../helpers/organization.js'
136
+ // import organizationTitle from '../../../helpers/organizationTitle'
137
+ // import organizationSubtitle from '../../../helpers/organizationSubtitle'
134
138
 
135
139
  export default {
136
140
  name: 'Asd20PageFooter',
@@ -187,10 +191,10 @@ export default {
187
191
  return adminData ? adminData.email : ''
188
192
  },
189
193
  mapOrganizationTitle() {
190
- return organizationTitle(this.organization.title)
194
+ return organizationName(this.organization.title)
191
195
  },
192
196
  mapOrganizationSubtitle() {
193
- return organizationSubtitle(this.organization.title)
197
+ return organizationLevel(this.organization.title)
194
198
  },
195
199
  },
196
200
  }
package/src/components/organisms/Asd20TertiaryHeader/index.vue CHANGED
@@ -111,6 +111,7 @@ export default {
111
111
 
112
112
  @media (min-width: 667px) {
113
113
  .asd20-tertiary-header {
114
+ background: var(--color__secondary-t10) var(--website-texture__reverse);
114
115
  &::v-deep .lead {
115
116
  width: 100%;
116
117
  }
package/src/helpers/organization.js CHANGED
@@ -1,16 +1,25 @@
1
1
  export function organizationName(title) {
2
2
  return title.replace(
3
- /(\bElementary School|Elementary-Middle School|Middle School|Middle-High School|High School|Elementary-Middle-High School|\w*[-]\w*\b)(?!.*\1)/g,
3
+ /(\bElementary School|Elementary-Middle School|Middle School|Middle-High School|High School|Elementary-Middle-High School)/g,
4
4
  ''
5
5
  )
6
+ // return title.replace(
7
+ // /(\bElementary School|Elementary-Middle School|Middle School|Middle-High School|High School|Elementary-Middle-High School|\w*[-]\w*\b)(?!.*\1)/g,
8
+ // ''
9
+ // )
6
10
  }
7
11
 
8
12
  export function organizationLevel(title) {
9
13
  return (
10
14
  title.match(
11
- /(\bElementary School|Elementary-Middle School|Middle School|Middle-High School|High School|Elementary-Middle-High School|\w*[-]\w*\b)(?!.*\1)/g
15
+ /(\bElementary School|Elementary-Middle School|Middle School|Middle-High School|High School|Elementary-Middle-High School)/g
12
16
  ) || []
13
17
  ).join('')
18
+ // return (
19
+ // title.match(
20
+ // /(\bElementary School|Elementary-Middle School|Middle School|Middle-High School|High School|Elementary-Middle-High School|\w*[-]\w*\b)(?!.*\1)/g
21
+ // ) || []
22
+ // ).join('')
14
23
  }
15
24
 
16
25
  // TODO: Move to picker, not generic enough, specific to the pickers logic/ui