ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Update font styles, change width

This commit is contained in:
Christian Cueni 2019-07-08 13:11:20 +02:00
parent b50a489e7d
commit d2dabd6952
6 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/components/ContentBlock.vue
View File

@ -148,7 +148,10 @@
}
&--task {
@include content-box($color-brand);
.content-block__title {
color: $color-brand;
@include light-border(bottom);
}
}
&--base_society {

1
client/src/components/content-blocks/assignment/Assignment.vue
View File

@ -1,6 +1,5 @@
<template>
<div class="assignment">
<h3 class="assignment__title" :id="id">{{assignment.title}}</h3>
<p class="assignment__assignment-text">
{{assignment.assignment}}
</p>

7
client/src/components/modules/Module.vue
View File

@ -147,7 +147,7 @@
display: flex;
justify-self: center;
@include desktop {
width: 640px;
width: 800px;
}
flex-direction: column;
padding: $large-spacing 15px;
@ -166,9 +166,11 @@
}
&__meta-title {
font-size: 2.6rem;
color: $color-grey;
font-size: 2.25rem;
font-weight: 300;
font-family: $serif-font-family;
line-height: 3.25rem;
}
&__intro {
@ -184,5 +186,6 @@
}
}
}
}
</style>

4
client/src/styles/_mixins.scss
View File

@ -138,3 +138,7 @@
margin-bottom: $medium-spacing;
@include heading-3;
}
@mixin light-border($border-position) {
border-#{$border-position}: 1px solid $color-lightgrey;
}

14
client/src/styles/_objective-group.scss
View File

@ -1,13 +1,11 @@
@import 'variables';
@import 'mixins';
.objective-group {
background-color: $color-lightgrey;
padding: 17px;
margin-bottom: 35px;
&__objective-list {
padding-left: 20px;
list-style: disc;
list-style: none;
&--no-list {
list-style: none;
@ -16,7 +14,13 @@
}
&__objective {
margin-bottom: 28px;
padding: 10px 0;
line-height: 1.5;
@include light-border(top);
}
&:last-child {
@include light-border(bottom);
}
}

13
client/src/styles/_typography.scss
View File

@ -11,6 +11,7 @@
h1, h2, h3, h4, h5 {
font-family: $sans-serif-font-family;
font-weight: 600;
color: $header-color
}
p, a, li {
@ -30,11 +31,12 @@ a {
h1 {
font-size: 2rem;
font-weight: 800;
color: $header-color;
margin-bottom: 35px;
margin-bottom: 21px;
@include desktop {
font-size: 4rem; // 64px
line-height: 4.5rem;
margin-bottom: 20px;
}
}
@ -44,12 +46,13 @@ h2 {
}
h3 {
font-size: 2.1875rem; // 35px
margin-bottom: 24px;
font-size: 2.13rem; // 34px
line-height: 2.63rem; // 42px
margin-bottom: 52px;
}
h4 {
font-size: 1.3125rem; // 21px
font-size: 1.5rem; // 24px
margin-bottom: 24px;
}