Skip to content
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.

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

Design tokens for Tooltip component #154

Closed
wants to merge 63 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
284e34c
tokens
amazingrando Apr 29, 2024
5e53c7b
feat: create tokens
amazingrando Apr 29, 2024
f5be11f
fix: token typo
amazingrando Apr 29, 2024
8330393
fix: broken token pages
amazingrando Apr 29, 2024
d117f55
chore: basic and home page
amazingrando Apr 29, 2024
c3d7e08
feat: create tokens
amazingrando Apr 29, 2024
4c3d76f
chore: wup blue
amazingrando Apr 29, 2024
d48ef4f
Merge branch 'wup' of https://github.com/emulsify-ds/emulsify-ui-kit …
amazingrando Apr 29, 2024
6d458c7
chore: wup blue
amazingrando Apr 29, 2024
c9bedec
feat: create tokens
amazingrando Apr 29, 2024
1ace975
tokens
amazingrando Apr 29, 2024
e054bd2
feat: create tokens
amazingrando Apr 29, 2024
a421da9
chore: trigger notification
amazingrando Apr 29, 2024
c58cda6
Merge branch 'wup' of https://github.com/emulsify-ds/emulsify-ui-kit …
amazingrando Apr 29, 2024
cc3d650
feat: create tokens
amazingrando Apr 29, 2024
7db0505
fix: linting
amazingrando Apr 29, 2024
e9436f4
Merge branch 'wup' of https://github.com/emulsify-ds/emulsify-ui-kit …
amazingrando Apr 29, 2024
f7549aa
feat: create tokens
amazingrando Apr 29, 2024
aadf8ed
chore: fix logo src
amazingrando Jul 22, 2024
d99a987
feat: create tokens
amazingrando Jul 22, 2024
d9b4611
Merge pull request #133 from emulsify-ds/fix-logo-src
amazingrando Jul 25, 2024
a41250f
Merge branch 'main' of github.com:emulsify-ds/emulsify-ui-kit into wup
Aug 8, 2024
9529a4f
feat: create tokens
mariannuar Aug 8, 2024
21ab1ec
fix(wup): select styles
Aug 8, 2024
52e7743
Merge branch 'wup' of github.com:emulsify-ds/emulsify-ui-kit into wup
Aug 8, 2024
fe76176
fix(wup): tokens styles in storybook
Aug 8, 2024
e29eddb
feat: create tokens
mariannuar Aug 8, 2024
e1cce0f
Merge pull request #123 from emulsify-ds/wup
mariannuar Aug 8, 2024
555489a
fix(accordion): missing styles on hover and toggle buttons
Aug 8, 2024
ebb392b
fix(accordion): accordion missing styles
Aug 8, 2024
b43fb25
feat: create tokens
mariannuar Aug 8, 2024
034ddd4
fixes on tokens
mariannuar Aug 9, 2024
2a71050
feat: create tokens
mariannuar Aug 9, 2024
b32f845
tokens for announcement
mariannuar Aug 10, 2024
4ada5c2
feat: create tokens
mariannuar Aug 10, 2024
d9b5aa0
Merge pull request #138 from emulsify-ds/accordion-missing-styles
mariannuar Aug 10, 2024
45810ef
Merge branch 'main' of github.com:emulsify-ds/emulsify-ui-kit into an…
Aug 10, 2024
5d73631
feat: create tokens
mariannuar Aug 10, 2024
5a5a536
update name of design token for color background default
mariannuar Aug 12, 2024
bacaf37
feat: create tokens
mariannuar Aug 12, 2024
75cda0a
add namespace so the new token start with --announcement-
mariannuar Aug 12, 2024
d4464c4
feat: create tokens
mariannuar Aug 12, 2024
33bb1eb
Merge pull request #139 from emulsify-ds/announcement-alert
mariannuar Aug 12, 2024
e43f981
create tokens for banner - wip
mariannuar Aug 12, 2024
5224046
final tokens for banner
mariannuar Aug 13, 2024
6088c44
feat: create tokens
mariannuar Aug 13, 2024
f327b3b
Design tokens for Footer
mariannuar Aug 16, 2024
112fdea
feat: create tokens
mariannuar Aug 16, 2024
cc8cecd
change order of design token for footer
mariannuar Aug 16, 2024
665bb3c
feat: create tokens
mariannuar Aug 16, 2024
583ae15
create design tokens for header
mariannuar Aug 17, 2024
03b7d57
design tokens for header component
mariannuar Aug 17, 2024
4d3d702
feat: create tokens
mariannuar Aug 17, 2024
4a10cb6
Merge pull request #143 from emulsify-ds/banner
mariannuar Aug 22, 2024
4394052
Merge branch 'main' of github.com:emulsify-ds/emulsify-ui-kit into he…
Aug 22, 2024
3efcc04
feat: create tokens
mariannuar Aug 22, 2024
a5a1aa5
Merge pull request #147 from emulsify-ds/header
mariannuar Aug 22, 2024
d95a005
Merge branch 'main' of github.com:emulsify-ds/emulsify-ui-kit into fo…
Aug 22, 2024
0622437
feat: create tokens
mariannuar Aug 22, 2024
b1c9fff
Merge pull request #146 from emulsify-ds/footer
mariannuar Aug 22, 2024
3d2d6e2
Adding the new tokens to the Emulsify theme in Tokens Studio
amazingrando Aug 22, 2024
297ae35
Design tokens for Tooltip component
mariannuar Aug 31, 2024
3a8345d
feat: create tokens
mariannuar Aug 31, 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
2 changes: 1 addition & 1 deletion .storybook/emulsifyTheme.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ export default create({
brandTitle: 'Emulsify',
brandUrl: 'https://emulsify.info',
brandImage:
'https://raw.githubusercontent.com/emulsify-ds/emulsify-ui-kit/storybook-theming/images/emulsify-logo-sb.svg',
'https://raw.githubusercontent.com/emulsify-ds/emulsify-ui-kit/main/src/images/logo.svg',
brandTarget: '_self',
});
29 changes: 21 additions & 8 deletions src/components/accordion/_accordion.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,22 @@ $accordion_padding_y: calc(var(--spacing-lg) * 1.25);
cursor: pointer;
outline: inherit;
display: flex;
color: var(--colors-text-body);
color: var(--color-text-body);
font-size: var(--font-size-body);
gap: var(--spacing-sm);
align-items: center;

