Skip to content

Commit

Permalink
Merge pull request #176 from os2ulf/feature/OS2UOL-948
Browse files Browse the repository at this point in the history 
Feature/os2 uol 948
  • Loading branch information
@tutaru99
tutaru99 authored Nov 12, 2024
2 parents 2ea5815 + 1f71508 commit f53404f
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 64 deletions.
4 changes: 2 additions & 2 deletions assets/css/_buttons.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
&--secondary {
background-color: var(--color-tertiary);
color: var(--color-secondary-lighten-4);
border-color:var(--color-tertiary);
border-color: var(--color-tertiary);

&:hover {
background-color: var(--color-tertiary-darken-2);
border-color:var(--color-tertiary);
border-color: var(--color-tertiary);
color: var(--color-secondary);
}

Expand Down
13 changes: 5 additions & 8 deletions components/views/courseView.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -587,15 +587,11 @@ const currentUrl = computed(() => {
&__tags-wrapper {
padding-top: 24px;
display: flex;
display: grid @(--sm) flex;
gap: 12px @(--sm) 16px;
margin-bottom: 32px;
}
&__tags-item {
margin-right: 16px;
}
&__page-heading-wrapper {
display: grid @(--md) flex;
justify-content: space-between;
Expand All @@ -610,11 +606,12 @@ const currentUrl = computed(() => {
&__page-heading-button-container {
margin-top: 10px @(--md) 0;
display: flex;
display: grid @(--sm) flex;
gap: 10px @(--sm) 0;
.button {
margin-right: 12px @(--md) 0;
margin-left: 0 @(--md) 12px;
white-space: normal @(--sm) nowrap;
}
}
Expand Down
23 changes: 10 additions & 13 deletions components/views/course_educatorsView.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,17 +233,17 @@ const currentUrl = computed(() => {
/>
</div>

<div class="educators__tags-item" v-if="data?.field_is_free || data?.field_sold_out">
<div
class="educators__tags-item"
v-if="data?.field_is_free || data?.field_sold_out"
>
<BaseTag
:data="{ label: data?.field_sold_out ? 'Udsolgt' : 'Gratis' }"
color="secondary"
/>
</div>

<div
class="educators__tags-item"
v-if="data?.field_banner"
>
<div class="educators__tags-item" v-if="data?.field_banner">
<BaseTag
:data="{ label: data?.field_banner }"
color="secondary-lighten"
Expand Down Expand Up @@ -483,15 +483,11 @@ const currentUrl = computed(() => {
&__tags-wrapper {
padding-top: 24px;
display: flex;
display: grid @(--sm) flex;
gap: 12px @(--sm) 16px;
margin-bottom: 32px;
}
&__tags-item {
margin-right: 16px;
}
&__page-heading-wrapper {
display: grid @(--md) flex;
justify-content: space-between;
Expand All @@ -506,11 +502,12 @@ const currentUrl = computed(() => {
&__page-heading-button-container {
margin-top: 10px @(--md) 0;
display: flex;
display: grid @(--sm) flex;
gap: 10px @(--sm) 0;
.button {
margin-right: 12px @(--md) 0;
margin-left: 0 @(--md) 12px;
white-space: normal @(--sm) nowrap;
}
}
Expand Down
18 changes: 9 additions & 9 deletions components/views/exerciseView.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,10 @@ const currentUrl = computed(() => {
/>
</div>

<div class="exercise__tags-item" v-if="data?.field_focus && !data?.field_banner">
<div
class="exercise__tags-item"
v-if="data?.field_focus && !data?.field_banner"
>
<BaseTag
:data="{ label: data?.field_focus[0] }"
color="primary-lighten"
Expand Down Expand Up @@ -361,15 +364,11 @@ const currentUrl = computed(() => {
&__tags-wrapper {
padding-top: 24px;
display: flex;
display: grid @(--sm) flex;
gap: 12px @(--sm) 16px;
margin-bottom: 32px;
}
&__tags-item {
margin-right: 16px;
}
&__page-heading-wrapper {
display: grid @(--md) flex;
justify-content: space-between;
Expand All @@ -384,11 +383,12 @@ const currentUrl = computed(() => {
&__page-heading-button-container {
margin-top: 10px @(--md) 0;
display: flex;
display: grid @(--sm) flex;
gap: 10px @(--sm) 0;
.button {
margin-right: 12px @(--md) 0;
margin-left: 0 @(--md) 12px;
white-space: normal @(--sm) nowrap;
}
}
Expand Down
24 changes: 8 additions & 16 deletions components/views/internshipView.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ const currentUrl = computed(() => {
</div>

<div
class="educators__tags-item"
class="internship__tags-item"
v-if="data?.field_industry && !data?.field_banner"
>
<BaseTag
Expand All @@ -171,16 +171,10 @@ const currentUrl = computed(() => {
</div>

<div class="internship__tags-item" v-if="data?.field_sold_out">
<BaseTag
:data="{ label: 'Udsolgt' }"
color="secondary"
/>
<BaseTag :data="{ label: 'Udsolgt' }" color="secondary" />
</div>

<div
class="educators__tags-item"
v-if="data?.field_banner"
>
<div class="internship__tags-item" v-if="data?.field_banner">
<BaseTag
:data="{ label: data?.field_banner }"
color="secondary-lighten"
Expand Down Expand Up @@ -433,14 +427,11 @@ const currentUrl = computed(() => {
&__tags-wrapper {
padding-top: 24px;
display: flex;
display: grid @(--sm) flex;
gap: 12px @(--sm) 16px;
margin-bottom: 32px;
}
&__tags-item {
margin-right: 16px;
}
&__page-heading-wrapper {
display: grid @(--md) flex;
justify-content: space-between;
Expand All @@ -455,11 +446,12 @@ const currentUrl = computed(() => {
&__page-heading-button-container {
margin-top: 10px @(--md) 0;
display: flex;
display: grid @(--sm) flex;
gap: 10px @(--sm) 0;
.button {
margin-right: 12px @(--md) 0;
margin-left: 0 @(--md) 12px;
white-space: normal @(--sm) nowrap;
}
}
Expand Down
12 changes: 5 additions & 7 deletions components/views/newsView.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,14 +179,11 @@ const practicalInfoData = computed(() => {
&__tags-wrapper {
padding-top: 24px;
display: flex;
display: grid @(--sm) flex;
gap: 12px @(--sm) 16px;
margin-bottom: 32px;
}
&__tags-item {
margin-right: 16px;
}
&__page-heading-wrapper {
display: grid @(--md) flex;
justify-content: space-between;
Expand All @@ -201,11 +198,12 @@ const practicalInfoData = computed(() => {
&__page-heading-button-container {
margin-top: 10px @(--md) 0;
display: flex;
display: grid @(--sm) flex;
gap: 10px @(--sm) 0;
.button {
margin-right: 12px @(--md) 0;
margin-left: 0 @(--md) 12px;
white-space: normal @(--sm) nowrap;
}
}
Expand Down
17 changes: 8 additions & 9 deletions components/views/userView.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,9 @@ const relatedContent = ref(props.data?.related_content);
:key="button"
>
<NuxtLink
v-if="button?.field_file || button?.field_external_link?.url"
v-if="
button?.field_file || button?.field_external_link?.url
"
class="user__info-description__button-item__link button button--ghost"
:to="
button?.field_file
Expand Down Expand Up @@ -357,15 +359,11 @@ const relatedContent = ref(props.data?.related_content);
&__tags-wrapper {
padding-top: 24px;
display: flex;
display: grid @(--sm) flex;
gap: 12px @(--sm) 16px;
margin-bottom: 32px;
}
&__tags-item {
margin-right: 16px;
}
&__page-heading-wrapper {
display: grid @(--md) flex;
justify-content: space-between;
Expand All @@ -380,11 +378,12 @@ const relatedContent = ref(props.data?.related_content);
&__page-heading-button-container {
margin-top: 10px @(--md) 0;
display: flex;
display: grid @(--sm) flex;
gap: 10px @(--sm) 0;
.button {
margin-right: 12px @(--md) 0;
margin-left: 0 @(--md) 12px;
white-space: normal @(--sm) nowrap;
}
}
Expand Down

0 comments on commit f53404f

Please sign in to comment.