diff options
| author | shpuld <shp@cock.li> | 2018-04-10 00:28:24 +0300 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2018-04-10 00:28:24 +0300 |
| commit | 8835c98529809033993b190847989f11b318cf97 (patch) | |
| tree | 9ee82d3bc3a14815288a95425a22abebc8533250 /src/App.vue | |
| parent | c214197cee192d9ae511d145d8e28cef8ae9a0d1 (diff) | |
| parent | 716e37d95cd463ede4a5fbe91e7170515719a0fe (diff) | |
Merge hj's css overhaul and fix conflicts
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/App.vue b/src/App.vue index 2a910bc0..051c601d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,6 +1,6 @@ <template> - <div id="app" v-bind:style="style" class="base02-background"> - <nav class='container base02-background base05' @click="scrollToTop()" id="nav"> + <div id="app" v-bind:style="style"> + <nav class='container' @click="scrollToTop()" id="nav"> <div class='inner-nav' :style="logoStyle"> <div class='item'> <router-link :to="{ name: 'root'}">{{sitename}}</router-link> @@ -14,8 +14,8 @@ </nav> <div class="container" id="content"> <div class="panel-switcher"> - <button @click="activatePanel('sidebar')" class="base02-background base05">Sidebar</button> - <button @click="activatePanel('timeline')" class="base02-background base05">Timeline</button> + <button @click="activatePanel('sidebar')">Sidebar</button> + <button @click="activatePanel('timeline')">Timeline</button> </div> <div class="sidebar-flexer" :class="{ 'mobile-hidden': mobileActivePanel != 'sidebar'}"> <div class="sidebar-bounds"> |