.accordion__icon {
fill: var(--colors-text-body);
fill: var(--color-text-body);
height: var(--size-lg);
width: var(--size-lg);
}

&:hover {
color: var(--accordion-color-header-hover);
color: var(--accordion-color-header);

.accordion__icon {
fill: var(--accordion-color-header-hover);
fill: var(--accordion-color-header);
}
}
}
Expand Down Expand Up @@ -95,16 +95,28 @@ $accordion_padding_y: calc(var(--spacing-lg) * 1.25);
color: var(--accordion-color-header);
margin: 0 0 $accordion_padding_y;

[data-accordion-expanded='false'] & {
color: var(--accordion-color-body);
}

&:hover {
color: var(--accordion-color-header-hover);

[data-accordion-expanded='false'] & {
color: var(--accordion-color-header);

.accordion-item__toggle {
color: var(--accordion-color-header);
}
}

.accordion-item__icon {
fill: var(--accordion-color-header-hover);
}
}

[data-accordion-expanded='false'] & {
color: var(--accordion-color-body);
[data-accordion-expanded='false'] & {
fill: var(--accordion-color-header);
}
}
}
}

Expand All @@ -117,6 +129,7 @@ $accordion_padding_y: calc(var(--spacing-lg) * 1.25);

[aria-expanded='true'] > & {
transform: rotate(180deg);
fill: var(--accordion-color-header);
}
}

Expand Down
33 changes: 33 additions & 0 deletions src/components/docs/examples/_basic.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
.example {
.basic {
max-width: 900px;
margin: 0 auto;
padding: var(--spacing-2xl) 0;

h1.page-title {
margin-block-start: 0;
margin-block-end: var(--spacing-2xl);
}

h2 {
line-height: var(--line-height-tight);
}

p {
line-height: var(--line-height-relaxed);
}

.faux-form {
.two-col {
display: grid;
grid-template-columns: 1fr 1fr;
gap: var(--spacing-2xl);
margin-block-end: var(--spacing-lg);
}
}
}

&.basic .header {
border-bottom: 40px solid var(--color-primary-default);
}
}
39 changes: 20 additions & 19 deletions src/components/docs/examples/_home.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
.example {
display: flex;
flex-flow: column nowrap;
background-color: var(--colors-white);
background-color: var(--color-white);
padding: 0 !important;
// max-width: var(--max-width);
margin: 0 auto;
min-height: 100vh;

Expand All @@ -21,11 +20,11 @@
}

