@asd20/ui 3.2.383 → 3.2.384

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 (28) hide show
  1. package/package-lock.json +14 -1
  2. package/package.json +3 -2
  3. package/src/components/atoms/Asd20SkipTo/index.vue +31 -31
  4. package/src/components/molecules/Asd20Card/index.vue +3 -3
  5. package/src/components/molecules/Asd20Swiper/index.vue +13 -12
  6. package/src/components/organisms/Asd20SchoolHomepageHeader/index.vue +1 -1
  7. package/src/components/organisms/Asd20SchoolHomepageVideoHeader/index.vue +2 -2
  8. package/src/components/organisms/Asd20SiteNavigation/index.vue +13 -1
  9. package/src/components/organisms/Asd20SwiperFeed/index.vue +1 -1
  10. package/src/components/organisms/Asd20VideoHeader/index.vue +1 -1
  11. package/src/components/organisms/Asd20VideoHeaderContent/index.vue +2 -2
  12. package/src/components/templates/Asd20ArticleDigestTemplate/index.vue +14 -12
  13. package/src/components/templates/Asd20BasePageTemplate/index.vue +13 -13
  14. package/src/components/templates/Asd20CampusDetailTemplate/index.vue +1 -0
  15. package/src/components/templates/Asd20DetailAlternateTemplate/index.vue +14 -12
  16. package/src/components/templates/Asd20DetailTemplate/index.vue +13 -13
  17. package/src/components/templates/Asd20DistrictHomeTemplate/index.vue +14 -14
  18. package/src/components/templates/Asd20DistrictVideoTemplate/index.vue +17 -15
  19. package/src/components/templates/Asd20FileListPageTemplate/index.vue +13 -13
  20. package/src/components/templates/Asd20GroupFeatureTemplate/index.vue +13 -12
  21. package/src/components/templates/Asd20LoginsTemplate/index.vue +13 -13
  22. package/src/components/templates/Asd20PeopleFeatureTemplate/index.vue +13 -13
  23. package/src/components/templates/Asd20ProfileTemplate/index.vue +13 -12
  24. package/src/components/templates/Asd20SalaryCalculatorTemplate/index.vue +13 -13
  25. package/src/components/templates/Asd20SchoolHomeTemplate/index.vue +13 -13
  26. package/src/components/templates/Asd20SchoolHomeVideoTemplate/index.vue +13 -13
  27. package/src/components/templates/Asd20WayfindingTemplate/index.vue +13 -13
  28. package/src/design/_mixins.scss +2 -2
package/package-lock.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@asd20/ui",
3
- "version": "3.2.300",
3
+ "version": "3.2.383",
4
4
  "lockfileVersion": 1,
5
5
  "requires": true,
6
6
  "dependencies": {
@@ -6838,6 +6838,11 @@
6838
6838
  }
6839
6839
  }
6840
6840
  },
6841
+ "body-scroll-lock": {
6842
+ "version": "2.7.1",
6843
+ "resolved": "https://registry.npmjs.org/body-scroll-lock/-/body-scroll-lock-2.7.1.tgz",
6844
+ "integrity": "sha512-hS53SQ8RhM0e4DsQ3PKz6Gr2O7Kpdh59TWU98GHjaQznL7y4dFycEPk7pFQAikqBaUSCArkc5E3pe7CWIt2fZA=="
6845
+ },
6841
6846
  "bonjour": {
6842
6847
  "version": "3.5.0",
6843
6848
  "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
@@ -29466,6 +29471,14 @@
29466
29471
  "resolved": "https://registry.npmjs.org/v-click-outside/-/v-click-outside-2.1.5.tgz",
29467
29472
  "integrity": "sha512-VPNCOTZK6WZy73lcWc+R7IW1uaBFEO3/Csrs5CzWVOdvE30V8Y1+BE/BtTlcEmeDGx0eqdE7bSCg55Jj37PMJg=="
29468
29473
  },
29474
+ "v-scroll-lock": {
29475
+ "version": "1.3.1",
29476
+ "resolved": "https://registry.npmjs.org/v-scroll-lock/-/v-scroll-lock-1.3.1.tgz",
29477
+ "integrity": "sha512-t41gdxloJ0+5VzHPTi9+PjqjXMeXsM81nP1QUszMQCaLp4pfF0vcJ8aNh3UKK49Pc+RJdCbw3Kj/Z1HCSPQEyA==",
29478
+ "requires": {
29479
+ "body-scroll-lock": "^2.6.4"
29480
+ }
29481
+ },
29469
29482
  "validate-npm-package-license": {
29470
29483
  "version": "3.0.4",
29471
29484
  "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
package/package.json CHANGED
@@ -5,7 +5,7 @@
5
5
  "*.scss",
6
6
  "*.vue"
7
7
  ],
8
- "version": "3.2.383",
8
+ "version": "3.2.384",
9
9
  "private": false,
10
10
  "license": "MIT",
