This commit is contained in:
hakabahitoyo 2018-09-03 15:57:22 +09:00
parent a99869146f
commit 38b683b30c
3 changed files with 8 additions and 5 deletions

View File

@ -2,8 +2,8 @@ import UserPanel from './components/user_panel/user_panel.vue'
import NavPanel from './components/nav_panel/nav_panel.vue' import NavPanel from './components/nav_panel/nav_panel.vue'
import Notifications from './components/notifications/notifications.vue' import Notifications from './components/notifications/notifications.vue'
import UserFinder from './components/user_finder/user_finder.vue' import UserFinder from './components/user_finder/user_finder.vue'
import FeaturesPanel from './components/features_panel/features_panel.vue'
import InstanceSpecificPanel from './components/instance_specific_panel/instance_specific_panel.vue' import InstanceSpecificPanel from './components/instance_specific_panel/instance_specific_panel.vue'
import FeaturesPanel from './components/features_panel/features_panel.vue'
import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_panel.vue' import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_panel.vue'
import ChatPanel from './components/chat_panel/chat_panel.vue' import ChatPanel from './components/chat_panel/chat_panel.vue'
@ -14,8 +14,8 @@ export default {
NavPanel, NavPanel,
Notifications, Notifications,
UserFinder, UserFinder,
FeaturesPanel,
InstanceSpecificPanel, InstanceSpecificPanel,
FeaturesPanel,
WhoToFollowPanel, WhoToFollowPanel,
ChatPanel ChatPanel
}, },

View File

@ -27,8 +27,8 @@
<div class="sidebar"> <div class="sidebar">
<user-panel></user-panel> <user-panel></user-panel>
<nav-panel></nav-panel> <nav-panel></nav-panel>
<features-panel></features-panel>
<instance-specific-panel v-if="showInstanceSpecificPanel"></instance-specific-panel> <instance-specific-panel v-if="showInstanceSpecificPanel"></instance-specific-panel>
<features-panel></features-panel>
<who-to-follow-panel v-if="currentUser && suggestionsEnabled"></who-to-follow-panel> <who-to-follow-panel v-if="currentUser && suggestionsEnabled"></who-to-follow-panel>
<notifications v-if="currentUser"></notifications> <notifications v-if="currentUser"></notifications>
</div> </div>

View File

@ -6,13 +6,13 @@
Features Features
</div> </div>
</div> </div>
<div class="panel-body features"> <div class="panel-body features-panel">
<ul> <ul>
<li v-if="mediaProxy">Media proxy</li> <li v-if="mediaProxy">Media proxy</li>
<li v-if="whoToFollow">Who to follow</li> <li v-if="whoToFollow">Who to follow</li>
<li v-if="scopeOptions">Scope options</li> <li v-if="scopeOptions">Scope options</li>
<li v-if="formattingOptions">Formatting options</li> <li v-if="formattingOptions">Formatting options</li>
<li>Text limit={{textlimit}}</li> <li>Text limit = {{textlimit}}</li>
</ul> </ul>
</div> </div>
</div> </div>
@ -22,4 +22,7 @@
<script src="./features_panel.js" ></script> <script src="./features_panel.js" ></script>
<style lang="scss"> <style lang="scss">
.features-panel li {
line-height: 24px;
}
</style> </style>