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

Minor fixes #139

Merged
merged 3 commits into from
Nov 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# CHANGELOG


## 1.10.3
- Fix CSS variable mismatch for `Sidebar`

## 1.10.1
- Tweak theme values for icons and text inside `InputField`

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fictoan-react",
"version": "1.10.2",
"version": "1.10.3",
"private": false,
"description": "A full-featured, designer-friendly, yet performant framework with plain-English props and focus on rapid iteration.",
"repository": {
Expand Down
4 changes: 2 additions & 2 deletions src/components/Sidebar/SidebarItem/sidebar-item.css
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@
position : relative;

&::after {
position : absolute;
content : "";
display : block;
position : absolute;
pointer-events : none;
right : 6px;
height : 8px;
width : 8px;
border-radius : 50%;
background-color : var(--sidebar-item-has-alert-bg);
background-color : var(--sidebar-item-alert-bg);
}
}

Expand Down
9 changes: 8 additions & 1 deletion src/components/Toast/ToastItem/ToastItem.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
// FRAMEWORK ===========================================================================================================
import React, { useState, useEffect } from "react";

// FICTOAN =============================================================================================================
import { Element } from "../../Element/Element";
import { CommonAndHTMLProps } from "../../Element/constants";

// STYLES ==============================================================================================================
import "./toast-item.css";

// TYPES ===============================================================================================================
import { CommonAndHTMLProps } from "../../Element/constants";


// prettier-ignore
export interface ToastItemCustomProps {
showWhen ? : boolean;
Expand All @@ -16,6 +22,7 @@ export type ToastItemElementType = HTMLDivElement;
export type ToastItemProps = Omit<CommonAndHTMLProps<ToastItemElementType>, keyof ToastItemCustomProps> &
ToastItemCustomProps;

// COMPONENT ///////////////////////////////////////////////////////////////////////////////////////////////////////////
export const ToastItem = React.forwardRef(
({ showWhen, children, secondsToShowFor, closeWhen, ...props }: ToastItemProps, ref: React.Ref<ToastItemElementType>) => {
let classNames: string[] = [];
Expand Down
5 changes: 5 additions & 0 deletions src/components/Typography/Heading.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
// FRAMEWORK ===========================================================================================================
import React from "react";

// FICTOAN =============================================================================================================
import { Element } from "../Element";

// TYPES ===============================================================================================================
import { CommonAndHTMLProps, WeightTypes } from "../Element/constants";

// prettier-ignore
Expand All @@ -14,6 +18,7 @@ interface HeadingBaseProps {
export type HeadingElementType = HTMLHeadingElement;
export type HeadingProps = Omit<CommonAndHTMLProps<HeadingElementType>, keyof HeadingBaseProps> & HeadingBaseProps;

// COMPONENT ///////////////////////////////////////////////////////////////////////////////////////////////////////////
const Heading = React.forwardRef(
({ fontStyle = "sans-serif", weight, align, ...props }: HeadingProps, ref: React.Ref<HeadingElementType>) => {
let classNames = [];
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/generateColourClasses.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// src/scripts/generateColourClasses.js
// Keeping this file as JS because TS was throwing errors in the build
import fs from "fs";
import path from "path";
import { fileURLToPath } from "url";
Expand Down
3 changes: 2 additions & 1 deletion src/styles/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@
--sidebar-item-text-scale : 100%;
--sidebar-item-text-weight : 600;

--sidebar-item-has-alert-bg : var(--red);
--sidebar-item-alert-bg : var(--red);

--sidebar-footer-height : 40px;
--sidebar-footer-bg : var(--white);
Expand Down Expand Up @@ -574,6 +574,7 @@
}

/* TEXT ///////////////////////////////////////////////////////////////////// */
/* To compute fluid font sizes based on screen size */
:root {
--screen-width-min : 320;
--screen-width-max : 1600;
Expand Down