Skip to content

Commit

Permalink
general ui tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
electh committed Jan 31, 2025
1 parent cd32014 commit 3efda41
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/components/ArticleList/components/EditFeedModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ export default function EditFeedModal() {
type="submit"
isLoading={loading}
size="sm"
className="border-primary border shadow-custom-button bg-transparent bg-gradient-to-b from-primary/90 to-primary"
className="border-primary border shadow-custom-button bg-primary bg-gradient-to-b from-white/15 to-transparent"
>
{t("common.save")}
</Button>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ArticleList/components/RenameModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export default function RenameModal() {
type="submit"
isLoading={loading}
size="sm"
className="border-primary border shadow-custom-button bg-transparent bg-gradient-to-b from-primary/90 to-primary"
className="border-primary border shadow-custom-button bg-primary bg-gradient-to-b from-white/15 to-transparent"
>
{t("common.save")}
</Button>
Expand Down
2 changes: 1 addition & 1 deletion src/components/FeedList/components/AddCategoryModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export default function AddCategoryModal() {
isLoading={loading}
size="sm"
fullWidth
className="border-primary border shadow-custom-button bg-transparent bg-gradient-to-b from-primary/90 to-primary"
className="border-primary border shadow-custom-button bg-primary bg-gradient-to-b from-white/15 to-transparent"
>
{t("common.save")}
</Button>
Expand Down
2 changes: 1 addition & 1 deletion src/components/FeedList/components/AddFeedModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ export default function AddFeedModal() {
type="submit"
isLoading={loading}
size="sm"
className="border-primary border shadow-custom-button bg-transparent bg-gradient-to-b from-primary/90 to-primary"
className="border-primary border shadow-custom-button bg-primary bg-gradient-to-b from-white/15 to-transparent"
>
{t("common.save")}
</Button>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/AlertDialog.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export default function AlertDialog({
onPress={handleConfirm}
isLoading={loading}
size="sm"
className="border-danger border shadow-custom-button bg-transparent bg-gradient-to-b from-danger/90 to-danger"
className="border-danger border shadow-custom-button bg-danger bg-gradient-to-b from-white/15 to-transparent"
>
{confirmText}
</Button>
Expand Down
16 changes: 10 additions & 6 deletions src/components/ui/settingItem.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export const SliderItem = ({
renderThumb={(props) => (
<div
{...props}
className="group p-2 top-1/2 bg-white border shadow-custom-button rounded-full cursor-grab data-[dragging=true]:cursor-grabbing"
className="group h-6 w-6 top-1/2 bg-white border shadow-md rounded-full cursor-grab data-[dragging=true]:cursor-grabbing"
></div>
)}
/>
Expand Down Expand Up @@ -83,15 +83,18 @@ export const SwitchItem = ({
}) => {
return (
<div
className={`flex justify-between items-center gap-2 ${bgColor} px-2 py-2.5`}
className={`flex justify-between items-center gap-2 ${bgColor} px-2 py-3`}
>
<div className="flex items-center gap-2">
{icon}
<div className="text-sm text-foreground line-clamp-1">{label}</div>
</div>
<Switch
isSelected={settingValue}
classNames={{ wrapper: "shadow-custom-inner" }}
classNames={{
wrapper: "shadow-custom-inner h-6 w-11 px-0 overflow-visible",
thumb: "absolute w-6 h-6 border shadow-md",
}}
isDisabled={disabled}
onValueChange={(value) => updateSettings({ [settingName]: value })}
/>
Expand Down Expand Up @@ -151,9 +154,10 @@ export function GroupItem({ label, icon, settingName, settingValue, options }) {
size="sm"
variant="solid"
classNames={{
tabList: "bg-default-100/90 backdrop-blur-md shadow-custom-inner",
tab: "py-0 h-6",
cursor: "bg-content1",
tabList:
"bg-default-100/90 backdrop-blur-md shadow-custom-inner p-0 gap-0 rounded-small overflow-visible",
tab: "py-1 h-8",
cursor: "bg-content1 shadow-sm border",
}}
selectedKey={settingValue}
onSelectionChange={(value) => {
Expand Down

0 comments on commit 3efda41

Please sign in to comment.