Merge pull request #441 from conversionxl/anoblet/fix/card

conversionxl · Dec 17, 2024 · 9f276df · 9f276df
2 parents 2889eb2 + 3321901
commit 9f276df
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/packages/cxl-ui/scss/cxl-base-card.scss b/packages/cxl-ui/scss/cxl-base-card.scss
@@ -196,7 +196,7 @@ header {
           border-radius: calc(var(--lumo-border-radius-l) * 6);
           background: var(--lumo-primary-color);
           padding: calc(var(--lumo-space-xs) / 2) var(--lumo-space-s);
-          font-size: var(--lumo-font-size-s);
+          font-size: var(--lumo-font-size-xxs);
           font-weight: 700;
           line-height: var(--lumo-line-height-s);
         }

diff --git a/packages/cxl-ui/scss/cxl-course-card.scss b/packages/cxl-ui/scss/cxl-course-card.scss
@@ -7,6 +7,15 @@
 :host {
   font-size: var(--lumo-font-size-m);
   height: 280px;
+
+  #locked {
+    display: flex;
+
+    vaadin-icon {
+      height: var(--lumo-icon-size-s);
+      width: var(--lumo-icon-size-s)
+    }
+  }
 }
 
 :host(:hover) {

diff --git a/packages/cxl-ui/src/components/cxl-base-card.js b/packages/cxl-ui/src/components/cxl-base-card.js
@@ -54,7 +54,7 @@ export class CXLBaseCardElement extends LitElement {
         ${this.theme && this._tagsHasChildren ? this.separator : ''}
         <slot name="tags" @slotchange=${this._slotHasChildren}></slot>
         ${this.new ? html`${this.theme ? this.separator : ''}<span class="tag new">NEW</span>` : ''}
-        ${this.locked ? html`${this.theme ? this.separator : ''}<span><vaadin-icon class="icon-lock" icon="vaadin:lock"><vaadin-tooltip slot="tooltip" text="${this.lockedMessage}"></vaadin-tooltip></vaadin-icon></span>` : ''}
+        ${this.locked ? html`${this.theme && !(this.new && this.locked) ? this.separator : ''}<span id="locked"><vaadin-icon class="icon-lock" icon="vaadin:lock"><vaadin-tooltip slot="tooltip" text="${this.lockedMessage}"></vaadin-tooltip></vaadin-icon></span>` : ''}
       </div>
     `;
   }