From 9d70b24c0e70f93e5d4cefa0002c382dbcc3315c Mon Sep 17 00:00:00 2001 From: Hetu Nandu Date: Thu, 9 Apr 2020 15:36:52 +0530 Subject: [PATCH] Revert "Feature/launch btn fusion" This reverts commit d9830d1eabb42c60daf064751e7b0e9f273ca0f1. --- app/client/cypress/locators/HomePage.json | 2 +- .../pages/Applications/ApplicationCard.tsx | 38 +++++++++---------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/app/client/cypress/locators/HomePage.json b/app/client/cypress/locators/HomePage.json index d17422e5a3..636a48d0f7 100644 --- a/app/client/cypress/locators/HomePage.json +++ b/app/client/cypress/locators/HomePage.json @@ -1,6 +1,6 @@ { "searchInput": "input[type='text']", - "appEditIcon": "span[icon='edit']", + "appEditIcon": ".t--application-edit-link", "publishButton":".t--application-publish-btn", "publishCrossButton":"span[icon='small-cross']", "homePageID":"//div[@id='root']" diff --git a/app/client/src/pages/Applications/ApplicationCard.tsx b/app/client/src/pages/Applications/ApplicationCard.tsx index e8bf21c7da..01e2d398d0 100644 --- a/app/client/src/pages/Applications/ApplicationCard.tsx +++ b/app/client/src/pages/Applications/ApplicationCard.tsx @@ -5,7 +5,7 @@ import { getApplicationViewerPageURL, BUILDER_PAGE_URL, } from "constants/routes"; -import { Card, Tooltip, Classes, Icon } from "@blueprintjs/core"; +import { Card, Tooltip, Classes } from "@blueprintjs/core"; import { ApplicationPayload } from "constants/ReduxActionConstants"; import Button from "components/editorComponents/Button"; import { @@ -13,10 +13,10 @@ import { getBorderCSSShorthand, getColorWithOpacity, } from "constants/DefaultTheme"; +import { ControlIcons } from "icons/ControlIcons"; import ContextDropdown, { ContextDropdownOption, } from "components/editorComponents/ContextDropdown"; -import { Colors } from "constants/Colors"; const Wrapper = styled(Card)` display: flex; @@ -74,18 +74,9 @@ const ApplicationTitle = styled.div` border-top: ${props => getBorderCSSShorthand(props.theme.card.divider)}; font-weight: ${props => props.theme.fontWeights[2]}; font-size: ${props => props.theme.fontSizes[4]}px; - display: flex; - width: 100%; - justify-content: space-between; - align-items: center; & { - & > { - span:first-of-type { - display: inline-block; - width: 80%; - text-overflow: ellipsis; - overflow: hidden; - } + span { + display: inline-block; } .control { z-index: 1; @@ -131,8 +122,13 @@ const Control = styled.button<{ fixed?: boolean }>` `; const APPLICATION_CONTROL_FONTSIZE_INDEX = 6; - -const editControl = ; +const ViewIcon = ControlIcons.VIEW_CONTROL; +const viewIconProps = { + width: theme.fontSizes[APPLICATION_CONTROL_FONTSIZE_INDEX - 1], + height: theme.fontSizes[APPLICATION_CONTROL_FONTSIZE_INDEX - 1], + color: theme.colors.secondary, +}; +const viewControlIcon = ; type ApplicationCardProps = { application: ApplicationPayload; @@ -190,10 +186,10 @@ export const ApplicationCard = (props: ApplicationCardProps) => { className={props.loading ? Classes.SKELETON : undefined} > {props.application.name} - + - - {editControl} + + {viewControlIcon} @@ -207,14 +203,14 @@ export const ApplicationCard = (props: ApplicationCardProps) => { className="more" /> - +