Skip to content

Commit

Permalink
fixed conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndersonCeci
AndersonCeci committed Jun 11, 2024
1 parent 2ef2822 commit 0c8eb59
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 60 deletions.
8 changes: 3 additions & 5 deletions src/app/home/home.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -405,10 +405,6 @@
justify-content: space-between;
}

.history-card-close-button {
padding: 0.1rem 0.3rem;
}

.blur-marking-button {
padding: 0.1rem 0.3rem;
}
Expand Down Expand Up @@ -556,6 +552,9 @@
}

.writing {
display: -webkit-box;
-webkit-line-clamp: 4;
-webkit-box-orient: vertical;
box-shadow: 0 0 10px rgba(216, 216, 216, 0.6);
border-radius: 5px;
padding: 5px;
Expand Down Expand Up @@ -645,7 +644,6 @@
width: 40px;
height: 23px;
float: right;
right: 53px;
}

.switch input {
Expand Down
110 changes: 55 additions & 55 deletions src/app/home/home.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@
<span
class="editor-placeholder-text"
data-test="editor-placeholder-text"
>Shkruaj këtu ose </span
>Shkruaj këtu ose </span
><label
for="file-upload-input"
class="editor-placeholder-upload"
data-test="editor-placeholder-upload"
>ngarko një dokument</label
>
for="file-upload-input"
class="editor-placeholder-upload"
data-test="editor-placeholder-upload"
>ngarko një dokument</label
>
</div>
<div *ngIf="editorHasText()">
<button
Expand Down Expand Up @@ -81,12 +81,12 @@
characterCount >= MAX_EDITOR_CHARACTERS
}"
data-test="characters-words-markings"
><ng-container
*ngIf="characterCount >= MAX_EDITOR_CHARACTERS"
>{{
MAX_EDITOR_CHARACTERS_MESSAGE
}}&nbsp;–&nbsp;</ng-container
>
><ng-container
*ngIf="characterCount >= MAX_EDITOR_CHARACTERS"
>{{
MAX_EDITOR_CHARACTERS_MESSAGE
}}&nbsp;–&nbsp;</ng-container
>
{{ characterCount }}&nbsp;{{
characterCount === 1 ? "karakter" : "karaktere"
}}&comma;&nbsp;{{ wordCount }}&nbsp;fjalë&comma;&nbsp;{{
Expand All @@ -101,29 +101,29 @@
}}</span
>
<span
><button
id="copy-to-clipboard-button"
(click)="copyToClipboard()"
class="bi bi-clipboard editor-footer-button"
[ngClass]="{
><button
id="copy-to-clipboard-button"
(click)="copyToClipboard()"
class="bi bi-clipboard editor-footer-button"
[ngClass]="{
'clipboard-button-dark-mode':
darkModeService.isDarkMode
}"
title="kopjo shkrimin"
data-test="copy-to-clipboard-button"
></button
>&nbsp;&nbsp;&nbsp;&nbsp;<button
type="button"
data-bs-toggle="modal"
data-bs-target="#writingsHistoryModal"
title="trego historikun e shkrimeve"
class="bi bi-clock-history editor-footer-button"
[ngClass]="{
title="kopjo shkrimin"
data-test="copy-to-clipboard-button"
></button
>&nbsp;&nbsp;&nbsp;&nbsp;<button
type="button"
data-bs-toggle="modal"
data-bs-target="#writingsHistoryModal"
title="trego historikun e shkrimeve"
class="bi bi-clock-history editor-footer-button"
[ngClass]="{
'writings-history-button-dark-mode':
darkModeService.isDarkMode
}"
data-test="writings-history-button"
></button
data-test="writings-history-button"
></button
></span>
</div>
</div>
Expand Down Expand Up @@ -151,14 +151,14 @@
<!-- TODO put into a method -->
<div class="card typo-marking-card border-secondary">
<div
class="card-header typo-marking-card-header second-header"
class="card-header second-header"
[ngClass]="{
'second-header-dark-mode': darkModeService.isDarkMode
}"
>
<div>
<span class="typo-marking-header template-marking-span"
>gabime shkrimi</span
>gabime shkrimi</span
>
</div>
</div>
Expand All @@ -172,7 +172,7 @@
>
<b>shkrim pa gabime</b> -
<span
>shenjime për fjalë të shkruara gabim, gabime
>shenjime për fjalë të shkruara gabim, gabime
fonetikore, shenja pikësimi</span
>
</li>
Expand All @@ -188,7 +188,7 @@
<div>
<span
class="loanword-marking-header template-marking-span"
>sugjerime huazimesh</span
>sugjerime huazimesh</span
>
</div>
</div>
Expand All @@ -202,7 +202,7 @@
>
<b>pa huazime për tani</b> -
<span
>shenjime për huazime me origjinë italiane, angleze,
>shenjime për huazime me origjinë italiane, angleze,
sllave, gjermane, otomane, greke</span
>
</li>
Expand All @@ -218,7 +218,7 @@
<div>
<span
class="stylistic-marking-header template-marking-span"
>shenjime stilistike</span
>shenjime stilistike</span
>
</div>
</div>
Expand All @@ -245,7 +245,7 @@
<div>
<span
class="grammatical-marking-header template-marking-span"
>shenjime gabimesh gramatikore</span
>shenjime gabimesh gramatikore</span
>
</div>
</div>
Expand All @@ -260,7 +260,7 @@
<i class="bi bi-stars grammatical-marking-stars"></i>
<b>sipas rregullave gramatikore</b> -
<span
>shenjime për gabime gramatikore të llojeve të
>shenjime për gabime gramatikore të llojeve të
ndryshme</span
>
</li>
Expand Down Expand Up @@ -295,7 +295,7 @@
marking.type
}}-marking-header"
data-test="marking-span"
>{{ getTextOfMarking(i) }}
>{{ getTextOfMarking(i) }}
</span>
</div>
<div>
Expand Down Expand Up @@ -405,7 +405,7 @@
]?.type
}}-marking-header"
data-test="highlighted-marking"
>{{
>{{
getTextOfMarking(highlightedMarkingIndex)
}}</span
>
Expand Down Expand Up @@ -439,16 +439,16 @@
class="bi bi-stars"
></i>
<b>{{
processedText?.markings?.[
highlightedMarkingIndex
]?.subtype
}}</b>
processedText?.markings?.[
highlightedMarkingIndex
]?.subtype
}}</b>
-
<span>{{
processedText?.markings?.[
highlightedMarkingIndex
]?.description
}}</span>
processedText?.markings?.[
highlightedMarkingIndex
]?.description
}}</span>
</div>
<div
*ngIf="
Expand Down Expand Up @@ -621,6 +621,12 @@ <h5 id="writingsHistoryModalLabel" class="modal-title">
data-test="writings-history-modal-body"
>
<div class="form-check form-switch history-body">
<!-- TODO if user changes call a method that changes it in the service and invalidates-->
<label
class="form-check-label"
for="flex-switch-check-checked"
>Përdor Historikun e Shkrimeve</label
>
<label class="switch">
<input
(click)="toggleStoringOfWritings()"
Expand All @@ -632,15 +638,9 @@ <h5 id="writingsHistoryModalLabel" class="modal-title">
data-test="flex-switch-check-checked"
></span>
</label>
<!-- TODO if user changes call a method that changes it in the service and invalidates-->
<label
class="form-check-label"
for="flex-switch-check-checked"
>Përdor Historikun e Shkrimeve</label
>
<div>
<span class="history-deactivation-message"
>çaktivizimi i historikut të shkrimeve do të fshijë
>çaktivizimi i historikut të shkrimeve do të fshijë
shkrimet ekzistuese</span
>
</div>
Expand Down Expand Up @@ -674,7 +674,7 @@ <h5 id="writingsHistoryModalLabel" class="modal-title">
<button
id="close-writings-history-modal-button"
type="button"
class="btn btn-secondary history-card-close-button"
class="btn btn-secondary"
data-bs-dismiss="modal"
data-test="close-writings-history-modal-button"
>
Expand Down

0 comments on commit 0c8eb59

Please sign in to comment.