@eturnity/eturnity_reusable_components 6.46.5-EPDM-8599.0 → 6.46.5-EPDM-9185.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eturnity/eturnity_reusable_components",
3
- "version": "6.46.5-EPDM-8599.0",
3
+ "version": "6.46.5-EPDM-9185.0",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "dev": "vue-cli-service serve",
package/src/App.vue CHANGED
@@ -114,7 +114,6 @@ import iconCollection from '@/components/icon/iconCollection'
114
114
  import dropdownComponent from '@/components/dropdown'
115
115
  import videoThumbnail from '@/components/videoThumbnail'
116
116
  import icon from '@/components/icon'
117
- import infoCard from '@/components/infoCard'
118
117
  // import TableDropdown from "@/components/tableDropdown"
119
118
 
120
119
  const PageContainer = styled.div`
@@ -139,8 +138,7 @@ export default {
139
138
  iconCollection,
140
139
  dropdownComponent,
141
140
  videoThumbnail,
142
- icon,
143
- infoCard
141
+ icon
144
142
  },
145
143
  data() {
146
144
  return {
@@ -1,7 +1,8 @@
1
1
  <template>
2
- <page-container :withDate="!!date">
2
+ <page-container>
3
3
  <marker-container
4
4
  v-if="markerData"
5
+ :withDate="!!date"
5
6
  :backgroundColor="markerData.color"
6
7
  :hasIcon="!!iconName"
7
8
  :isEditionAllowed="editionAllowed"
@@ -96,13 +97,9 @@ import DeleteIcon from '../deleteIcon'
96
97
  import PageSubtitle from '../pageSubtitle'
97
98
  import MainButton from '../buttons/mainButton'
98
99
 
99
- const PageContainerAttrs = {
100
- withDate: Boolean
101
- }
102
- const PageContainer = styled('div', PageContainerAttrs)`
100
+ const PageContainer = styled.div`
103
101
  display: flex;
104
102
  align-items: center;
105
- gap: 10px;
106
103
  font-size: 12px;
107
104
  line-height: 14px;
108
105
  `
@@ -120,6 +117,7 @@ const CtaContainer = styled.div`
120
117
 
121
118
  const MarkerAttrs = {
122
119
  backgroundColor: String,
120
+ withDate: Boolean,
123
121
  hasIcon: Boolean,
124
122
  isEditionAllowed: Boolean,
125
123
  isActive: Boolean,
@@ -136,7 +134,8 @@ const MarkerContainer = styled('div', MarkerAttrs)`
136
134
  color: ${(props) => props.theme.colors.white};
137
135
  background-color: ${(props) =>
138
136
  props.backgroundColor ? props.backgroundColor : props.theme.colors.grey3};
139
- border-radius: 4px;
137
+ border: 1px solid ${(props) => props.backgroundColor ? props.backgroundColor : props.theme.colors.grey3};
138
+ border-radius: ${(props) => props.withDate ? '4px 0 0 4px' : '4px'};
140
139
  white-space: nowrap;
141
140
  cursor: ${(props) => props.isEditionAllowed ? 'pointer' : props.cursor};
142
141
 
@@ -194,7 +193,12 @@ const IconContainer = styled.div`
194
193
  line-height: 0;
195
194
  `
196
195
 
197
- const Date = styled.div``
196
+ const Date = styled.div`
197
+ padding: 2px 5px;
198
+ border: 1px solid ${(props) => props.theme.colors.grey4};
199
+ border-left: none;
200
+ border-radius: 0 4px 4px 0;
201
+ `
198
202
 
199
203
  export default {
200
204
  name: "project-marker",
@@ -1,38 +0,0 @@
1
- <template>
2
- <info-container>
3
- <icon name="info" size="24px" />
4
- <InfoTextContainer>
5
- <slot />
6
- </InfoTextContainer>
7
- </info-container>
8
- </template>
9
-
10
- <script>
11
- import styled from 'vue-styled-components'
12
- import icon from '../icon'
13
- const InfoContainer = styled('div')`
14
- display: flex;
15
- align-items: flex-start;
16
- gap: 15px;
17
- padding: 20px;
18
- width: 500px;
19
- min-width: 450px;
20
- border: 1px dashed #dee2eb;
21
- border-radius: 4px;
22
- margin:20px 0;
23
- `
24
-
25
- const InfoTextContainer = styled('div')`
26
- font-size: 13px;
27
- `
28
-
29
-
30
- export default {
31
- components:{
32
- icon,
33
- InfoTextContainer,
34
- InfoContainer
35
- },
36
- props:[]
37
- }
38
- </script>