Merge branch 'master' into update-tailwind

This commit is contained in:
Oliver Davies 2019-03-14 17:55:34 +00:00
commit 9c6c432eff
4 changed files with 6 additions and 6 deletions

View file

@ -1,5 +1,5 @@
<template>
<div class="w-auto lg:w-56 bg-grey-3 text-grey-6 antialiased fixed pin-l h-full overflow-y-scroll z-30 -mt-2px">
<div class="w-auto lg:w-56 bg-grey-light text-grey-darker antialiased fixed pin-l h-full overflow-y-scroll z-30">
<div>
<ul class="list-reset">
<li v-for="link in links" :key="link.title">

View file

@ -51,7 +51,7 @@
</div>
</div>
<sidebar :links="[
<sidebar class="sm:-mt-2px" :links="[
{ title: 'All', icon: 'alpha__grid', active: true, disabled: false },
{ title: 'Starred', icon: 'state__starred', active: false, disabled: false },
{ title: 'Recents', icon: 'objects__recent', active: false, disabled: false },

View file

@ -85,7 +85,7 @@
<div class="bg-white px-4 py-6">
<div class="mb-6 relative">
<div class="text-xs mb-1">Git URL</div>
<div class="border border-grey-4-5 rounded p-3">{{ gitUrl }}</div>
<div class="border border-grey-dark rounded p-3 truncate">{{ gitUrl }}</div>
<div class="absolute pin-t pin-r">
<button type="button" class="flex items-center text-xs text-blue-3 hover:underline focus:underline">
<svg class="h-3 w-3 fill-current mr-1" role="presentation"><use xlink:href="/img/icons.symbol.svg#actions__copy"></use></svg>
@ -96,7 +96,7 @@
<div class="mb-6 relative">
<div class="text-xs mb-1">SSH URL</div>
<div class="border border-grey-4-5 rounded p-3">{{ sshUrl }}</div>
<div class="border border-grey-dark rounded p-3 truncate">{{ sshUrl }}</div>
<div class="absolute pin-t pin-r">
<button type="button" class="flex items-center text-xs text-blue-3 hover:underline focus:underline">
<svg class="h-3 w-3 fill-current mr-1" role="presentation"><use xlink:href="/img/icons.symbol.svg#actions__copy"></use></svg>
@ -132,7 +132,7 @@
</div>
</div>
<sidebar :links="[
<sidebar class="-mt-2px" :links="[
{ title: 'Overview', icon: 'sections__applications', active: true, disabled: false },
{ title: 'Stack Metrics', icon: 'sections__activity', active: false, disabled: false },
{ title: 'Servers', icon: 'alpha__server', active: false, disabled: false },

View file

@ -62,7 +62,7 @@
<task-log :tasks="application.tasks" v-if="application.tasks[0]"></task-log>
</div>
<sidebar :links="[
<sidebar class="-mt-2px" :links="[
{ title: 'Environments', icon: 'alpha__grid', active: true, disabled: false },
{ title: 'Product Keys', icon: 'locations__keys', active: false, disabled: true },
{ title: 'Security', icon: 'alpha__security', active: false, disabled: true },