aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhakabahitoyo <hakabahitoyo@example.com>2018-09-03 15:57:22 +0900
committerhakabahitoyo <hakabahitoyo@example.com>2018-09-03 15:57:22 +0900
commit38b683b30cd8ffd2fc4ab444f1a4690dc1ed3808 (patch)
tree0b74e691626a4c5c5136abffa19589f8ac6a6522 /src
parenta99869146f000f1c3f2433184e2b7d7b1ba4bb3b (diff)
update
Diffstat (limited to 'src')
-rw-r--r--src/App.js4
-rw-r--r--src/App.vue2
-rw-r--r--src/components/features_panel/features_panel.vue7
3 files changed, 8 insertions, 5 deletions
diff --git a/src/App.js b/src/App.js
index bdd97b85..be6548f3 100644
--- a/src/App.js
+++ b/src/App.js
@@ -2,8 +2,8 @@ import UserPanel from './components/user_panel/user_panel.vue'
import NavPanel from './components/nav_panel/nav_panel.vue'
import Notifications from './components/notifications/notifications.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 FeaturesPanel from './components/features_panel/features_panel.vue'
import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_panel.vue'
import ChatPanel from './components/chat_panel/chat_panel.vue'
@@ -14,8 +14,8 @@ export default {
NavPanel,
Notifications,
UserFinder,
- FeaturesPanel,
InstanceSpecificPanel,
+ FeaturesPanel,
WhoToFollowPanel,
ChatPanel
},
diff --git a/src/App.vue b/src/App.vue
index 8480d1b6..bfe1f760 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,8 +27,8 @@
<div class="sidebar">
<user-panel></user-panel>
<nav-panel></nav-panel>
- <features-panel></features-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>
<notifications v-if="currentUser"></notifications>
</div>
diff --git a/src/components/features_panel/features_panel.vue b/src/components/features_panel/features_panel.vue
index 92fdb1ff..5ec4d255 100644
--- a/src/components/features_panel/features_panel.vue
+++ b/src/components/features_panel/features_panel.vue
@@ -6,13 +6,13 @@
Features
</div>
</div>
- <div class="panel-body features">
+ <div class="panel-body features-panel">
<ul>
<li v-if="mediaProxy">Media proxy</li>
<li v-if="whoToFollow">Who to follow</li>
<li v-if="scopeOptions">Scope options</li>
<li v-if="formattingOptions">Formatting options</li>
- <li>Text limit={{textlimit}}</li>
+ <li>Text limit = {{textlimit}}</li>
</ul>
</div>
</div>
@@ -22,4 +22,7 @@
<script src="./features_panel.js" ></script>
<style lang="scss">
+ .features-panel li {
+ line-height: 24px;
+ }
</style>