UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-23 15:01:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-02-21 21:17:42 -07:00 committed by GitHub
commit 95051d3f35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/js/timeline.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

12
resources/assets/js/components/Timeline.vue
View file

@ -206,11 +206,11 @@
<!-- <div class="custom-control custom-switch mb-3"> <!-- <div class="custom-control custom-switch mb-3">
<input type="checkbox" class="custom-control-input" id="mode-dark" v-on:click="modeDarkToggle()" v-model="modes.dark"> <input type="checkbox" class="custom-control-input" id="mode-dark" v-on:click="modeDarkToggle()" v-model="modes.dark">
<label class="custom-control-label font-weight-bold" for="mode-dark">Dark Mode</label> <label class="custom-control-label font-weight-bold" for="mode-dark">Dark Mode</label>
</div> --> </div>
<div class="custom-control custom-switch mb-3"> <div class="custom-control custom-switch mb-3">
<input type="checkbox" class="custom-control-input" id="mode-notify" v-on:click="modeNotifyToggle()" v-model="!modes.notify"> <input type="checkbox" class="custom-control-input" id="mode-notify" v-on:click="modeNotifyToggle()" v-model="!modes.notify">
<label class="custom-control-label font-weight-bold" for="mode-notify">Disable Notifications</label> <label class="custom-control-label font-weight-bold" for="mode-notify">Disable Notifications</label>
</div> </div> -->
<div class="custom-control custom-switch"> <div class="custom-control custom-switch">
<input type="checkbox" class="custom-control-input" id="mode-infinite" v-on:click="modeInfiniteToggle()" v-model="modes.infinite"> <input type="checkbox" class="custom-control-input" id="mode-infinite" v-on:click="modeInfiniteToggle()" v-model="modes.infinite">
<label class="custom-control-label font-weight-bold" for="mode-infinite">Enable Infinite Scroll</label> <label class="custom-control-label font-weight-bold" for="mode-infinite">Enable Infinite Scroll</label>
@ -341,15 +341,7 @@
mounted() { mounted() {
this.$nextTick(function () { this.$nextTick(function () {
$('[data-toggle="tooltip"]').tooltip() $('[data-toggle="tooltip"]').tooltip()
let cachedSettings = window.ls.get('pixelfed-classicui-settings');
if(cachedSettings.length && cachedSettings.hasOwnProperty('notify')) {
this.modes = cachedSettings;
} else {
window.ls.set('pixelfed-classicui-settings', this.modes);
}
if(cachedSettings.notify == true) {
this.fetchNotifications(); this.fetchNotifications();
}
}); });
}, },