fediport/pixelfed
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases 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
parent 7f6337dd97 e0fa8327b8
commit 64264f0948
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/css/app.css vendored
View file

File diff suppressed because one or more lines are too long

2
public/css/appdark.css vendored
View file

File diff suppressed because one or more lines are too long

2
public/css/landing.css vendored
View file

File diff suppressed because one or more lines are too long

2
public/js/compose.js vendored
View file

File diff suppressed because one or more lines are too long

8
public/mix-manifest.json
View file

@ -4,14 +4,14 @@
"/js/ace.js": "/js/ace.js?id=4a28163d5fd63e64d6af",
"/js/activity.js": "/js/activity.js?id=a414018a6c03ddd2a492",
"/js/app.js": "/js/app.js?id=2f034c84c06dbb3e511d",
"/css/app.css": "/css/app.css?id=56642158bfe8b6469355",
"/css/appdark.css": "/css/appdark.css?id=1b13fc163fa4deb9233f",
"/css/landing.css": "/css/landing.css?id=31de3e75de8690f7ece5",
"/css/app.css": "/css/app.css?id=73af4bf8ced6e3c406ee",
"/css/appdark.css": "/css/appdark.css?id=59ce4dd28451ffddf15a",
"/css/landing.css": "/css/landing.css?id=385cadd3ef179fae26cc",
"/css/quill.css": "/css/quill.css?id=81604d62610b0dbffad6",
"/js/collectioncompose.js": "/js/collectioncompose.js?id=a117b4e0b1d2fd859de5",
"/js/collections.js": "/js/collections.js?id=93bac411f11eb701648f",
"/js/components.js": "/js/components.js?id=7e4df37c02f12db5ef96",
"/js/compose.js": "/js/compose.js?id=f3e4cdf34dfdd8331714",
"/js/compose.js": "/js/compose.js?id=a51bfcdbfaee53cf1eda",
"/js/developers.js": "/js/developers.js?id=a395f12c52bb0eada6ab",
"/js/discover.js": "/js/discover.js?id=f8da29f2b16ae5be93fd",
"/js/hashtag.js": "/js/hashtag.js?id=b4ffe6499880acf0591c",

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

@ -73,15 +73,15 @@
</ul>
</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 class="form-group">
<input type="text" class="form-control" v-model="media[carouselCursor].alt" placeholder="Optional image description">
</div>
<!-- <div class="form-group">
<div class="form-group">
<input type="text" class="form-control" v-model="media[carouselCursor].license" placeholder="Optional media license">
</div> -->
</div>
</div>
<!-- <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>

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

@ -543,12 +543,12 @@ details summary::-webkit-details-marker {
padding: 3px 8px;
color: #fff;
text-align: center;
background-color: #dc3545;
/*background-color: #dc3545;*/
border-radius: .25rem;
}
.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 {