Skip to content

Commit

Permalink
Merge pull request #1542 from EnergySage/CED-1855
Browse files Browse the repository at this point in the history 
CED-1855 rename b- prefix to es- prefix
  • Loading branch information
@tomleo
tomleo authored Oct 3, 2024
2 parents d3f400b + 2f26cf3 commit c5cc22c
Show file tree
Hide file tree
Showing 29 changed files with 505 additions and 450 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ the new `showPrivacySection` prop
- Truncated display name
- Emit the file name as payload for emitted events
- Added a `humanReadable` field to the `mime-type-finder` utils to support better error handling
- The internal `DsResponsiveTable` component used to generate slots and props documentation on the `Typography`,`EsCard`, `EsFileInput`, `EsFileThumbnail`, and `EsSupportCard` pages now has the ability to customize its column widths to match the layout grid in the same manner as `<b-col>` by taking breakpoint props for `md` and up
- The internal `DsResponsiveTable` component used to generate slots and props documentation on the `Typography`,`EsCard`, `EsFileInput`, `EsFileThumbnail`, and `EsSupportCard` pages now has the ability to customize its column widths to match the layout grid in the same manner as `<es-col>` by taking breakpoint props for `md` and up

## [0.23.2] - 2023-07-13

Expand Down
0 es-ds-components/components/b-col.vue → es-ds-components/components/es-col.vue
View file
File renamed without changes.
0 es-ds-components/components/b-container.vue → es-ds-components/components/es-container.vue
View file
File renamed without changes.
20 changes: 10 additions & 10 deletions es-ds-components/components/es-error-page.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ const errorLongMessage = messages?.longMessage || errorCodeToMessages.default.lo