.logo-text {
fill: var(--colors-text-body);
fill: var(--color-text-body);
}

.logo-mark {
fill: var(--colors-primary-darker);
fill: var(--color-primary-default);
}

.logo + nav {
Expand All @@ -36,7 +35,7 @@
display: flex;
flex-flow: column nowrap;
justify-content: center;
color: var(--colors-white);
color: var(--color-white);
aspect-ratio: 16/7;
background-size: cover;
text-align: center;
Expand All @@ -46,7 +45,7 @@
&::after {
content: '';
position: absolute;
background: var(--colors-primary-dark);
background: var(--color-primary-dark);
top: 0;
left: 0;
bottom: 0;
Expand All @@ -62,21 +61,23 @@

h1 {
font-size: var(--font-size-uber);
line-height: var(--line-heights-none);
line-height: var(--line-height-none);
letter-spacing: var(--letter-spacing-tight);
max-width: 1000px;
margin: 0 auto;
margin: 0 auto var(--spacing-lg);
}

h2 {
font-size: var(--font-size-display);
line-height: var(--line-heights-none);
line-height: var(--line-height-none);
letter-spacing: var(--letter-spacing-tight);
max-width: 1000px;
margin: 0 auto;
}
}

/**
* Watch section
*/
.watch {
text-align: center;
padding: var(--spacing-2xl) var(--spacing-xl);
Expand All @@ -98,7 +99,7 @@
}

.celebrating {
background: var(--colors-primary-lighter);
background: var(--color-primary-lighter);
text-align: center;
padding: var(--spacing-2xl) var(--spacing-xl);

Expand All @@ -120,8 +121,8 @@
}

.footer {
background: var(--colors-primary-darker);
color: var(--colors-white);
background: var(--color-primary-darker);
color: var(--color-white);
padding: var(--spacing-lg) var(--spacing-xl) var(--spacing-2xl);
margin-top: auto;
display: flex;
Expand All @@ -137,11 +138,11 @@
}

.logo-text {
fill: var(--colors-white);
fill: var(--color-white);
}

.logo-mark {
fill: var(--colors-primary-lighter);
fill: var(--color-white);
}

.social-menu--footer {
Expand All @@ -150,11 +151,11 @@
}

.social-menu--footer .social-menu__link {
color: var(--colors-primary-lighter);
color: var(--color-primary-lighter);
font-size: var(--font-size-display);

&:hover {
color: var(--colors-primary-light);
color: var(--color-primary-light);
}
}

Expand All @@ -168,7 +169,7 @@
}

.footer-h3 {
color: var(--colors-primary-lighter);
color: var(--color-primary-lighter);
font-size: var(--font-size-body);
}

Expand All @@ -179,7 +180,7 @@
max-width: 450px;
font-size: var(--font-size-small);
gap: var(--spacing-lg);
line-height: var(--line-heights-tight);
line-height: var(--line-height-tight);