11
11
  "repository": {
@@ -35,8 +35,9 @@
35
35
  "date-fns": "^1.30.1",
36
36
  "js-cookie": "^2.2.1",
37
37
  "lodash-es": "^4.17.15",
38
- "swiper": "^5.3.6",
38
+ "swiper": "^5.4.5",
39
39
  "uuid": "^3.3.2",
40
+ "v-scroll-lock": "^1.3.1",
40
41
  "vue-ctk-date-time-picker": "^2.1.1",
41
42
  "vue-intersect": "^1.1.6",
42
43
  "vue-lazyload": "^1.2.6",
package/src/components/atoms/Asd20SkipTo/index.vue CHANGED
@@ -23,40 +23,40 @@ export default {
23
23
  },
24
24
  },
25
25
 
26
- mounted() {
27
- this.init()
28
- },
26
+ // mounted() {
27
+ // this.init()
28
+ // },
29
29
 
30
- methods: {
31
- init() {
32
- window.addEventListener(
33
- 'hashchange',
34
- () => {
35
- this.focusElement(location.hash.substring(1))
36
- },
37
- false
38
- )
30
+ // methods: {
31
+ // init() {
32
+ // window.addEventListener(
33
+ // 'hashchange',
34
+ // () => {
35
+ // this.focusElement(location.hash.substring(1))
36
+ // },
37
+ // false
38
+ // )
39
39
 
40
- if (location.hash && location.hash.substring(1)) {
41
- this.focusElement(location.hash.substring(1))
42
- }
43
- },
40
+ // if (location.hash && location.hash.substring(1)) {
41
+ // this.focusElement(location.hash.substring(1))
42
+ // }
43
+ // },
44
44
 
45
- focusElement(id) {
46
- if (!id) return
47
- let element = window.document.getElementById(id)
48
- if (element) {
49
- if (
50
- !/^(a|select|input|button|textarea)/i.test(
51
- element.tagName.toLowerCase()
52
- )
53
- ) {
54
- element.setAttribute('tabindex', -1)
55
- }
56
- element.focus()
57
- }
58
- },
59
- },
45
+ // focusElement(id) {
46
+ // if (!id) return
47
+ // let element = window.document.getElementById(id)
48
+ // if (element) {
49
+ // if (
50
+ // !/^(a|select|input|button|textarea)/i.test(
51
+ // element.tagName.toLowerCase()
52
+ // )
53
+ // ) {
54
+ // element.setAttribute('tabindex', -1)
55
+ // }
56
+ // element.focus()
57
+ // }
58
+ // },
59
+ // },
60
60
  }
61
61
  </script>
62
62
 
package/src/components/molecules/Asd20Card/index.vue CHANGED
@@ -44,7 +44,7 @@
44
44
  <a
45
45
  class="asd20-card__link"
46
46
  v-if="link"
47
- :href="link"
47
+ :href="link ? link : ''"
48
48
  :title="title"
49
49
  v-html="linkLabel"
50
50
  :tabindex="disableFocus ? -1 : 0"
@@ -254,8 +254,8 @@ export default {
254
254
  border-radius: var(--website-shape__radius-m);
255
255
  }
256
256
  &:focus::after {
257
- box-shadow: 0 0 0 5px var(--website-page__link-color) inset,
258
- 0 0 0 10px white inset;
257
+ box-shadow: 0 0 0 2px var(--color__accent-s30) inset,
258
+ 0 0 0 4px white inset;
259
259
  // @include asd20-focus;
260
260
  }
261
261
  &:active::after {
package/src/components/molecules/Asd20Swiper/index.vue CHANGED
@@ -1,5 +1,13 @@
1
1
  <template>
2
2
  <div class="asd20-swiper" :style="styles">
3
+ <!-- <button
4
+ tabindex="-1"
5
+ ref="prev"
6
+ title="Previous"
7
+ class="asd20-swiper__prev"
8
+ >
9
+ <span>Previous</span>
10
+ </button> -->
3
11
  <div ref="swiper" class="swiper-container">
4
12
  <slot name="before-wrapper" />
5
13
  <div class="swiper-wrapper">
@@ -8,17 +16,10 @@
8
16
  <div ref="pagination" class="swiper-pagination" />
9
17
  <slot name="after-wrapper" />
10
18
  </div>
11
- <button
12
- tabindex="-1"
13
- ref="prev"
14
- title="Previous"
15
- class="asd20-swiper__prev"
16
- >
17
- <span>Previous</span>
18
- </button>
19
- <button tabindex="-1" ref="next" title="Next" class="asd20-swiper__next">
19
+
20
+ <!-- <button tabindex="-1" ref="next" title="Next" class="asd20-swiper__next">
20
21
  <span>Next</span>
21
- </button>
22
+ </button> -->
22
23
  </div>
23
24
  </template>
24
25
 
@@ -92,7 +93,7 @@ export default {
92
93
  enabled: false,
93
94
  onlyInViewport: true,
94
95
  },
95
- a11y: false,
96
+ a11y: true,
96
97
  },
97
98
  this.options,
