From 3bef65f114be52c57eff9b07ffd232c9f2c5164c Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sun, 18 Mar 2018 04:34:25 +0100
Subject: [PATCH] Fixed a minor issue
---
assets/sass/style.sass | 49 +++++++++++++++++++------------------
templates/image_detail.html | 8 +++---
2 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/assets/sass/style.sass b/assets/sass/style.sass
index 1c9e46c..ea497ac 100644
--- a/assets/sass/style.sass
+++ b/assets/sass/style.sass
@@ -186,35 +186,36 @@ form.upload
align-self: center
margin: 32px
- .actions
+ .sidebar
width: 250px
margin-left: 32px
- background: #333333
- border-radius: 4px
- box-shadow: 0 2px 4px rgba(0,0,0,0.4)
- display: flex
- flex-direction: row
-
- .delete-form, .update-form
+ .actions
+ background: #333333
+ border-radius: 4px
+ box-shadow: 0 2px 4px rgba(0,0,0,0.4)
display: flex
- flex-grow: 1
+ flex-direction: row
- input[type=submit]
- display: block
- background: #FFC107
- padding: 4px 16px
- border-radius: 2px
- box-shadow: 0 1px 2px rgba(0,0,0,0.1)
- border: none
- font-family: 'Lato', sans-serif
- font-size: 10pt
- line-height: 24px
- margin: 8px
+ .delete-form, .update-form
+ display: flex
flex-grow: 1
- cursor: pointer
- &:hover,&:focus
- background: #FFD54F
- box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2)
+
+ input[type=submit]
+ display: block
+ background: #FFC107
+ padding: 4px 16px
+ border-radius: 2px
+ box-shadow: 0 1px 2px rgba(0,0,0,0.1)
+ border: none
+ font-family: 'Lato', sans-serif
+ font-size: 10pt
+ line-height: 24px
+ margin: 8px
+ flex-grow: 1
+ cursor: pointer
+ &:hover,&:focus
+ background: #FFD54F
+ box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2)
.detail
max-width: 640px
diff --git a/templates/image_detail.html b/templates/image_detail.html
index 61e3e04..de76a1d 100644
--- a/templates/image_detail.html
+++ b/templates/image_detail.html
@@ -13,6 +13,11 @@
{{if .IsMine}}
<p class="description fake-input" contenteditable="true" placeholder="Description"
data-multiline>{{.Image.Description}}</p>
+ {{else}}
+ <div class="description">{{.Image.Description}}</div>
+ {{end}}
+ </div>
+ <div class="sidebar">
<div class="actions">
<form class="delete-form" method="post">
<input type="hidden" name="action" value="delete">
@@ -31,9 +36,6 @@
<div class="url">
<input type="text" value="https://i.k8r.eu/{{.Image.Id}}">
</div>
- {{else}}
- <div class="description">{{.Image.Description}}</div>
- {{end}}
</div>
</div>
{{if .IsMine}}
--
GitLab