merge conflict fix

Author: jbratcher

.gitignore

@@ -7,6 +7,10 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
+# package lock files
+package-lock.json
+yarn.lock
+
 # Runtime data
 pids
 *.pid
@@ -80,6 +84,7 @@ dist
 # IDE / Editor
 .idea
 .editorconfig
+.vscode
 
 # Service worker
 sw.*

README.md

@@ -1,8 +1,16 @@
-# Nuxt, Vuetify, & Netlify CMS Starter Kit
+# Nuxt, Vuetify, & Netlify CMS Starter
 
-A simple repo to add Vueity and blog functionality to [Nuxt & Netlify CMS Starter](https://github.com/renestalder/nuxt-netlify-cms-starter-template)
+Built on top of [Nuxt Netlify CMS Starter](https://github.com/xdesro/nuxt-netlify-cms-starter)
 
-A lot of the starter repos for **Nuxt x Netlify CMS** use a module like `nuxtent` or `nuxtdown` to manage flat file content. This project is meant to be a solution for those who don't mind doing a little more configuration to not have to rely on these dependencies.
+## How to use
+
+## Getting Started
+
+The quickest way to get started is with Netlify's hyper-convenient **one-click Deploy To Netlify**, which will automatically create an instance of this project on your GitHub account and deploy it instantly to Netlify.
+
+[![Deploy to Netlify](https://www.netlify.com/img/deploy/button.svg)](https://app.netlify.com/start/deploy?repository=https://github.com/jbratcher/nuxt-netlify-cms-starter-kit)
+
+Otherwise, you can follow these steps!
 
 1. Clone the repository locally and cd into the directory.
 
@@ -15,28 +23,28 @@ cd nuxt-netlify-cms-starter
 2. Install dependencies.
 
 ```bash
-npm install
+yarn install
 ```
 
 3. Run the project for local dev. This will start a hot-reloading server at `localhost:3000`.
 
 ```bash
-npm run dev
+yarn dev
 ```
 
 4. Build the app for server-side rendered deployment. See more about **Universal SSR** in the [Nuxt.js docs](https://nuxtjs.org/guide#server-rendered-universal-ssr-).
 
 ```bash
-npm run build
+yarn build
 
 # And to serve that deployment...
-npm run start
+yarn start
 ```
 
-5.  Generate a fully pre-rendered static site. See more [in the docs](https://nuxtjs.org/guide#static-generated-pre-rendering-).
+5. Generate a fully pre-rendered static site. See more [in the docs](https://nuxtjs.org/guide#static-generated-pre-rendering-).
 
 ```bash
-npm run generate
+yarn generate
 ```
 
 > This project was bootstrapped with `create-nuxt-app`. There are more detailed explanations of how everything works in the [Nuxt.js docs](https://nuxtjs.org).
@@ -45,7 +53,7 @@ npm run generate
 
 This project comes with Netlify CMS ready to rumble, and a basic blog configuration. To use Netlify CMS:
 
-### 🔏 Authenticating with Netlify Identity
+### Authenticating with Netlify Identity
 
 1. Deploy to Netlify at least once.
 2. Go to **Settings > Identity**, and select **Enable Identity service**.
@@ -61,8 +69,12 @@ This project comes with Netlify CMS ready to rumble, and a basic blog configurat
 
 #### To change netlify deploy url, run localStorage.removeItem("netlifySiteURL") in the browser console.
 
+<<<<<<< HEAD
 ### Use Netlify CMS Dashboard
+=======
+### Netlify CMS Dashboard
+>>>>>>> master
 
-1. In your browser, naviage to `localhost:3000/admin`.
-2. Login via your chosen method.
-3. You will be redirectd to the dashboard where you can create and manage posts
+1. In your browser, navigate to `localhost:3000/admin`.
+2. Login 
+3. From the dashboard, you can create, edit, and delete resources and resource types.

components/Logo.vue

@@ -1,18 +1,17 @@
 /* eslint-disable */
 <template>
   <!-- Links Wrapper -->
-  <v-list :class="listClass">
+  <v-list :class="`${listClass} py-0`" color="transparent" rounded>
     <!-- General links -->
     <v-list-item
       v-for="(item, i) in generalLinks"
       :key="i + `-${item.title}`"
       :to="item.to"
-      :class="listItemClass"
-      dark
+      :class="`${listItemClass} mb-0`"
       router
       exact
     >
-      <v-list-item-action>
+      <v-list-item-action v-if="item.icon" class="mr-2">
         <v-icon>{{ item.icon }}</v-icon>
       </v-list-item-action>
       <v-list-item-content>
@@ -46,5 +45,27 @@ export default {
 }
 </script>
 
-<style>
+<style lang="scss">
+.mobile {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-right: 0;
+  padding-top: 2rem;
+
+  .v-list-item {
+    margin: 1rem 0;
+    min-width: 12.5rem;
+
+    .v-list-item__title {
+      font-size: 1.67rem;
+    }
+  }
+}
+
+@media screen and (min-width: 600px) {
+  .v-list {
+    display: flex;
+  }
+}
 </style>