Clean up some client code

This commit is contained in:
Ramon Wenger 2021-04-28 00:44:31 +02:00
parent 69b3353931
commit 19742f40e1
9 changed files with 56 additions and 32 deletions

View File

@ -90,8 +90,7 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@import "@/styles/_variables.scss"; @import "~styles/helpers";
@import "@/styles/_functions.scss";
.assignment-with-submissions { .assignment-with-submissions {
&__title { &__title {

View File

@ -57,10 +57,10 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@import "@/styles/_variables.scss"; @import "~styles/helpers";
@import "@/styles/_functions.scss";
.student-submission { .student-submission {
@include table-row;
&__student-name { &__student-name {
font-size: toRem(17px); font-size: toRem(17px);

View File

@ -3,7 +3,7 @@
#import "./fragments/objectiveGroupParts.gql" #import "./fragments/objectiveGroupParts.gql"
#import "./fragments/objectiveParts.gql" #import "./fragments/objectiveParts.gql"
#import "./fragments/moduleParts.gql" #import "./fragments/moduleParts.gql"
query ModulesQuery($slug: String!) { query ModuleDetailsQuery($slug: String!) {
module(slug: $slug) { module(slug: $slug) {
...ModuleParts ...ModuleParts
assignments { assignments {

View File

@ -61,16 +61,12 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@import "@/styles/_variables.scss"; @import "~styles/helpers";
@import "@/styles/_mixins.scss";
.instrument-overview { .instrument-overview {
display: grid; display: grid;
grid-template-rows: auto auto 1fr; grid-template-rows: auto auto 1fr;
justify-items: center; @include centered(800px);
justify-self: center;
width: 800px;
max-width: 100%;
&__heading { &__heading {
padding: 2*$large-spacing 0; padding: 2*$large-spacing 0;
@ -99,12 +95,9 @@
&__list-item { &__list-item {
padding: $medium-spacing 0; padding: $medium-spacing 0;
border-top: 1px solid $color-silver;
@include regular-text;
&:last-of-type { @include regular-text;
border-bottom: 1px solid $color-silver; @include table-row($color-silver);
}
} }
} }
</style> </style>

View File

@ -12,7 +12,7 @@
/> />
</template> </template>
<template v-else> <template v-else>
<h1 class="my-team__heading">Mein Team {{ me.team }}</h1> <h1 class="my-team__heading">Mein Team</h1>
<div class="my-team__section"> <div class="my-team__section">
<h2 class="my-team__subheading">Willst du einem bestehenden Team beitreten?</h2> <h2 class="my-team__subheading">Willst du einem bestehenden Team beitreten?</h2>
<router-link <router-link

View File

@ -28,7 +28,7 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@import "@/styles/_mixins.scss"; @import "~styles/helpers";
.module-page { .module-page {
display: flex; display: flex;
@ -37,6 +37,8 @@
} }
justify-items: center; justify-items: center;
grid-auto-rows: max-content;
@include desktop { @include desktop {
grid-template-columns: 1fr; grid-template-columns: 1fr;
} }

View File

@ -1,27 +1,18 @@
.button { .button {
background: transparent; background: transparent;
border: 2px solid $color-silver-dark;
padding: 5px 15px; padding: 5px 15px;
border-radius: 3px;
font-family: $sans-serif-font-family; font-family: $sans-serif-font-family;
font-weight: $font-weight-regular; font-weight: $font-weight-regular;
display: inline-flex; display: inline-flex;
cursor: pointer; cursor: pointer;
@include small-text; @include small-text;
@include button-border;
&--active {
border-color: $color-brand;
}
&--primary {
border-color: $color-brand;
}
&--white-bg { &--white-bg {
background-color: $color-white; background-color: $color-white;
} }
&--disabled { &--disabled {
border: 2px solid $color-silver-light;
background-color: $color-silver-light; background-color: $color-silver-light;
} }
&--big { &--big {

View File

@ -145,6 +145,12 @@
font-weight: 600; font-weight: 600;
} }
@mixin large-link {
font-family: $sans-serif-font-family;
font-size: toRem(18px);
font-weight: 400;
}
@mixin meta-title { @mixin meta-title {
color: $color-silver-dark; color: $color-silver-dark;
font-size: toRem(36px); font-size: toRem(36px);
@ -240,3 +246,38 @@
margin-bottom: $section-spacing; margin-bottom: $section-spacing;
} }
} }
@mixin button-border {
border: 2px solid $color-silver-dark;
border-radius: 3px;
&--active {
border-color: $color-brand;
}
&--primary {
border-color: $color-brand;
}
&--disabled {
border-color: $color-silver-light;
}
}
@mixin centered($width: 800px) {
width: $width;
max-width: 100%;
justify-self: center;
}
@mixin table-row($color: $color-silver-dark) {
border-top: 1px solid $color;
padding: 15px 0;
width: 100%;
&:last-of-type {
border-bottom: 1px solid $color;
}
}

View File

@ -1,5 +1,4 @@
@import "@/styles/_variables.scss"; @import "~styles/helpers";
@import "@/styles/_mixins.scss";
.student-submission-row { .student-submission-row {
display: grid; display: grid;
@ -12,6 +11,5 @@
} }
align-items: center; align-items: center;
border-bottom: 1px solid $color-silver-dark;
padding: 15px 0; padding: 15px 0;
} }