Skip to content

Commit

Permalink
Merge branch 'lydias-bugs-fixing' of https://github.com/fhstp/angehoe…
Browse files Browse the repository at this point in the history
…rigendialog into bugfixes_Release
  • Loading branch information
doomsayer2 committed Dec 28, 2020
2 parents d92dd69 + bdd8137 commit 9af9faf
Show file tree
Hide file tree
Showing 10 changed files with 44 additions and 39 deletions.
12 changes: 6 additions & 6 deletions src/assets/icons/back.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 8 additions & 5 deletions src/assets/icons/start.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion src/assets/styles/base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ input[type=radio] {
border-radius: 50%;
border: 2px;
border-style: solid;
//background-color: green;

.an-field__subfields &,
.an-checkboxes_activefields &,
Expand Down
1 change: 0 additions & 1 deletion src/components/fields/AnText.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ export default {
border-color: $color-theme-darkgrey;
border-width: 1px;
border-style: solid;
border-color: black;
border-radius: none;
width: 100%;
line-height: 1.5;
Expand Down
21 changes: 15 additions & 6 deletions src/components/note/AnNote.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,20 @@
<h2 class="an-note__heading">Meine Notizen</h2>
</div>
<div class="an-note__controls">
<span>Mögliche Formatierungen</span>
<span>Sie können Ihre Notizen bei Bedarf selbst formatieren. </span>
<ul>
<li>
**Text** oder __Text__ verwenden für
<strong>Text (fett)</strong>
- Um
<strong>Text bold</strong>
darzustellen versehen Sie die gewünschten Passagen bitte mit
__Text__
</li>
<li>
- Um
<i>Text kursiv</i>
darzustellen versehen Sie die gewünschten Passagen bitte mit
_Text_
</li>
<li>*Text* oder _Text_ verwenden für <i>Text (kursiv)</i></li>
</ul>
</div>
<hr />
Expand Down Expand Up @@ -362,7 +369,7 @@ hr {
}
&__controls {
font-size: 0.6em;
font-size: 0.7em;
color: $color-theme-darkgrey;
margin-left: 5px;
ul {
Expand All @@ -382,7 +389,7 @@ hr {
width: 100%;
outline: none;
display: block;
font-size: 1.45rem;
font-size: 1.3rem;
line-height: 1.5;
overflow: hidden;
background-color: white;
Expand Down Expand Up @@ -430,6 +437,8 @@ hr {
}
&__action {
background-color: white;
border-color: none;
vertical-align: middle;
margin: 0;
width: 100%;
Expand Down
1 change: 0 additions & 1 deletion src/components/ui/AnAccordionItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ export default {
padding: $spacer * 2;
font-size: 1.2rem;
color: black;
//fill: pink;
text-decoration: none;
cursor: pointer;
border-width: 1px;
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/AnStepper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ $icon_width: 50px;
background-color: #ffbe1b;
box-shadow: 0 0 20px 0 $color-theme-shadow;
& p {
color: $color-theme-darkred;
color: black;
}
}
Expand Down
12 changes: 3 additions & 9 deletions src/views/Form.vue
Original file line number Diff line number Diff line change
Expand Up @@ -365,21 +365,17 @@ export default {
margin-left: auto;
width: 15vh;
height: 15vh;
border: none;
box-shadow: 0 0 0 0 #ffd700;
transition: all 0.1s ease-in-out;
border-radius: 50%;
padding: 3px;
background-color: $color-theme-yellow;
outline: none;
font-weight: bold;
font-size: 0.9em;
color: $color-theme-darkgrey;
text-align: center;
// background-image: url(https://s3-us-west-2.amazonaws.com/s.cdpn.io/173024/jonathanlarradet_copy.png);
// background-size: cover;
// background-repeat: no-repeat;
cursor: pointer;
-webkit-animation: pulse 2.4s infinite cubic-bezier(0.66, 0, 0, 1);
-moz-animation: pulse 2.4s infinite cubic-bezier(0.66, 0, 0, 1);
Expand All @@ -392,10 +388,8 @@ export default {
-moz-animation: none;
-ms-animation: none;
animation: none;
border: 2px solid $color-theme-lightgrey;
box-shadow: 0 2px 5px 0 #666;
background: #ffbe1b;
box-shadow: 0 6px 14px 0 #666;
transform: scale(1.05);
}
&__further {
Expand Down
19 changes: 11 additions & 8 deletions src/views/Start.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,23 +56,22 @@
<button class="btn an-start__startbutton" @click="startNew">
<IconStart class="an-start__icon-start" />
</button>
<div class="an-start__label_button_start">
<button class="an-start__label_button_start" @click="startNew">
Start
</div>
</button>
<div class="an-start__space"></div>
<router-link
:to="{ name: 'Fragebogen' }"
class="btn an-start__previousbutton"
>
<IconBack class="an-start__icon-back" />
<div class="an-start__label_button_previous">
Vorherigen Fragebogen laden
</div>
</router-link>
<div class="an-start__label_button_previous">
Vorherigen Fragebogen laden
</div>
</template>
</div>
</div>

<router-link class="an-start__links" to="/legal"
>Impressum und Datenschutz</router-link
>
Expand Down Expand Up @@ -204,7 +203,9 @@ export default {
}
&__label_button_start {
width: 30px;
width: 50px;
background-color: white;
border: none;
font-family: 'Open Sans', sans-serif;
font-weight: bold;
font-size: 1rem;
Expand All @@ -216,9 +217,11 @@ export default {
padding-left: 7px;
padding-bottom: 10px;
position: relative;
cursor: pointer;
}
&__icon-start {
fill: $color-theme-yellow;
height: 100%;
position: relative;
left: 16.3em;
Expand Down Expand Up @@ -257,7 +260,7 @@ export default {
color: #000;
text-align: left;
margin: 10px;
padding-top: 82px;
padding-top: 10px;
padding-left: 6px;
padding-bottom: 10px;
position: absolute;
Expand Down
1 change: 0 additions & 1 deletion src/views/VisualisationN.vue
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,6 @@ export default {
display: flex;
align-items: center;
justify-content: space-between;
position: fixed;
bottom: 2vh;
right: 2vh;
Expand Down

0 comments on commit 9af9faf

Please sign in to comment.