li {
margin-bottom: var(--spacing-sm);
Expand Down
2 changes: 1 addition & 1 deletion src/components/docs/examples/_program.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.example {
.dynamic {
background: var(--colors-primary-lighter);
background: var(--color-primary-lighter);
text-align: center;
padding: var(--spacing-2xl) var(--spacing-xl);

Expand Down
2 changes: 1 addition & 1 deletion src/components/docs/examples/assets/_header.twig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<header class="header">
{% include "@components/docs/examples/assets/_logo.twig" %}
{% include "@components/menus/main-menu/main-menu.twig" %}
{% include "@components/button/button.twig" with { button__content: 'Donate' } %}
{% include "@components/button/button.twig" with { button__content: 'Apply' } %}
</header>
13 changes: 13 additions & 0 deletions src/components/docs/examples/basic.stories.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import template from './basic.twig';
import image from '../../../images/example/basic-camera-image.png';
import data from './basic.yml';

export default {
title: 'Pages/Basic',
decorators: [
(story) =>
`<div style="background: var(--color-grays-700); padding: 0;margin:0;">${story()}</div>`,
],
};

export const Basic = () => template({ data, image });
42 changes: 42 additions & 0 deletions src/components/docs/examples/basic.twig
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<div class="example basic">
{% include "@components/docs/examples/assets/_header.twig" %}
<main class="basic text-long">
{% include "@components/menus/breadcrumbs/breadcrumbs.twig" with {
breadcrumb: data.breadcrumb
} %}
<h1 class="page-title">Undergraduate Courses</h1>
<h2>Unveiling the Rich Tapestry of Film History</h2>
<p>In the first semester, students embark on a captivating journey through time, exploring the evolution of cinema from its early beginnings to the present day. They delve into the works of influential filmmakers, iconic films, and significant movements, cultivating a deep appreciation for the artistic, cultural, and social impact of cinema.</p>

<img src="{{_context.image}}" alt="" style="margin: var(--spacing-xl) 0"/>

<h2>Analyzing Films: Unraveling the Layers of Meaning</h2>
<p>Diving into the realm of film theory, aesthetics, and analysis, students develop the skills to interpret films through multiple lenses. They delve into narrative structures, visual storytelling techniques, and the nuanced role of cinematography, sound, and editing. Through rigorous analysis and thought-provoking discussions, students gain a profound understanding of the intricate layers of meaning embedded within films.</p>
<h2>Hands-On Filmmaking Experience: From Vision to Creation</h2>
<p>Empowering students with practical skills, our program offers hands-on production courses where they transform their creative visions into reality. From scriptwriting to directing, cinematography to editing, students master the technical aspects of filmmaking. Collaborating with fellow students, they navigate the complexities of teamwork, effective communication, and project organization.</p>
<p>Our program goes beyond the classroom, providing valuable industry insights and connections. Guest lectures, workshops, and internships offer students opportunities to learn from and network with professionals in the field. Through these engagements, students gain real-world perspectives, understand industry trends, and lay the foundation for future career opportunities.</p>
<p>In the final semesters, students have the freedom to specialize in areas of interest. Whether it's documentary filmmaking, film criticism, or screenwriting, advanced courses refine their skills and knowledge, empowering them to delve deeper into their chosen field. The program culminates in a capstone project, where students showcase their expertise through a comprehensive film analysis, research paper, or creative work.</p>
<p>Led by passionate faculty and supported by state-of-the-art facilities, our Film Studies program offers a transformative educational experience. Students emerge with a profound appreciation for cinema's artistic power, a strong foundation in critical thinking and analysis, and the practical skills required to succeed in the film industry or pursue further academic studies in the field. Join us on this remarkable journey of cinematic exploration and discovery.</p>

<section class="faux-form">
<h2>Fill out this form</h2>
<div class="two-col">
<div class="form-item">
<label for="edit-name" class="form-item__label form-item__label--required form-item__label--textfield">Name</label>
<input id="edit-name" autocorrect="none" autocapitalize="none" spellcheck="false" type="text" name="name" value="" size="60" maxlength="60" class="form-item__textfield form-item__textfield--required" required="required" aria-required="true" placeholder="First, Middle, Last">
</div>
<div class="form-item">
<label for="emailaddress" class="form-item__label form-item__label--textfield">Email Address</label>
<input id="emailaddress" type="email" class="form-item__textfield" placeholder="[email protected]">
</div>
</div>

{% include "@components/button/button.twig" with { button__content: 'Apply today' } %}

</section>


</main>
{% include "@components/docs/examples/assets/_footer.twig" %}

</div>
5 changes: 5 additions & 0 deletions src/components/docs/examples/basic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
breadcrumb:
- url: '#'
text: 'Home'
- url: '#'
text: 'Your Education'
2 changes: 1 addition & 1 deletion src/components/docs/examples/home.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default {
title: 'Pages/Home',
decorators: [
(story) =>
`<div style="background: var(--colors-grays-700); padding: 0;">${story()}</div>`,
`<div style="background: var(--color-grays-700); padding: 0;margin:0;">${story()}</div>`,
],
};

Expand Down
4 changes: 2 additions & 2 deletions src/components/docs/examples/home.twig
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
{% include "@components/docs/examples/assets/_header.twig" %}
<main>
<section class="hero" style="background-image: url({{_context.heroImage}})">
<h1>The Future of Education</h1>
<h2>Innovative Approaches for Tomorrow's Learners</h2>
<h1>Future of Education</h1>
<h2>Innovative Approaches for Tomorrow&rsquo;s Learners</h2>
</section>

<section class="watch">
Expand Down
23 changes: 0 additions & 23 deletions src/components/docs/examples/program.stories.js

This file was deleted.

Loading