Skip to content
Snippets Groups Projects
Commit 456251b4 authored by Tuukka Turu's avatar Tuukka Turu
Browse files

Merge branch 'NXSTAGE-X-Sprint32-fixes2' into 'development'

fixes for degree programme, text 2 column, and video

See merge request julkiset-sivut/design-system-lib!109
parents 822eaa9f 3a3fe85f
No related branches found
No related tags found
No related merge requests found
...@@ -123,7 +123,7 @@ ...@@ -123,7 +123,7 @@
color: var(--grayscale-black); color: var(--grayscale-black);
left: -4px; left: -4px;
letter-spacing: -0.07px; letter-spacing: -0.07px;
padding: 8px 5px; padding: 5px 8px;
position: absolute; position: absolute;
top: 16px; top: 16px;
text-transform: uppercase; text-transform: uppercase;
...@@ -249,14 +249,13 @@ ...@@ -249,14 +249,13 @@
height: 14px; height: 14px;
width: 14px; width: 14px;
border: 3px solid #ffffff; border: 3px solid #ffffff;
border-radius: 4px; border-radius: 50%;
background-color: #f9a21a; background-color: #f9a21a;
left: -7px; left: -7px;
position: absolute; position: absolute;
@include breakpoint($narrow) { @include breakpoint($narrow) {
border: none; border: none;
border-radius: 4px;
height: 8px; height: 8px;
margin-right: 6px; margin-right: 6px;
width: 8px; width: 8px;
...@@ -390,6 +389,7 @@ ...@@ -390,6 +389,7 @@
letter-spacing: -0.2px; letter-spacing: -0.2px;
height: 100%; height: 100%;
padding: 8px 0; padding: 8px 0;
text-align: left;
width: 100%; width: 100%;
@include breakpoint($narrow) { @include breakpoint($narrow) {
......
...@@ -236,7 +236,6 @@ ...@@ -236,7 +236,6 @@
display: block; display: block;
font-family: var(--main-font-family); font-family: var(--main-font-family);
letter-spacing: 0; letter-spacing: 0;
margin-bottom: 16px;
width: 100%; width: 100%;
@include breakpoint($narrow) { @include breakpoint($narrow) {
......
...@@ -121,9 +121,7 @@ export class HyVideo { ...@@ -121,9 +121,7 @@ export class HyVideo {
)} )}
</div> </div>
)} )}
{this.videoDescription && ( {this.videoDescription && <div class="hy-video__meta__description">{this.videoDescription}</div>}
<hy-paragraph-text class="hy-video__meta__description">{this.videoDescription}</hy-paragraph-text>
)}
</div> </div>
</div>, </div>,
<hy-box mb="1.75, 1.75, 2, 2.5" />, <hy-box mb="1.75, 1.75, 2, 2.5" />,
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
- [hy-icon](../icon) - [hy-icon](../icon)
- [hy-heading](../heading) - [hy-heading](../heading)
- [hy-paragraph-text](../paragraph-text)
- [hy-box](../hy-box) - [hy-box](../hy-box)
### Graph ### Graph
...@@ -38,10 +37,8 @@ ...@@ -38,10 +37,8 @@
graph TD; graph TD;
hy-video --> hy-icon hy-video --> hy-icon
hy-video --> hy-heading hy-video --> hy-heading
hy-video --> hy-paragraph-text
hy-video --> hy-box hy-video --> hy-box
hy-heading --> hy-box hy-heading --> hy-box
hy-paragraph-text --> hy-box
style hy-video fill:#f9f,stroke:#333,stroke-width:4px style hy-video fill:#f9f,stroke:#333,stroke-width:4px
``` ```
......
...@@ -39,10 +39,6 @@ Basic text paragraph. ...@@ -39,10 +39,6 @@ Basic text paragraph.
## Dependencies ## Dependencies
### Used by
- [hy-video](../hy-video)
### Depends on ### Depends on
- [hy-box](../hy-box) - [hy-box](../hy-box)
...@@ -52,7 +48,6 @@ Basic text paragraph. ...@@ -52,7 +48,6 @@ Basic text paragraph.
```mermaid ```mermaid
graph TD; graph TD;
hy-paragraph-text --> hy-box hy-paragraph-text --> hy-box
hy-video --> hy-paragraph-text
style hy-paragraph-text fill:#f9f,stroke:#333,stroke-width:4px style hy-paragraph-text fill:#f9f,stroke:#333,stroke-width:4px
``` ```
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment