chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

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

Frontend ui refactor
This commit is contained in:
daniel 2019-06-16 17:08:35 -06:00 committed by GitHub
parent 1fec262a8c d2e14bda7b
commit 281343bde6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/compose.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/search.js vendored
View File

File diff suppressed because one or more lines are too long

4
public/mix-manifest.json
View File

@ -7,12 +7,12 @@
"/css/appdark.css": "/css/appdark.css?id=34cd81dd9c8bc68cfd51", "/css/appdark.css": "/css/appdark.css?id=34cd81dd9c8bc68cfd51",
"/css/landing.css": "/css/landing.css?id=1ea686af4c64df5018fc", "/css/landing.css": "/css/landing.css?id=1ea686af4c64df5018fc",
"/js/components.js": "/js/components.js?id=97c7f6876bb4e5c9ffd8", "/js/components.js": "/js/components.js?id=97c7f6876bb4e5c9ffd8",
"/js/compose.js": "/js/compose.js?id=3e59092826085624eec5", "/js/compose.js": "/js/compose.js?id=7077e64f269d90f9543b",
"/js/developers.js": "/js/developers.js?id=4dba6abdc3ae8ec8c222", "/js/developers.js": "/js/developers.js?id=4dba6abdc3ae8ec8c222",
"/js/discover.js": "/js/discover.js?id=b9b5d3d054cadf63aed2", "/js/discover.js": "/js/discover.js?id=b9b5d3d054cadf63aed2",
"/js/loops.js": "/js/loops.js?id=d5c7e9d0d6a44553dd0d", "/js/loops.js": "/js/loops.js?id=d5c7e9d0d6a44553dd0d",
"/js/profile.js": "/js/profile.js?id=def2cef049018dddfa02", "/js/profile.js": "/js/profile.js?id=def2cef049018dddfa02",
"/js/search.js": "/js/search.js?id=17415228e1fb52528d0c", "/js/search.js": "/js/search.js?id=95c893b755e132a1d7e1",
"/js/status.js": "/js/status.js?id=9cfc5c6a05070fad66e8", "/js/status.js": "/js/status.js?id=9cfc5c6a05070fad66e8",
"/js/timeline.js": "/js/timeline.js?id=c8346c0cf7265df6196e" "/js/timeline.js": "/js/timeline.js?id=c8346c0cf7265df6196e"
} }

10
resources/assets/js/components/ComposeModal.vue
View File

@ -249,9 +249,11 @@
color: #fff; color: #fff;
font-weight: bold; font-weight: bold;
} }
.media-drawer-filters::-webkit-scrollbar { @media (hover: none) and (pointer: coarse) {
display: none; .media-drawer-filters::-webkit-scrollbar {
} display: none;
}
}
</style> </style>
<script type="text/javascript"> <script type="text/javascript">
export default { export default {
@ -544,4 +546,4 @@ export default {
} }
} }
} }
</script> </script>

2
resources/assets/js/components/SearchResults.vue
View File

@ -69,7 +69,7 @@
<p class="col-12 font-weight-bold text-muted">Statuses</p> <p class="col-12 font-weight-bold text-muted">Statuses</p>
<a v-for="(status, index) in results.statuses" class="col-12 col-md-4 mb-3" style="text-decoration: none;" :href="status.url"> <a v-for="(status, index) in results.statuses" class="col-12 col-md-4 mb-3" style="text-decoration: none;" :href="status.url">
<div class="card"> <div class="card">
<img class="card-img-top img-fluid" :src="status.thumb" style="height:180px;"> <img class="card-img-top img-fluid" :src="status.thumb">
<div class="card-body text-center "> <div class="card-body text-center ">
<p class="mb-0 small text-truncate font-weight-bold text-muted" v-html="status.value"> <p class="mb-0 small text-truncate font-weight-bold text-muted" v-html="status.value">
</p> </p>

2
resources/views/admin/profiles/home.blade.php
View File

@ -56,7 +56,7 @@
<span class="d-inline-flex"> <span class="d-inline-flex">
<select class="custom-select custom-select-sm font-weight-bold bulk-action"> <select class="custom-select custom-select-sm font-weight-bold bulk-action">
<option selected disabled="">Select Bulk Action</option> <option selected disabled="">Select Bulk Action</option>
<option value="1" disabled="">Review (Coming in v0.9.0)</option> <option value="1" disabled="">Review (Coming in a future version)</option>
<option value="2">Add C/W</option> <option value="2">Add C/W</option>
<option value="3">Unlist from timelines</option> <option value="3">Unlist from timelines</option>
<option value="4">No Autolinking</option> <option value="4">No Autolinking</option>

2
resources/views/admin/settings/storage.blade.php
View File

@ -9,7 +9,7 @@
</div> </div>
<hr> <hr>
<p class="alert alert-warning"> <p class="alert alert-warning">
<strong>Feature Unavailable:</strong> This feature will be released in v0.9.0. <strong>Feature Unavailable:</strong> This feature will be released in a future version.
</p> </p>
@endsection @endsection