Skip to content

Commit

Permalink
Merge pull request #928 from isha-dubey/fix/consistency-of-hovering-e…
Browse files Browse the repository at this point in the history
…ffect-all-over-app

[staging] fix : add hovering effects in different places [123]
  • Loading branch information
itsmdasifraza authored Jun 3, 2024
2 parents b05864e + ce516f0 commit 9a5e0a2
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@
background-color: var(--bg-secondary-400);
}
.threedot-icon-container:hover {
background-color: var(--bg-secondary-400);
background-color: var( --text-tertiary-600);
}
.btn-primary {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,11 @@
}
.add-environment {
border: 1px solid var(--text-secondary-300);
border-radius: 2px;
height: 32px;
}
.add-environment:hover{
border: 1px solid var(--border-primary-300);
border-radius: 2px;
}
</style>
4 changes: 4 additions & 0 deletions src/packages/@workspaces/common/utils/url-input-theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ export class UrlInputTheme {
fontSize: "12px",
fontWeight: "400",
},
"&.cm-editor:hover": {
border: "1px solid var(--border-primary-200)",
borderRadius: "0",
},
"&.cm-editor.cm-focused": {
border: "1px solid var(--border-primary-200)",
borderRadius: "0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,7 @@
border: 1px solid var(--text-secondary-300);
height: 32px;
}
.add-collection:hover{
border: 1px solid var(--text-primary-300);
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@
handleSearch();
}}
defaultBorderColor="transparent"
hoveredBorderColor="transparent"
hoveredBorderColor="var(--border-primary-300)"
focusedBorderColor={"var(--border-primary-300)"}
class="text-fs-12 bg-tertiary-400 border-radius-2 ellipsis fw-normal px-2"
style="outline:none;"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,13 @@
{/if}

<button
class="{!(tab?.property?.request && !tab?.isSaved) && !tab.isActive
class="cross-icon-btn {!(tab?.property?.request && !tab?.isSaved) && !tab.isActive
? 'inactive-close-btn'
: ''} btn border-0 d-flex align-items-center px-1"
: ''} btn d-flex align-items-center px-1"
on:click={() => {
onTabClosed(tab.id, tab);
}}
style="overflow:hidden; height: 31px;"
style="overflow:hidden; height: 18px; width:22px; margin-top:7px; margin-bottom:6px;"
>
<Crossicon />
</button>
Expand All @@ -164,7 +164,8 @@
style="height: 18px; width: 1px; background-color: var(--tab-request-divider-line) ; top: 10px; right: 0;"
/>
{/if}
</button>
</div></button
>

<style>
* {
Expand Down Expand Up @@ -194,5 +195,9 @@
.individual-tab:hover .request-text {
color: var(--text-secondary-100) !important;
}
.cross-icon-btn:hover{
background-color: var(--text-tertiary-300);
border-radius: 2px;
}
</style>
29 changes: 15 additions & 14 deletions src/packages/@workspaces/features/tab-bar/layout/TabBar.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@
import VerticalGrid from "@library/icons/VerticalGrid.svelte";
import SplitVerital from "@workspaces/features/tab-bar/assets/SplitVertical.svg";
import SplitHorizontal from "@workspaces/features/tab-bar/assets/SplitHorizontal.svg";
// ---- Store
import { collapsibleState } from "$lib/store/request-response-section";
// ---- Interface
import type { TabDocument } from "@app/database/database";
// ---- Component
import Tab from "@workspaces/features/tab-bar/components/tab/Tab.svelte";
import { Dropdown } from "@library/ui";
// ---- Helper
import { moveNavigation, tabBarScroller } from "$lib/utils/helpers/navigation";
import Button from "@library/ui/button/Button.svelte";
import { requestSplitterDirection } from "@workspaces/features/rest-explorer/store";
// ------ Props ------
/**
* List of tabs
Expand Down Expand Up @@ -59,23 +59,23 @@
* @param id - Tab ID
*/
export let onTabSelected: (id: string) => void;
export let onChangeViewInRequest: (view: string) => void;
$: {
if (tabList) {
scrolable = tabList.length * 182 >= scrollerParent;
}
}
let tabWidth: number = 182;
let scrolable: boolean = false;
let scrollerParent: number;
let scrollerWidth: number;
let moreOption: boolean = false;
let viewChange: boolean = false;
</script>

<button
class="tab border-0 w-100 bg-blackColor d-flex"
style="cursor: default;"
Expand Down Expand Up @@ -236,19 +236,20 @@
</div>
</div>
</button>

<style>
* {
transition: all 300ms;
transition: all 300ms;
}
.tabbar {
height: 35px;
background-color: var(--sparrow-black);
}
.tab-scroller::-webkit-scrollbar {
display: none;
}
</style>

0 comments on commit 9a5e0a2

Please sign in to comment.