Merge branch 'master' of projekte.fagott.pw:grilist

2 files changed, 4 insertions, 4 deletions

diff --git a/views/includes/card.html b/views/includes/card.html
index a96cb49..41ad2ce 100644
--- a/views/includes/card.html
+++ b/views/includes/card.html
@@ -1,6 +1,6 @@
 {{ define "card" }}
 {{ $card := . }}
-<div class="col s12 m6 l4">
+<div class="flex-card">
         <div class="card white">
                 <div class="card-content black-text">
                         {{ if $card.Image }}
@@ -8,10 +8,10 @@
                                 <img class="circle responsive-img card-image" src="{{ $card.Image }}" />
                         </div>
                         {{ end }}
-                        <span class="card-title">{{ $card.Title | html }}</span>
+                        <span class="card-title valign-wrapper">{{ $card.Title | html }}{{ if $card.SubTitle }}{{ $card.SubTitle | html }}{{ end }}</span>
                         <p>{{ $card.Description | html }}</p>
                 </div>
-                <div class="card-action">
+                <div class="card-action pull-down">
                         {{ range $action := $card.Actions }}
                                 {{ if $action.Disabled }}
                                         <span>{{ $action.Name | html }}</span>
diff --git a/views/pages/dashboard.html b/views/pages/dashboard.html
index 589b0fd..2eacaba 100644
--- a/views/pages/dashboard.html
+++ b/views/pages/dashboard.html
@@ -11,7 +11,7 @@
                         <div class="row">
                         {{ range $category := .categories }}
                                 <h2>{{ $category.Title }}</h2>
-                                <div class="row">
+                                <div class="flex">
                                 {{ range $category.Cards }}
                                         {{ template "card" . }}
                                 {{ end }}