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

feature/FOUR-14002: Designer "Assets" icons default color and hover are not the same as figma #6146

Merged
merged 5 commits into from
Feb 2, 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
2 changes: 1 addition & 1 deletion resources/js/processes/designer/Asset.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default {
gap: 4px;
flex: 1 0 0;
align-self: stretch;
margin: 10px 0px;
margin: 12px 0px;
}
i {
font-size: 32px;
Expand Down
23 changes: 16 additions & 7 deletions resources/js/processes/designer/AssetButtons.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
<div class="button-container">
<b-button
size="sm"
class="custom-button custom-text mb-2"
class="custom-button mb-2"
block
@click="openAsset(urlAsset)"
>
{{ $t(asset_name_new) }}
<i class="fas fa-arrow-right ml-2 align-middle" />
<p class="custom-text"> {{ $t(asset_name_new) }} </p>
<i class="fas fa-arrow-right ml-2 align-middle text-primary" />
</b-button>
</div>
<div class="button-container">
<b-button
size="sm"
class="custom-button custom-text"
class="custom-button"
block
@click="callURL()"
>
{{ $t(asset_name_all) }}
<i class="fas fa-arrow-right ml-2 align-middle" />
<p class="custom-text"> {{ $t(asset_name_all) }} </p>
<i class="fas fa-arrow-right ml-2 align-middle text-primary" />
</b-button>
</div>
</b-card-text>
Expand Down Expand Up @@ -49,6 +49,9 @@ export default {
</script>

<style scoped>
.card-text {
width: 100%;
}
.button-container {
display: block;
width: 100%;
Expand All @@ -64,20 +67,26 @@ export default {
display: flex;
padding: 8px 12px;
justify-content: space-between;
text-align: start;
align-items: center;
flex: 1 0 0;
align-self: stretch;
border-radius: 4px;
border: 1px solid #b7d8ff;
background: #edf4ff;
}
.custom-button:hover {
background: #d1e3fe;
}
.custom-text {
color: #5e6469;
font-family: "Open Sans", sans-serif;
font-size: 12px;
font-size: 14px;
font-style: normal;
font-weight: 400;
line-height: normal;
letter-spacing: -0.28px;
text-transform: capitalize;
margin: 0px;
}
</style>
11 changes: 6 additions & 5 deletions resources/js/processes/designer/Assets.vue
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export default {
icon: "fas fa-play-circle",
asset_name: "Processes",
asset_name_all: "View All Processes",
asset_name_new: "Create New Process",
asset_name_new: "New Process",
urlPath: "/processes",
urlAsset: "/processes?new=true",
},
Expand All @@ -98,7 +98,7 @@ export default {
icon: "fas fa-file-alt",
asset_name: "Screens",
asset_name_all: "View All Screens",
asset_name_new: "Create New Screen",
asset_name_new: "New Screen",
urlPath: "/designer/screens",
urlAsset: "/designer/screens?create=true",
},
Expand All @@ -107,7 +107,7 @@ export default {
icon: "fas fa-code",
asset_name: "Scripts",
asset_name_all: "View All Scripts",
asset_name_new: "Create New Script",
asset_name_new: "New Script",
urlPath: "/designer/scripts",
urlAsset: "/designer/scripts?create=true",
},
Expand All @@ -118,7 +118,7 @@ export default {
icon: "fas fa-table",
asset_name: "Decision Tables",
asset_name_all: "View All Decision Tables",
asset_name_new: "Create New Decision Table",
asset_name_new: "New Decision Table",
urlPath: "/designer/decision-tables",
urlAsset: "/designer/decision-tables?create=true",
},
Expand All @@ -127,7 +127,7 @@ export default {
icon: "fas fa-share-alt",
asset_name: "Data Connectors",
asset_name_all: "View All Data Connectors",
asset_name_new: "Create New Data Connector",
asset_name_new: "New Data Connector",
urlPath: "/designer/data-sources",
urlAsset: "/designer/data-sources?create=true",
},
Expand Down Expand Up @@ -184,5 +184,6 @@ export default {
display: flex;
justify-content: center;
align-items: center;
padding: 8px;
}
</style>
7 changes: 6 additions & 1 deletion resources/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1910,8 +1910,13 @@
"Version Name": "Version Name",
"Vertical alignment of the text": "Vertical alignment of the text",
"View {{user}} Profile": "View {{user}} Profile",
"View All Requests": "View All Requests",
"View All": "View All",
"View All Data Connectors": "View All Data Connectors",
"View All Decision Tables": "View All Decision Tables",
"View All Processes": "View All Processes",
"View All Requests": "View All Requests",
"View All Screens": "View All Processes",
"View All Scripts": "View All Scripts",
"View All Notifications": "View All Notifications",
"View Auth Clients": "View Auth-Clients",
"View Categories": "View Categories",
Expand Down
Loading