Merge branch 'v2'

This commit is contained in:
ksamuel 2020-08-15 16:30:26 +02:00
commit ea3ee454b6
2 changed files with 6 additions and 4 deletions

View File

@ -626,6 +626,7 @@ nav ul li a:hover {
max-width: 120px;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
}
}

View File

@ -93,7 +93,7 @@
<div class="paste-options-res">
<div class="btn-group">
<span class="input-group-text">Tip it with<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18"
<span class="input-group-text">Tip it<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18"
viewBox="0 0 24 24">
<path
d="M12 2c5.514 0 10 4.486 10 10s-4.486 10-10 10-10-4.486-10-10 4.486-10 10-10zm0-2c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm0 18v-1.511h-.5v1.511h-1v-1.511h-2.484l.25-1.489h.539c.442 0 .695-.425.695-.854v-4.444c0-.416-.242-.702-.683-.702h-.817v-1.5h2.5v-1.5h1v1.5h.5v-1.5h1v1.526c2.158.073 3.012.891 3.257 1.812.29 1.09-.429 2.005-1.046 2.228.75.192 1.789.746 1.789 2.026 0 1.742-1.344 2.908-4 2.908v1.5h-1zm-.5-5.503v2.503c1.984 0 3.344-.188 3.344-1.258 0-1.148-1.469-1.245-3.344-1.245zm0-.997c1.105 0 2.789-.078 2.789-1.25 0-1-1.039-1.25-2.789-1.25v2.5z"
@ -111,8 +111,10 @@
<div class="d-flex justify-content-between down">
<div v-if="currentPaste.ownerKey">
<button class="btn btn-secondary" @click.prevent="handleDeletePaste()">Delete Paste</button>
<div>
<div v-if="currentPaste.ownerKey">
<button class="btn btn-secondary" @click.prevent="handleDeletePaste()">Delete Paste</button>
</div>
</div>
<div>
<span class="paste-option btn-group responsive-icons">
@ -211,7 +213,6 @@
<div class="d-flex justify-content-between" v-if="displayBottomToolBar">>
<div>
<label class="col-form-label">&nbsp;</label>
<div class="file-upload">
<button type="button" class="btn btn-info" @click.prevent="handleCancelClone()">Cancel clone</button>
</div>