98
99
  {
@@ -104,7 +105,7 @@ export default {
104
105
  },
105
106
  pagination: {
106
107
  el: this.$refs.pagination,
107
- clickable: true,
108
+ clickable: false,
108
109
  },
109
110
  navigation: {
110
111
  prevEl: this.$refs.prev,
package/src/components/organisms/Asd20SchoolHomepageHeader/index.vue CHANGED
@@ -9,7 +9,7 @@
9
9
  <slot name="top" />
10
10
  </div>
11
11
 
12
- <div class="asd20-school-homepage-header__content">
12
+ <div id="main" class="asd20-school-homepage-header__content">
13
13
  <h1 v-if="heading" v-html="heading" />
14
14
  <div v-if="lead" class="asd20-school-homepage-header__lead">
15
15
  <span v-html="lead"></span>
package/src/components/organisms/Asd20SchoolHomepageVideoHeader/index.vue CHANGED
@@ -25,7 +25,7 @@
25
25
  <source :src="videoUrl" type="video/mp4" />
26
26
  </video>
27
27
  <img class="background-image" :src="imageUrl" :alt="imageCaption" />
28
- <div class="asd20-school-homepage-video-header__content">
28
+ <div id="main" class="asd20-school-homepage-video-header__content">
29
29
  <h1 v-if="heading" v-html="heading" />
30
30
  <div v-if="lead" class="asd20-school-homepage-video-header__lead">
31
31
  <span v-html="lead"></span>
@@ -58,7 +58,7 @@
58
58
  >
59
59
  <slot name="aside" />
60
60
  </aside>
61
- <div class="scroll-down-indicator"></div>
61
+ <!-- <div class="scroll-down-indicator"></div> -->
62
62
  <slot />
63
63
  </header>
64
64
  </template>
package/src/components/organisms/Asd20SiteNavigation/index.vue CHANGED
@@ -46,10 +46,17 @@
46
46
  :active="menuOpen"
47
47
  @update:active="$emit('update:menuOpen', $event)"
48
48
  :sections="navigation"
49
+ v-scroll-lock="menuOpen"
49
50
  />
50
51
  </transition>
51
52
  <transition name="slide">
52
53
  <asd20-action-menu
54
+ v-show="(mq === 'lg' || mq === 'xl') && isLoaded"
55
+ :items="actionItems"
56
+ :active="menuOpen"
57
+ @update:active="$emit('update:menuOpen', $event)"
58
+ />
59
+ <!-- <asd20-action-menu
53
60
  v-show="
54
61
  (menuOpen && (mq === 'sm' || mq === 'md') && isLoaded) ||
55
62
  ((mq === 'lg' || mq === 'xl') && isLoaded)
@@ -57,7 +64,7 @@
57
64
  :items="actionItems"
58
65
  :active="menuOpen"
59
66
  @update:active="$emit('update:menuOpen', $event)"
60
- />
67
+ /> -->
61
68
  </transition>
62
69
  <transition name="slide">
63
70
  <asd20-site-search
@@ -71,6 +78,8 @@
71
78
  </template>
72
79
 
73
80
  <script>
81
+ import Vue from 'vue'
82
+
74
83
  import Asd20ActionMenu from '../../../components/organisms/Asd20ActionMenu'
75
84
  import Asd20SiteMenu from '../../../components/organisms/Asd20SiteMenu'
76
85
  import Asd20SiteSearch from '../../../components/organisms/Asd20SiteSearch'
@@ -78,6 +87,9 @@ import Asd20Navbar from '../../../components/organisms/Asd20Navbar'
78
87
  import Asd20DistrictLogo from '../../../components/atoms/Asd20DistrictLogo'
79
88
  import Asd20OrganizationPicker from '../../../components/organisms/Asd20OrganizationPicker'
80
89
 
90
+ import VScrollLock from 'v-scroll-lock'
91
+ Vue.use(VScrollLock)
92
+
81
93
  export default {
82
94
  name: 'Asd20SiteNavigation',
83
95
  components: {
package/src/components/organisms/Asd20SwiperFeed/index.vue CHANGED
@@ -72,7 +72,7 @@ export default {
72
72
  return {
73
73
  slidesPerView: 1,
74
74
  slidesPerGroup: 1,
75
- grabCursor: true,
75
+ grabCursor: false,
76
76
  pagination: {
77
77
  type: 'bullets',
78
78
  },
package/src/components/organisms/Asd20VideoHeader/index.vue CHANGED
@@ -22,7 +22,7 @@
22
22
  </video>
23
23
 
24
24
  <img class="background-image" :src="imageUrl" alt="" />
25
- <div class="scroll-down-indicator"></div>
25
+ <!-- <div class="scroll-down-indicator"></div> -->
26
26
  <slot />
27
27
  </header>
28
28
  </template>
package/src/components/organisms/Asd20VideoHeaderContent/index.vue CHANGED
@@ -1,5 +1,5 @@
1
1
  <template>
2
- <component :is="tag" id="main" class="asd20-video-header-content">
2
+ <component :is="tag" class="asd20-video-header-content">
3
3
  <slot name="before"></slot>
4
4
 
5
5
  <section class="header-messaging-section">
@@ -8,7 +8,7 @@
8
8
  :key="index"
9
9
  v-bind="messaging"
10
10
  ></asd20-messaging> -->
11
- <asd20-messaging v-bind="messages[0]"></asd20-messaging>
11
+ <asd20-messaging id="main" v-bind="messages[0]"></asd20-messaging>
12
12
  </section>
13
13
 
14
14
  <slot name="default"></slot>
package/src/components/templates/Asd20ArticleDigestTemplate/index.vue CHANGED
@@ -12,6 +12,20 @@
12
12
  @toggle-all="$emit('toggle-all')"
13
13
  />
14
14
  </client-only>
15
+
16
+ <!-- Site Navigation -->
17
+ <asd20-site-navigation
18
+ :navigation="navigation"
19
+ :action-items="actionItems"
20
+ @update:menuOpen="$emit('update:menuOpen', $event)"
21
+ :menu-open="menuOpen"
22
+ @update:searchOpen="$emit('update:searchOpen', $event)"
23
+ :search-open="searchOpen"
24
+ :organization="organization"
25
+ :organization-options="organizationOptions"
26
+ >
27
+ </asd20-site-navigation>
28
+
15
29
  <!-- Page Header -->
16
30
  <asd20-page-header
17
31
  id="page-header"
@@ -39,18 +53,6 @@
39
53
  <!-- <asd20-breadcrumb slot="top" :links="breadcrumbLinks"></asd20-breadcrumb> -->
40
54
  </asd20-page-header>
41
55
 
42
- <!-- Site Navigation -->
43
- <asd20-site-navigation
44
- :navigation="navigation"
45
- :action-items="actionItems"
46
- @update:menuOpen="$emit('update:menuOpen', $event)"
47
- :menu-open="menuOpen"
48
- @update:searchOpen="$emit('update:searchOpen', $event)"
49
- :search-open="searchOpen"
50
- :organization="organization"
51
- :organization-options="organizationOptions"
52
- >
53
- </asd20-site-navigation>
54
56
  <!-- Inline-Notifications -->
55
57
  <client-only>
56
58
  <asd20-notification-group
package/src/components/templates/Asd20BasePageTemplate/index.vue CHANGED
@@ -13,6 +13,19 @@
13
13
  ></asd20-notification-group>
14
14
  </client-only>
15
15
 
16
+ <!-- Site Navigation -->
17
+ <asd20-site-navigation
18
+ :navigation="navigation"
19
+ :action-items="actionItems"
20
+ @update:menuOpen="$emit('update:menuOpen', $event)"
21
+ :menu-open="menuOpen"
22
+ @update:searchOpen="$emit('update:searchOpen', $event)"
23
+ :search-open="searchOpen"
24
+ :organization="organization"
25
+ :organization-options="organizationOptions"
26
+ >
27
+ </asd20-site-navigation>
28
+
16
29
  <!-- Page Header -->
17
30
  <asd20-page-header
18
31
  id="page-header"
@@ -41,19 +54,6 @@
41
54
  </template>
42
55
  </asd20-page-header>
43
56
 
44
- <!-- Site Navigation -->
45
- <asd20-site-navigation
46
- :navigation="navigation"
47
- :action-items="actionItems"
48
- @update:menuOpen="$emit('update:menuOpen', $event)"
49
- :menu-open="menuOpen"
50
- @update:searchOpen="$emit('update:searchOpen', $event)"
51
- :search-open="searchOpen"
52
- :organization="organization"
53
- :organization-options="organizationOptions"
54
- >
55
- </asd20-site-navigation>
56
-
57
57
  <!-- Inline-Notifications -->
58
58
  <client-only>
59
59
  <asd20-notification-group
package/src/components/templates/Asd20CampusDetailTemplate/index.vue CHANGED
@@ -52,6 +52,7 @@
52
52
  :organization-options="organizationOptions"
53
53
  >
54
54
  </asd20-site-navigation> -->
55
+
55
56
  <!-- Inline-Notifications -->
56
57
  <client-only>
57
58
  <asd20-notification-group
package/src/components/templates/Asd20DetailAlternateTemplate/index.vue CHANGED
@@ -12,6 +12,20 @@
12
12
  @toggle-all="$emit('toggle-all')"
13
13
  />
14
14
  </client-only>
15
+
16
+ <!-- Site Navigation -->
17
+ <asd20-site-navigation
18
+ :navigation="navigation"
19
+ :action-items="actionItems"
20
+ @update:menuOpen="$emit('update:menuOpen', $event)"
21
+ :menu-open="menuOpen"
22
+ @update:searchOpen="$emit('update:searchOpen', $event)"
23
+ :search-open="searchOpen"
24
+ :organization="organization"
25
+ :organization-options="organizationOptions"
26
+ >
27
+ </asd20-site-navigation>
28
+
15
29
  <!-- Page Header -->
16
30
  <asd20-page-header
17
31
  id="page-header"
@@ -40,18 +54,6 @@
40
54
  </template>
41
55
  </asd20-page-header>
42
56
 
43
- <!-- Site Navigation -->
44
- <asd20-site-navigation
45
- :navigation="navigation"
46
- :action-items="actionItems"
47
- @update:menuOpen="$emit('update:menuOpen', $event)"
48
- :menu-open="menuOpen"
49
- @update:searchOpen="$emit('update:searchOpen', $event)"
50
- :search-open="searchOpen"
51
- :organization="organization"
52
- :organization-options="organizationOptions"
53
- >
54
- </asd20-site-navigation>
55
57
  <!-- Inline-Notifications -->
56
58
  <client-only>
57
59
  <asd20-notification-group
package/src/components/templates/Asd20DetailTemplate/index.vue CHANGED
@@ -13,6 +13,19 @@
13
13
  />
14
14
  </client-only>
15
15
 
16
+ <!-- Site Navigation -->
17
+ <asd20-site-navigation
18
+ :navigation="navigation"
19
+ :action-items="actionItems"
20
+ @update:menuOpen="$emit('update:menuOpen', $event)"
21
+ :menu-open="menuOpen"
22
+ @update:searchOpen="$emit('update:searchOpen', $event)"
23
+ :search-open="searchOpen"
24
+ :organization="organization"
25
+ :organization-options="organizationOptions"
26
+ >
27
+ </asd20-site-navigation>
28
+
16
29
  <!-- Page Header -->
17
30
  <asd20-page-header
18
31
  id="page-header"
@@ -41,19 +54,6 @@
41
54
  </template>
42
55
  </asd20-page-header>
43
56
 
44
- <!-- Site Navigation -->
45
- <asd20-site-navigation
46
- :navigation="navigation"
47
- :action-items="actionItems"
48
- @update:menuOpen="$emit('update:menuOpen', $event)"
49
- :menu-open="menuOpen"
50
- @update:searchOpen="$emit('update:searchOpen', $event)"
51
- :search-open="searchOpen"
52
- :organization="organization"
53
- :organization-options="organizationOptions"
54
- >
55
- </asd20-site-navigation>
56
-
57
57
  <!-- Inline-Notifications -->
58
58
  <client-only>
59
59
  <asd20-notification-group
package/src/components/templates/Asd20DistrictHomeTemplate/index.vue CHANGED
@@ -1,7 +1,7 @@
1
1
  <template>
2
2
  <div class="asd20-district-home-template">
3
3
  <!-- Skip Nav -->
4
- <asd20-skip-to></asd20-skip-to>
4
+ <asd20-skip-to />
5
5
 
6
6
  <!-- Banner Notifications -->
7
7
  <client-only>
@@ -13,6 +13,19 @@
13
13
  ></asd20-notification-group>
14
14
  </client-only>
15
15
 
16
+ <!-- Site Navigation -->
17
+ <asd20-site-navigation
18
+ :navigation="navigation"
19
+ :action-items="actionItems"
20
+ @update:menuOpen="$emit('update:menuOpen', $event)"
21
+ :menu-open="menuOpen"
22
+ @update:searchOpen="$emit('update:searchOpen', $event)"
23
+ :search-open="searchOpen"
24
+ :organization="organization"
25
+ :organization-options="organizationOptions"
26
+ >
27
+ </asd20-site-navigation>
28
+
16
29
  <!-- Page Header -->
17
30
 
18
31
  <!-- <asd20-choice-header
@@ -142,19 +155,6 @@
142
155
  </template>
143
156
  </asd20-return-to-school-header> -->
144
157
 
145
- <!-- Site Navigation -->
146
- <asd20-site-navigation
147
- :navigation="navigation"
148
- :action-items="actionItems"
149
- @update:menuOpen="$emit('update:menuOpen', $event)"
150
- :menu-open="menuOpen"
151
- @update:searchOpen="$emit('update:searchOpen', $event)"
152
- :search-open="searchOpen"
153
- :organization="organization"
154
- :organization-options="organizationOptions"
155
- >
156
- </asd20-site-navigation>
157
-
158
158
  <!-- <asd20-page-content
159
159
  :primary-messages="primaryMessages"
160
160
  :secondary-messages="secondaryMessages"
package/src/components/templates/Asd20DistrictVideoTemplate/index.vue CHANGED
@@ -1,7 +1,7 @@
1
1
  <template>
2
2
  <div class="asd20-district-video-template">
3
3
  <!-- Skip Nav -->
4
- <asd20-skip-to></asd20-skip-to>
4
+ <asd20-skip-to />
5
5
 
6
6
  <!-- Banner Notifications -->
7
7
  <client-only>
@@ -13,7 +13,18 @@
13
13
  ></asd20-notification-group>
14
14
  </client-only>
15
15
 
16
- <!-- Page Header -->
16
+ <!-- Site Navigation -->
17
+ <asd20-site-navigation
18
+ :navigation="navigation"
19
+ :action-items="actionItems"
20
+ @update:menuOpen="$emit('update:menuOpen', $event)"
21
+ :menu-open="menuOpen"
22
+ @update:searchOpen="$emit('update:searchOpen', $event)"
23
+ :search-open="searchOpen"
24
+ :organization="organization"
25
+ :organization-options="organizationOptions"
26
+ >
27
+ </asd20-site-navigation>
17
28
 
18
29
  <!-- Video Header -->
19
30
 
@@ -51,19 +62,6 @@
51
62
  </asd20-video-header>
52
63
  <asd20-secondary-header v-if="messages.length > 1" :messages="messages" />
53
64
 
54
- <!-- Site Navigation -->
55
- <asd20-site-navigation
56
- :navigation="navigation"
57
- :action-items="actionItems"
58
- @update:menuOpen="$emit('update:menuOpen', $event)"
59
- :menu-open="menuOpen"
60
- @update:searchOpen="$emit('update:searchOpen', $event)"
61
- :search-open="searchOpen"
62
- :organization="organization"
63
- :organization-options="organizationOptions"
64
- >
65
- </asd20-site-navigation>
66
-
67
65
  <asd20-feeds-section
68
66
  :announcements="announcements"
69
67
  :announcements-feed-props="announcementsFeedProps"
@@ -88,6 +86,10 @@
88
86
  :disclosureLinks="disclosureLinks"
89
87
  >
90
88
  <slot name="page-footer" />
89
+
90
+ <!-- analytics requested by Kyle Blakely -->
91
+ <!-- <img src="https://jelly.mdhv.io/v1/star.gif?pid=ipUavA655F50RvTSoYZIJU2vFFFB&src=mh&evt=hi"> -->
92
+
91
93
  </asd20-page-footer>
92
94
  </div>
93
95
  </template>
package/src/components/templates/Asd20FileListPageTemplate/index.vue CHANGED
@@ -13,6 +13,19 @@
13
13
  ></asd20-notification-group>
14
14
  </client-only>
15
15
 
16
+ <!-- Site Navigation -->
17
+ <asd20-site-navigation
18
+ :navigation="navigation"
19
+ :action-items="actionItems"
20
+ @update:menuOpen="$emit('update:menuOpen', $event)"
21
+ :menu-open="menuOpen"
22
+ @update:searchOpen="$emit('update:searchOpen', $event)"
23
+ :search-open="searchOpen"
24
+ :organization="organization"
25
+ :organization-options="organizationOptions"
26
+ >
27
+ </asd20-site-navigation>
28
+
16
29
  <!-- Page Header -->
17
30
  <asd20-page-header
18
31
  id="page-header"
@@ -39,19 +52,6 @@
39
52
  <!-- <asd20-breadcrumb slot="top" :links="breadcrumbLinks"></asd20-breadcrumb> -->
40
53
  </asd20-page-header>
41
54
 
42
- <!-- Site Navigation -->
43
- <asd20-site-navigation
44
- :navigation="navigation"
45
- :action-items="actionItems"
46
- @update:menuOpen="$emit('update:menuOpen', $event)"
47
- :menu-open="menuOpen"
48
- @update:searchOpen="$emit('update:searchOpen', $event)"
49
- :search-open="searchOpen"
50
- :organization="organization"
51
- :organization-options="organizationOptions"
52
- >
53
- </asd20-site-navigation>
54
-
55
55
  <!-- Page Content -->
56
56
  <asd20-page-content
57
57
  :primary-messages="primaryMessages"
package/src/components/templates/Asd20GroupFeatureTemplate/index.vue CHANGED
@@ -12,6 +12,19 @@
12
12
  @toggle-all="$emit('toggle-all')"
13
13
  />
14
14
  </client-only>
15
+
16
+ <!-- Site Navigation -->
17
+ <asd20-site-navigation
18
+ :navigation="navigation"
19
+ :action-items="actionItems"
20
+ @update:menuOpen="$emit('update:menuOpen', $event)"
21
+ :menu-open="menuOpen"
22
+ @update:searchOpen="$emit('update:searchOpen', $event)"
23
+ :search-open="searchOpen"
24
+ :organization="organization"
25
+ :organization-options="organizationOptions"
26
+ >
27
+ </asd20-site-navigation>
15
28
  <!-- Page Header -->
16
29
  <asd20-page-header
17
30
  id="page-header"
@@ -40,18 +53,6 @@
40
53
  </template>
41
54
  </asd20-page-header>
42
55
 
43
- <!-- Site Navigation -->
44
- <asd20-site-navigation
45
- :navigation="navigation"
46
- :action-items="actionItems"
47
- @update:menuOpen="$emit('update:menuOpen', $event)"
48
- :menu-open="menuOpen"
49
- @update:searchOpen="$emit('update:searchOpen', $event)"
50
- :search-open="searchOpen"
51
- :organization="organization"
52
- :organization-options="organizationOptions"
53
- >
54
- </asd20-site-navigation>
55
56
  <!-- Inline-Notifications -->
56
57
  <client-only>
57
58
  <asd20-notification-group
package/src/components/templates/Asd20LoginsTemplate/index.vue CHANGED
@@ -13,6 +13,19 @@
13
13
  ></asd20-notification-group>
14
14
  </client-only>
15
15
 
16
+ <!-- Site Navigation -->
17
+ <asd20-site-navigation
18
+ :navigation="navigation"
19
+ :action-items="actionItems"
20
+ @update:menuOpen="$emit('update:menuOpen', $event)"
21
+ :menu-open="menuOpen"
22
+ @update:searchOpen="$emit('update:searchOpen', $event)"
23
+ :search-open="searchOpen"
24
+ :organization="organization"
25
+ :organization-options="organizationOptions"
26
+ >
27
+ </asd20-site-navigation>
28
+
16
29
  <!-- Page Header -->
17
30
  <asd20-page-header
18
31
  id="page-header"
@@ -37,19 +50,6 @@
37
50
  </client-only>
38
51
  </asd20-page-header>
39
52
 
40
- <!-- Site Navigation -->
41
- <asd20-site-navigation
42
- :navigation="navigation"
43
- :action-items="actionItems"
44
- @update:menuOpen="$emit('update:menuOpen', $event)"
45
- :menu-open="menuOpen"
46
- @update:searchOpen="$emit('update:searchOpen', $event)"
47
- :search-open="searchOpen"
48
- :organization="organization"
49
- :organization-options="organizationOptions"
50
- >
51
- </asd20-site-navigation>
52
-
53
53
  <!-- Page Content -->
54
54
 
55
55
  <slot></slot>
package/src/components/templates/Asd20PeopleFeatureTemplate/index.vue CHANGED
@@ -13,6 +13,19 @@
13
13
  ></asd20-notification-group>
14
14
  </client-only>
15
15
 
16
+ <!-- Site Navigation -->
17
+ <asd20-site-navigation
18
+ :navigation="navigation"
19
+ :action-items="actionItems"
20
+ @update:menuOpen="$emit('update:menuOpen', $event)"
21
+ :menu-open="menuOpen"
22
+ @update:searchOpen="$emit('update:searchOpen', $event)"
23
+ :search-open="searchOpen"
24
+ :organization="organization"
25
+ :organization-options="organizationOptions"
26
+ >
27
+ </asd20-site-navigation>
28
+
16
29
  <!-- Page Header -->
17
30
  <asd20-page-header
18
31
  id="page-header"
@@ -40,19 +53,6 @@
40
53
  <!-- <asd20-breadcrumb slot="top" :links="breadcrumbLinks"></asd20-breadcrumb> -->
41
54
  </asd20-page-header>
42
55
 
43
- <!-- Site Navigation -->
44
- <asd20-site-navigation
45
- :navigation="navigation"
46
- :action-items="actionItems"
47
- @update:menuOpen="$emit('update:menuOpen', $event)"
48
- :menu-open="menuOpen"
49
- @update:searchOpen="$emit('update:searchOpen', $event)"
50
- :search-open="searchOpen"
51
- :organization="organization"
52
- :organization-options="organizationOptions"
53
- >
54
- </asd20-site-navigation>
55
-
56
56
  <!-- Page Content -->
57
57
  <asd20-page-content
58
58
  :primary-messages="primaryMessages"
package/src/components/templates/Asd20ProfileTemplate/index.vue CHANGED
@@ -12,6 +12,19 @@
12
12
  @toggle-all="$emit('toggle-all')"
13
13
  />
14
14
  </client-only>
15
+
16
+ <!-- Site Navigation -->
17
+ <asd20-site-navigation
18
+ :navigation="navigation"
19
+ :action-items="actionItems"
20
+ @update:menuOpen="$emit('update:menuOpen', $event)"
21
+ :menu-open="menuOpen"
22
+ @update:searchOpen="$emit('update:searchOpen', $event)"
23
+ :search-open="searchOpen"
24
+ :organization="organization"
25
+ :organization-options="organizationOptions"
26
+ >
27
+ </asd20-site-navigation>
15
28
  <!-- Page Header -->
16
29
  <asd20-page-header
17
30
  id="profile-header"
@@ -55,18 +68,6 @@
55
68
  </template>
56
69
  </asd20-page-header>
57
70
 
58
- <!-- Site Navigation -->
59
- <asd20-site-navigation
60
- :navigation="navigation"
61
- :action-items="actionItems"
62
- @update:menuOpen="$emit('update:menuOpen', $event)"
63
- :menu-open="menuOpen"
64
- @update:searchOpen="$emit('update:searchOpen', $event)"
65
- :search-open="searchOpen"
66
- :organization="organization"
67
- :organization-options="organizationOptions"
68
- >
69
- </asd20-site-navigation>
70
71
  <!-- Inline-Notifications -->
71
72
  <client-only>
72
73
  <asd20-notification-group
package/src/components/templates/Asd20SalaryCalculatorTemplate/index.vue CHANGED
@@ -13,6 +13,19 @@
13
13
  />
14
14
  </client-only>
15
15
 
16
+ <!-- Site Navigation -->
17
+ <asd20-site-navigation
18
+ :navigation="navigation"
19
+ :action-items="actionItems"
20
+ @update:menuOpen="$emit('update:menuOpen', $event)"
21
+ :menu-open="menuOpen"
22
+ @update:searchOpen="$emit('update:searchOpen', $event)"
23
+ :search-open="searchOpen"
24
+ :organization="organization"
25
+ :organization-options="organizationOptions"
26
+ >
27
+ </asd20-site-navigation>
28
+
16
29
  <!-- Page Header -->
17
30
  <asd20-page-header
18
31
  id="page-header"
@@ -41,19 +54,6 @@
41
54
  </template>
42
55
  </asd20-page-header>
43
56
 
44
- <!-- Site Navigation -->
45
- <asd20-site-navigation
46
- :navigation="navigation"
47
- :action-items="actionItems"
48
- @update:menuOpen="$emit('update:menuOpen', $event)"
49
- :menu-open="menuOpen"
50
- @update:searchOpen="$emit('update:searchOpen', $event)"
51
- :search-open="searchOpen"
52
- :organization="organization"
53
- :organization-options="organizationOptions"
54
- >
55
- </asd20-site-navigation>
56
-
57
57
  <!-- Inline-Notifications -->
58
58
  <client-only>
59
59
  <asd20-notification-group
package/src/components/templates/Asd20SchoolHomeTemplate/index.vue CHANGED
@@ -13,6 +13,19 @@
13
13
  ></asd20-notification-group>
14
14
  </client-only>
15
15
 
16
+ <!-- Site Navigation -->
17
+ <asd20-site-navigation
18
+ :navigation="navigation"
19
+ :action-items="actionItems"
20
+ @update:menuOpen="$emit('update:menuOpen', $event)"
21
+ :menu-open="menuOpen"
22
+ @update:searchOpen="$emit('update:searchOpen', $event)"
23
+ :search-open="searchOpen"
24
+ :organization="organization"
25
+ :organization-options="organizationOptions"
26
+ >
27
+ </asd20-site-navigation>
28
+
16
29
  <!-- Page Header -->
17
30
  <asd20-school-homepage-header
18
31
  id="page-header"
@@ -76,19 +89,6 @@
76
89
  <slot name="quicklinks-menu" />
77
90
  </asd20-quicklinks-menu>
78
91
 
79
- <!-- Site Navigation -->
80
- <asd20-site-navigation
81
- :navigation="navigation"
82
- :action-items="actionItems"
83
- @update:menuOpen="$emit('update:menuOpen', $event)"
84
- :menu-open="menuOpen"
85
- @update:searchOpen="$emit('update:searchOpen', $event)"
86
- :search-open="searchOpen"
87
- :organization="organization"
88
- :organization-options="organizationOptions"
89
- >
90
- </asd20-site-navigation>
91
-
92
92
  <!-- Page Content -->
93
93
  <asd20-page-content> </asd20-page-content>
94
94
 
package/src/components/templates/Asd20SchoolHomeVideoTemplate/index.vue CHANGED
@@ -13,6 +13,19 @@
13
13
  ></asd20-notification-group>
14
14
  </client-only>
15
15
 
16
+ <!-- Site Navigation -->
17
+ <asd20-site-navigation
18
+ :navigation="navigation"
19
+ :action-items="actionItems"
20
+ @update:menuOpen="$emit('update:menuOpen', $event)"
21
+ :menu-open="menuOpen"
22
+ @update:searchOpen="$emit('update:searchOpen', $event)"
23
+ :search-open="searchOpen"
24
+ :organization="organization"
25
+ :organization-options="organizationOptions"
26
+ >
27
+ </asd20-site-navigation>
28
+
16
29
  <!-- Page Header -->
17
30
  <asd20-school-homepage-video-header
18
31
  id="page-header"
@@ -77,19 +90,6 @@
77
90
  <slot name="quicklinks-menu" />
78
91
  </asd20-quicklinks-menu>
79
92
 
80
- <!-- Site Navigation -->
81
- <asd20-site-navigation
82
- :navigation="navigation"
83
- :action-items="actionItems"
84
- @update:menuOpen="$emit('update:menuOpen', $event)"
85
- :menu-open="menuOpen"
86
- @update:searchOpen="$emit('update:searchOpen', $event)"
87
- :search-open="searchOpen"
88
- :organization="organization"
89
- :organization-options="organizationOptions"
90
- >
91
- </asd20-site-navigation>
92
-
93
93
  <!-- Page Content -->
94
94
  <asd20-page-content> </asd20-page-content>
95
95
 
package/src/components/templates/Asd20WayfindingTemplate/index.vue CHANGED
@@ -13,6 +13,19 @@
13
13
  ></asd20-notification-group>
14
14
  </client-only>
15
15
 
16
+ <!-- Site Navigation -->
17
+ <asd20-site-navigation
18
+ :navigation="navigation"
19
+ :action-items="actionItems"
20
+ @update:menuOpen="$emit('update:menuOpen', $event)"
21
+ :menu-open="menuOpen"
22
+ @update:searchOpen="$emit('update:searchOpen', $event)"
23
+ :search-open="searchOpen"
24
+ :organization="organization"
25
+ :organization-options="organizationOptions"
26
+ >
27
+ </asd20-site-navigation>
28
+
16
29
  <!-- Page Header -->
17
30
  <asd20-page-header
18
31
  id="page-header"
@@ -40,19 +53,6 @@
40
53
  <!-- <asd20-breadcrumb slot="top" :links="breadcrumbLinks"></asd20-breadcrumb> -->
41
54
  </asd20-page-header>
42
55
 
43
- <!-- Site Navigation -->
44
- <asd20-site-navigation
45
- :navigation="navigation"
46
- :action-items="actionItems"
47
- @update:menuOpen="$emit('update:menuOpen', $event)"
48
- :menu-open="menuOpen"
49
- @update:searchOpen="$emit('update:searchOpen', $event)"
50
- :search-open="searchOpen"
51
- :organization="organization"
52
- :organization-options="organizationOptions"
53
- >
54
- </asd20-site-navigation>
55
-
56
56
  <!-- Page Content -->
57
57
  <asd20-page-content
58
58
  :primary-messages="wayFindingPrimaryMessages"
package/src/design/_mixins.scss CHANGED
@@ -30,7 +30,7 @@
30
30
  }
31
31
 
32
32
  @mixin asd20-focus() {
33
- box-shadow: 0 0 0 3px white, 0 0 10px 0 var(--color__accent-s20);
33
+ box-shadow: inset 0 0 0 3px white, 0 0 10px 0 var(--color__accent-s20);
34
34
  outline: 3px solid var(--color__accent-s20);
35
- outline-offset: 3px;
35
+ outline-offset: -2px;
36
36
  }