Skip to content
Snippets Groups Projects
Verified Commit 10cd60ef authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Merge branch 'master' into develop

parents c58c74d6 afbf7151
No related branches found
No related tags found
No related merge requests found
Ensure password input doesn't overflow outside of container (#933)
Fixed escaped pod name displayed on home/about page (#945)
Added feedback via loading spinner when searching a remote library
......@@ -3,10 +3,12 @@
<section :class="['ui', 'head', {'with-background': banner}, 'vertical', 'center', 'aligned', 'stripe', 'segment']" :style="headerStyle">
<div class="segment-content">
<h1 class="ui center aligned large header">
<translate translate-context="Content/Home/Header"
<span
v-translate="{podName: podName}"
translate-context="Content/Home/Header"
:translate-params="{podName: podName}">
About %{ podName }
</translate>
About %{ podName }!
</span>
<div v-if="shortDescription" class="sub header">
{{ shortDescription }}
</div>
......
......@@ -3,10 +3,12 @@
<section :class="['ui', 'head', {'with-background': banner}, 'vertical', 'center', 'aligned', 'stripe', 'segment']" :style="headerStyle">
<div class="segment-content">
<h1 class="ui center aligned large header">
<translate translate-context="Content/Home/Header"
<span
v-translate="{podName: podName}"
translate-context="Content/Home/Header"
:translate-params="{podName: podName}">
Welcome to %{ podName }!
</translate>
</span>
<div v-if="shortDescription" class="sub header">
{{ shortDescription }}
</div>
......
<template>
<div class="ui action input">
<div class="ui fluid action input">
<input
required
name="password"
......
......@@ -142,7 +142,7 @@ export default {
library: {type: Object, required: true},
displayFollow: {type: Boolean, default: true},
displayScan: {type: Boolean, default: true},
displayCopyFid: {type: Boolean, default: false},
displayCopyFid: {type: Boolean, default: true},
},
data () {
return {
......
......@@ -10,7 +10,7 @@
<label><translate translate-context="Content/Library/Input.Label/Verb">Search a remote library</translate></label>
<div :class="['ui', 'action', {loading: isLoading}, 'input']">
<input name="url" v-model="query" :placeholder="labels.placeholder" type="url">
<button type="submit" class="ui icon button">
<button type="submit" :class="['ui', 'icon', {loading: isLoading}, 'button']">
<i class="search icon"></i>
</button>
</div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment