Skip to content

[mercury] general ui updates #345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 30, 2024
Merged

[mercury] general ui updates #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7a7ef80
Update _button-styles.scss
bsastregx Sep 30, 2024
f97203b
Update _segmented-control-styles.scss
bsastregx Sep 30, 2024
193a0f3
Update mercury.scss
bsastregx Sep 30, 2024
b50272d
Update _general.scss
bsastregx Sep 30, 2024
a960578
Update "mysql" and "qr-code" icons
bsastregx Sep 30, 2024
a2cbad9
update showcase files
bsastregx Sep 30, 2024
9d4c197
Update pnpm-lock.yaml
bsastregx Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 116 additions & 0 deletions packages/mercury/showcase/_tests.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
}
.form-input {
}
.scrollable {
height: 300px;
overflow: auto;
}
</style>
<script type="module" src="./assets/scripts/scripts-header.js"></script>

Expand Down Expand Up @@ -44,6 +48,118 @@
<script src="./assets/scripts/scripts.js"></script>
<main class="main">
<div class="container">
<div class="scrollable">
<p>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Inventore,
harum temporibus officiis at praesentium alias repudiandae beatae
porro labore quam cumque. Ipsa, blanditiis hic voluptate officiis
voluptates veritatis quam. Consequatur?
</p>
<p>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Inventore,
harum temporibus officiis at praesentium alias repudiandae beatae
porro labore quam cumque. Ipsa, blanditiis hic voluptate officiis
voluptates veritatis quam. Consequatur?
</p>
<p>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Inventore,
harum temporibus officiis at praesentium alias repudiandae beatae
porro labore quam cumque. Ipsa, blanditiis hic voluptate officiis
voluptates veritatis quam. Consequatur?
</p>
<p>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Inventore,
harum temporibus officiis at praesentium alias repudiandae beatae
porro labore quam cumque. Ipsa, blanditiis hic voluptate officiis
voluptates veritatis quam. Consequatur?
</p>
<p>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Inventore,
harum temporibus officiis at praesentium alias repudiandae beatae
porro labore quam cumque. Ipsa, blanditiis hic voluptate officiis
voluptates veritatis quam. Consequatur?
</p>
<p>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Inventore,
harum temporibus officiis at praesentium alias repudiandae beatae
porro labore quam cumque. Ipsa, blanditiis hic voluptate officiis
voluptates veritatis quam. Consequatur?
</p>
<p>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Inventore,
harum temporibus officiis at praesentium alias repudiandae beatae
porro labore quam cumque. Ipsa, blanditiis hic voluptate officiis
voluptates veritatis quam. Consequatur?
</p>
<p>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Inventore,
harum temporibus officiis at praesentium alias repudiandae beatae
porro labore quam cumque. Ipsa, blanditiis hic voluptate officiis
voluptates veritatis quam. Consequatur?
</p>
<p>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Inventore,
harum temporibus officiis at praesentium alias repudiandae beatae
porro labore quam cumque. Ipsa, blanditiis hic voluptate officiis
voluptates veritatis quam. Consequatur?
</p>
<p>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Inventore,
harum temporibus officiis at praesentium alias repudiandae beatae
porro labore quam cumque. Ipsa, blanditiis hic voluptate officiis
voluptates veritatis quam. Consequatur?
</p>
<p>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Inventore,
harum temporibus officiis at praesentium alias repudiandae beatae
porro labore quam cumque. Ipsa, blanditiis hic voluptate officiis
voluptates veritatis quam. Consequatur?
</p>
<p>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Inventore,
harum temporibus officiis at praesentium alias repudiandae beatae
porro labore quam cumque. Ipsa, blanditiis hic voluptate officiis
voluptates veritatis quam. Consequatur?
</p>
<p>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Inventore,
harum temporibus officiis at praesentium alias repudiandae beatae
porro labore quam cumque. Ipsa, blanditiis hic voluptate officiis
voluptates veritatis quam. Consequatur?
</p>
<p>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Inventore,
harum temporibus officiis at praesentium alias repudiandae beatae
porro labore quam cumque. Ipsa, blanditiis hic voluptate officiis
voluptates veritatis quam. Consequatur?
</p>
<p>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Inventore,
harum temporibus officiis at praesentium alias repudiandae beatae
porro labore quam cumque. Ipsa, blanditiis hic voluptate officiis
voluptates veritatis quam. Consequatur?
</p>
<p>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Inventore,
harum temporibus officiis at praesentium alias repudiandae beatae
porro labore quam cumque. Ipsa, blanditiis hic voluptate officiis
voluptates veritatis quam. Consequatur?
</p>
<p>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Inventore,
harum temporibus officiis at praesentium alias repudiandae beatae
porro labore quam cumque. Ipsa, blanditiis hic voluptate officiis
voluptates veritatis quam. Consequatur?
</p>
<p>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Inventore,
harum temporibus officiis at praesentium alias repudiandae beatae
porro labore quam cumque. Ipsa, blanditiis hic voluptate officiis
voluptates veritatis quam. Consequatur?
</p>
v
</div>

<!-- button primary -->
<section class="section">
<!-- header -->
Expand Down
2 changes: 1 addition & 1 deletion packages/mercury/showcase/all.css
View file
Open in desktop

Large diffs are not rendered by default.

156 changes: 152 additions & 4 deletions packages/mercury/showcase/icons/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1594,6 +1594,9 @@ <h3 class="aside__category-title dark" role="button">
<li class="aside__category-list-item">
<a href="#general-references">references.svg</a>
</li>
<li class="aside__category-list-item">
<a href="#general-qr-code">qr-code.svg</a>
</li>
<li class="aside__category-list-item">
<a href="#general-postgre-sql">postgre-sql.svg</a>
</li>
Expand All @@ -1603,6 +1606,9 @@ <h3 class="aside__category-title dark" role="button">
<li class="aside__category-list-item">
<a href="#general-oracle">oracle.svg</a>
</li>
<li class="aside__category-list-item">
<a href="#general-mysql">mysql.svg</a>
</li>
<li class="aside__category-list-item">
<a href="#general-launchpad">launchpad.svg</a>
</li>
Expand Down Expand Up @@ -1681,6 +1687,9 @@ <h3 class="aside__category-title light" role="button">
<li class="aside__category-list-item">
<a href="#general-references">references.svg</a>
</li>
<li class="aside__category-list-item">
<a href="#general-qr-code">qr-code.svg</a>
</li>
<li class="aside__category-list-item">
<a href="#general-postgre-sql">postgre-sql.svg</a>
</li>
Expand All @@ -1690,6 +1699,9 @@ <h3 class="aside__category-title light" role="button">
<li class="aside__category-list-item">
<a href="#general-oracle">oracle.svg</a>
</li>
<li class="aside__category-list-item">
<a href="#general-mysql">mysql.svg</a>
</li>
<li class="aside__category-list-item">
<a href="#general-launchpad">launchpad.svg</a>
</li>
Expand Down Expand Up @@ -3663,8 +3675,8 @@ <h3 class="aside__category-title light" role="button">
<h1 class="container__title title">auto-generated scalable vector icons</h1>

<h2 class="icons-type-section__title icons-type-section__title--multicolor title" id="multicolor-icons-section">
<span class="amount light">206</span>
<span class="amount dark" hidden>206</span>
<span class="amount light">208</span>
<span class="amount dark" hidden>208</span>
Multicolor <span class="icons-type-section__title-schema"></span> Icons
</h2>

Expand Down Expand Up @@ -12511,7 +12523,7 @@ <h4 class="icon-container__title icon-container__title--h4 icon-container__title
<article class="category">

<h3 class="category__title title light" data-title="general">
general <span hidden>(25)</span></h3>
general <span hidden>(27)</span></h3>

<!-- multicolor light -->

Expand Down Expand Up @@ -12787,6 +12799,40 @@ <h4 class="icon-container__title icon-container__title--h4 icon-container__title
</figure>
</button>
</li>
</ul>
</div>
<div class="search-item icon-container" id=general-qr-code data-value="qr-code">
<h4 class="icon-container__title icon-container__title--h4 icon-container__title--svg-icon title">qr-code.svg</h4>
<ul class="icon-container__list list list--vertical">
<li class="icon-container__list-item">
<button class="icon-state-button" data-src="general/light/qr-code.svg#enabled" data-name="general/qr-code.svg" id="general-qr-code--enabled-light">
<figure class="icon-container__figure">
<img class="icon" src="general/light/qr-code.svg#enabled" alt="qr-code.svg icon on state 'enabled'"/>
<figcaption class="icon-container__figure-caption" disabled>enabled</figcaption>
</figure>
</button>
</li><li class="icon-container__list-item">
<button class="icon-state-button" data-src="general/light/qr-code.svg#hover" data-name="general/qr-code.svg" id="general-qr-code--hover-light">
<figure class="icon-container__figure">
<img class="icon" src="general/light/qr-code.svg#hover" alt="qr-code.svg icon on state 'hover'"/>
<figcaption class="icon-container__figure-caption" disabled>hover</figcaption>
</figure>
</button>
</li><li class="icon-container__list-item">
<button class="icon-state-button" data-src="general/light/qr-code.svg#active" data-name="general/qr-code.svg" id="general-qr-code--active-light">
<figure class="icon-container__figure">
<img class="icon" src="general/light/qr-code.svg#active" alt="qr-code.svg icon on state 'active'"/>
<figcaption class="icon-container__figure-caption" disabled>active</figcaption>
</figure>
</button>
</li><li class="icon-container__list-item">
<button class="icon-state-button" data-src="general/light/qr-code.svg#disabled" data-name="general/qr-code.svg" id="general-qr-code--disabled-light">
<figure class="icon-container__figure">
<img class="icon" src="general/light/qr-code.svg#disabled" alt="qr-code.svg icon on state 'disabled'"/>
<figcaption class="icon-container__figure-caption" disabled>disabled</figcaption>
</figure>
</button>
</li>
</ul>
</div>
<div class="search-item icon-container" id=general-postgre-sql data-value="postgre-sql">
Expand Down Expand Up @@ -12889,6 +12935,40 @@ <h4 class="icon-container__title icon-container__title--h4 icon-container__title
</figure>
</button>
</li>
</ul>
</div>
<div class="search-item icon-container" id=general-mysql data-value="mysql">
<h4 class="icon-container__title icon-container__title--h4 icon-container__title--svg-icon title">mysql.svg</h4>
<ul class="icon-container__list list list--vertical">
<li class="icon-container__list-item">
<button class="icon-state-button" data-src="general/light/mysql.svg#enabled" data-name="general/mysql.svg" id="general-mysql--enabled-light">
<figure class="icon-container__figure">
<img class="icon" src="general/light/mysql.svg#enabled" alt="mysql.svg icon on state 'enabled'"/>
<figcaption class="icon-container__figure-caption" disabled>enabled</figcaption>
</figure>
</button>
</li><li class="icon-container__list-item">
<button class="icon-state-button" data-src="general/light/mysql.svg#hover" data-name="general/mysql.svg" id="general-mysql--hover-light">
<figure class="icon-container__figure">
<img class="icon" src="general/light/mysql.svg#hover" alt="mysql.svg icon on state 'hover'"/>
<figcaption class="icon-container__figure-caption" disabled>hover</figcaption>
</figure>
</button>
</li><li class="icon-container__list-item">
<button class="icon-state-button" data-src="general/light/mysql.svg#active" data-name="general/mysql.svg" id="general-mysql--active-light">
<figure class="icon-container__figure">
<img class="icon" src="general/light/mysql.svg#active" alt="mysql.svg icon on state 'active'"/>
<figcaption class="icon-container__figure-caption" disabled>active</figcaption>
</figure>
</button>
</li><li class="icon-container__list-item">
<button class="icon-state-button" data-src="general/light/mysql.svg#disabled" data-name="general/mysql.svg" id="general-mysql--disabled-light">
<figure class="icon-container__figure">
<img class="icon" src="general/light/mysql.svg#disabled" alt="mysql.svg icon on state 'disabled'"/>
<figcaption class="icon-container__figure-caption" disabled>disabled</figcaption>
</figure>
</button>
</li>
</ul>
</div>
<div class="search-item icon-container" id=general-launchpad data-value="launchpad">
Expand Down Expand Up @@ -13370,7 +13450,7 @@ <h4 class="icon-container__title icon-container__title--h4 icon-container__title
</div>

<h3 class="category__title title dark" data-title="general">
general <span hidden>(25)</span></h3>
general <span hidden>(27)</span></h3>

<!-- multicolor dark -->

Expand Down Expand Up @@ -13646,6 +13726,40 @@ <h4 class="icon-container__title icon-container__title--h4 icon-container__title
</figure>
</button>
</li>
</ul>
</div>
<div class="search-item icon-container" id=general-qr-code data-value="qr-code">
<h4 class="icon-container__title icon-container__title--h4 icon-container__title--svg-icon title">qr-code.svg</h4>
<ul class="icon-container__list list list--vertical">
<li class="icon-container__list-item">
<button class="icon-state-button" data-src="general/dark/qr-code.svg#enabled" data-name="general/qr-code.svg" id="general-qr-code--enabled-dark">
<figure class="icon-container__figure">
<img class="icon" src="general/dark/qr-code.svg#enabled" alt="qr-code.svg icon on state 'enabled'"/>
<figcaption class="icon-container__figure-caption" disabled>enabled</figcaption>
</figure>
</button>
</li><li class="icon-container__list-item">
<button class="icon-state-button" data-src="general/dark/qr-code.svg#hover" data-name="general/qr-code.svg" id="general-qr-code--hover-dark">
<figure class="icon-container__figure">
<img class="icon" src="general/dark/qr-code.svg#hover" alt="qr-code.svg icon on state 'hover'"/>
<figcaption class="icon-container__figure-caption" disabled>hover</figcaption>
</figure>
</button>
</li><li class="icon-container__list-item">
<button class="icon-state-button" data-src="general/dark/qr-code.svg#active" data-name="general/qr-code.svg" id="general-qr-code--active-dark">
<figure class="icon-container__figure">
<img class="icon" src="general/dark/qr-code.svg#active" alt="qr-code.svg icon on state 'active'"/>
<figcaption class="icon-container__figure-caption" disabled>active</figcaption>
</figure>
</button>
</li><li class="icon-container__list-item">
<button class="icon-state-button" data-src="general/dark/qr-code.svg#disabled" data-name="general/qr-code.svg" id="general-qr-code--disabled-dark">
<figure class="icon-container__figure">
<img class="icon" src="general/dark/qr-code.svg#disabled" alt="qr-code.svg icon on state 'disabled'"/>
<figcaption class="icon-container__figure-caption" disabled>disabled</figcaption>
</figure>
</button>
</li>
</ul>
</div>
<div class="search-item icon-container" id=general-postgre-sql data-value="postgre-sql">
Expand Down Expand Up @@ -13748,6 +13862,40 @@ <h4 class="icon-container__title icon-container__title--h4 icon-container__title
</figure>
</button>
</li>
</ul>
</div>
<div class="search-item icon-container" id=general-mysql data-value="mysql">
<h4 class="icon-container__title icon-container__title--h4 icon-container__title--svg-icon title">mysql.svg</h4>
<ul class="icon-container__list list list--vertical">
<li class="icon-container__list-item">
<button class="icon-state-button" data-src="general/dark/mysql.svg#enabled" data-name="general/mysql.svg" id="general-mysql--enabled-dark">
<figure class="icon-container__figure">
<img class="icon" src="general/dark/mysql.svg#enabled" alt="mysql.svg icon on state 'enabled'"/>
<figcaption class="icon-container__figure-caption" disabled>enabled</figcaption>
</figure>
</button>
</li><li class="icon-container__list-item">
<button class="icon-state-button" data-src="general/dark/mysql.svg#hover" data-name="general/mysql.svg" id="general-mysql--hover-dark">
<figure class="icon-container__figure">
<img class="icon" src="general/dark/mysql.svg#hover" alt="mysql.svg icon on state 'hover'"/>
<figcaption class="icon-container__figure-caption" disabled>hover</figcaption>
</figure>
</button>
</li><li class="icon-container__list-item">
<button class="icon-state-button" data-src="general/dark/mysql.svg#active" data-name="general/mysql.svg" id="general-mysql--active-dark">
<figure class="icon-container__figure">
<img class="icon" src="general/dark/mysql.svg#active" alt="mysql.svg icon on state 'active'"/>
<figcaption class="icon-container__figure-caption" disabled>active</figcaption>
</figure>
</button>
</li><li class="icon-container__list-item">
<button class="icon-state-button" data-src="general/dark/mysql.svg#disabled" data-name="general/mysql.svg" id="general-mysql--disabled-dark">
<figure class="icon-container__figure">
<img class="icon" src="general/dark/mysql.svg#disabled" alt="mysql.svg icon on state 'disabled'"/>
<figcaption class="icon-container__figure-caption" disabled>disabled</figcaption>
</figure>
</button>
</li>
</ul>
</div>
<div class="search-item icon-container" id=general-launchpad data-value="launchpad">
Expand Down
Loading
Loading