<template>
<div class="bg-gray-50">
<b-container class="py-500 py-lg-800">
<b-row>
<b-col
<es-container class="py-500 py-lg-800">
<es-row>
<es-col
md="7"
class="my-500 mx-auto text-center">
<h1 class="post1 text-gray-600">
Expand All @@ -90,10 +90,10 @@ const errorLongMessage = messages?.longMessage || errorCodeToMessages.default.lo
class="font-size-lg text-gray-600">
{{ errorLongMessage }}
</p>
</b-col>
</b-row>
<b-row>
<b-col
</es-col>
</es-row>
<es-row>
<es-col
v-for="(item, index) in linkItems"
:key="index"
cols="6"
Expand All @@ -113,8 +113,8 @@ const errorLongMessage = messages?.longMessage || errorCodeToMessages.default.lo
</div>
<p class="mb-200 mb-md-0">{{ item.label }}</p>
</a>
</b-col>
</b-row>
</b-container>
</es-col>
</es-row>
</es-container>
</div>
</template>
4 changes: 2 additions & 2 deletions es-ds-components/components/es-nav-bar-product-menu.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ export default {
</div>
<div class="col-2" />
</div>
<b-row
<es-row
tag="ul"
class="d-block d-lg-flex list-unstyled">
<es-nav-bar-topic-menu
Expand Down Expand Up @@ -208,7 +208,7 @@ export default {
:image500="featuredArticle.image500"
:image-alt="featuredArticle.imageAlt" />
</li>
</b-row>
</es-row>
</div>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions es-ds-components/components/es-nav-bar-top-level-menu.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ export default {
</div>
</div>
<div class="dropdown-menu dropdown-menu-full-page">
<b-container class="dropdown-menu-primary justify-content-lg-center py-lg-100">
<b-row class="flex-grow-1 justify-content-lg-center">
<es-container class="dropdown-menu-primary justify-content-lg-center py-lg-100">
<es-row class="flex-grow-1 justify-content-lg-center">
<div
class="mb-3 mb-lg-0"
:class="{
Expand Down Expand Up @@ -184,8 +184,8 @@ export default {
:name="featuredArticle.lede"
:image500="featuredArticle.image500"
:image-alt="featuredArticle.imageAlt" />
</b-row>
</b-container>
</es-row>
</es-container>
</div>
</div>
</div>
Expand Down
13 changes: 7 additions & 6 deletions es-ds-components/components/es-nav-bar.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,8 @@ export default {
</div>
<div class="navbar-nav d-flex flex-column w-100">
<!-- top-level items on mobile, full top bar on desktop -->
<b-container class="align-items-start d-flex flex-lg-nowrap justify-content-between top-level-nav">
<es-container
class="align-items-start d-flex flex-lg-nowrap justify-content-between top-level-nav">
<es-nav-bar-link
class="navbar-brand d-none d-lg-block"
:href="globalContent.home.link">
Expand Down Expand Up @@ -280,9 +281,9 @@ export default {
:auth-items="accountContent.loggedIn.items"
class="d-none d-lg-block pt-100"
:logged-out="accountContent.loggedOut" />
</b-container>
</es-container>
<!-- mobile+desktop product menus -->
<b-container class="d-flex flex-lg-nowrap justify-content-lg-end product-menu">
<es-container class="d-flex flex-lg-nowrap justify-content-lg-end product-menu">
<div class="row">
<es-nav-bar-product-menu
v-for="product in globalContent.products"
Expand All @@ -303,7 +304,7 @@ export default {
</template>
</es-nav-bar-product-menu>
</div>
</b-container>
</es-container>
</div>
</div>
<!-- mobile account menu checkbox -->
Expand Down Expand Up @@ -372,7 +373,7 @@ export default {
</nav>
<!-- sticky nav bar -->
<nav class="nav-es-sticky bg-white d-none d-lg-block position-fixed py-25">
<b-container class="align-items-center d-flex justify-content-between">
<es-container class="align-items-center d-flex justify-content-between">
<!-- EnergySage logo -->
<es-nav-bar-link
class="navbar-brand d-none d-lg-block"
Expand All @@ -389,7 +390,7 @@ export default {
:auth-items="accountContent.loggedIn.items"
class="d-none d-lg-block"
:logged-out="accountContent.loggedOut" />
</b-container>
</es-container>
</nav>
</div>
</template>
0 es-ds-components/components/b-row.vue → es-ds-components/components/es-row.vue
View file
File renamed without changes.
0 es-ds-components/components/b-spinner.vue → es-ds-components/components/es-spinner.vue
View file
File renamed without changes.
12 changes: 6 additions & 6 deletions es-ds-components/components/es-support-card.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ const showSecondaryCta = computed(() => {
'px-md-100 py-md-200': constrained,
'px-md-300': !constrained,
}">
<b-row class="align-items-lg-center justify-content-xl-between">
<b-col
<es-row class="align-items-lg-center justify-content-xl-between">
<es-col
class="EsSupportCard-contentColumn d-flex flex-column justify-content-lg-center position-relative"
:class="{ 'pr-lg-0': constrained }"
cols="12"
Expand Down Expand Up @@ -94,8 +94,8 @@ const showSecondaryCta = computed(() => {
}">
<slot name="description" />
</div>
</b-col>
<b-col
</es-col>
<es-col
cols="12"
lg="4"
xxl="3">
Expand All @@ -116,8 +116,8 @@ const showSecondaryCta = computed(() => {
variant="primary">
{{ secondaryCtaText }}
</es-button>
</b-col>
</b-row>
</es-col>
</es-row>
</es-card>
</template>

Expand Down
16 changes: 8 additions & 8 deletions es-ds-docs/layouts/default.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,24 @@ const breadcrumbs = computed(() => {

<template>
<div class="d-flex justify-content-center">
<b-container class="pt-100 mx-0">
<b-row>
<b-col
<es-container class="pt-100 mx-0">
<es-row>
<es-col
class="d-none d-xl-block"
xl="3">
<div class="ds-side-nav flex-shrink-0">
<ds-link-list />
</div>
</b-col>
<b-col xl="9">
</es-col>
<es-col xl="9">
<div class="mb-100">
<es-breadcrumbs :items="breadcrumbs" />
</div>
<div class="mb-300">
<slot />
</div>
</b-col>
</b-row>
</b-container>
</es-col>
</es-row>
</es-container>
</div>
</template>
16 changes: 8 additions & 8 deletions es-ds-docs/layouts/footer.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,25 @@ const breadcrumbs = computed(() => {
<template>
<div>
<div class="d-flex justify-content-center">
<b-container class="pt-100 mx-0">
<b-row>
<b-col
<es-container class="pt-100 mx-0">
<es-row>
<es-col
class="d-none d-xl-block"
xl="3">
<div class="ds-side-nav flex-shrink-0">
<ds-link-list />
</div>
</b-col>
<b-col xl="9">
</es-col>
<es-col xl="9">
<div class="mb-100">
<es-breadcrumbs :items="breadcrumbs" />
</div>
<div class="mb-300">
<slot />
</div>
</b-col>
</b-row>
</b-container>
</es-col>
</es-row>
</es-container>
</div>

<es-footer :content="footerContent">
Expand Down
20 changes: 10 additions & 10 deletions es-ds-docs/layouts/fullWidthComponent.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,20 @@ const breadcrumbs = computed(() => {
<div class="ds-side-nav d-none d-xl-block flex-shrink-0 p-100">
<ds-link-list />
</div>
<b-container class="pt-xl-100 mx-0">
<b-row class="mb-100">
<b-col cols="12">
<es-container class="pt-xl-100 mx-0">
<es-row class="mb-100">
<es-col cols="12">
<es-breadcrumbs :items="breadcrumbs" />
</b-col>
</b-row>
<b-row>
<b-col
</es-col>
</es-row>
<es-row>
<es-col
class="mb-300"
cols="12">
<slot />
</b-col>
</b-row>
</b-container>
</es-col>
</es-row>
</es-container>
</div>
</div>
</template>
16 changes: 8 additions & 8 deletions es-ds-docs/layouts/nav.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,25 @@ const breadcrumbs = computed(() => {
</es-nav-bar>

<div class="d-flex justify-content-center">
<b-container class="pt-100 mx-0">
<b-row>
<b-col
<es-container class="pt-100 mx-0">
<es-row>
<es-col
class="d-none d-xl-block"
xl="3">
<div class="ds-side-nav flex-shrink-0">
<ds-link-list />
</div>
</b-col>
<b-col xl="9">
</es-col>
<es-col xl="9">
<div class="mb-100">
<es-breadcrumbs :items="breadcrumbs" />
</div>
<div class="mb-300">
<slot />
</div>
</b-col>
</b-row>
</b-container>
</es-col>
</es-row>
</es-container>
</div>
</div>
</template>
Loading

0 comments on commit c5cc22c

Please sign in to comment.