UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-12 17:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1539 from pixelfed/frontend-ui-refactor

Browse source 
Update ComposeModal.vue, fix media options
This commit is contained in:
daniel 2019-07-21 20:28:22 -06:00 committed by GitHub
commit 64264f0948
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/css/app.css vendored
View file

Binary file not shown.

BIN
public/css/appdark.css vendored
View file

Binary file not shown.

BIN
public/css/landing.css vendored
View file

Binary file not shown.

BIN
public/js/compose.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

6
resources/assets/js/components/ComposeModal.vue
View file

@ -73,15 +73,15 @@
</ul> </ul>
</div> </div>
</div> </div>
<div v-if="ids.length > 0 && ['Image', 'Video'].indexOf(media[carouselCursor].type)" class="bg-lighter p-2 row"> <div v-if="ids.length > 0 && ['Image', 'Video'].indexOf(media[carouselCursor].type) != -1" class="bg-lighter p-2 row">
<div v-if="media[carouselCursor].type == 'Image'" class="col-12"> <div v-if="media[carouselCursor].type == 'Image'" class="col-12">
<div class="form-group"> <div class="form-group">
<input type="text" class="form-control" v-model="media[carouselCursor].alt" placeholder="Optional image description"> <input type="text" class="form-control" v-model="media[carouselCursor].alt" placeholder="Optional image description">
</div> </div>
<!-- <div class="form-group"> <div class="form-group">
<input type="text" class="form-control" v-model="media[carouselCursor].license" placeholder="Optional media license"> <input type="text" class="form-control" v-model="media[carouselCursor].license" placeholder="Optional media license">
</div> --> </div>
</div> </div>
<!-- <div class="col-6 pt-2"> <!-- <div class="col-6 pt-2">
<button class="btn btn-outline-secondary btn-sm mr-1"><i class="fas fa-map-marker-alt"></i></button> <button class="btn btn-outline-secondary btn-sm mr-1"><i class="fas fa-map-marker-alt"></i></button>

4
resources/assets/sass/custom.scss vendored
View file

@ -543,12 +543,12 @@ details summary::-webkit-details-marker {
padding: 3px 8px; padding: 3px 8px;
color: #fff; color: #fff;
text-align: center; text-align: center;
background-color: #dc3545; /*background-color: #dc3545;*/
border-radius: .25rem; border-radius: .25rem;
} }
.tooltip-notification .tooltip.bs-tooltip-auto[x-placement^=top] .arrow::before, .tooltip.bs-tooltip-top .arrow::before { .tooltip-notification .tooltip.bs-tooltip-auto[x-placement^=top] .arrow::before, .tooltip.bs-tooltip-top .arrow::before {
border-top-color: #dc3545; /*border-top-color: #dc3545; */
} }
.carousel-control-prev-icon, .carousel-control-next-icon { .carousel-control-prev-icon, .carousel-control-next-icon {