This is an automated email from the git hooks/post-receive script. New commit to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit 180246a144a5fbc360221c2cc1d1948ad5e4cf4d Author: Benjamin <poussin@codelutin.com> Date: Wed May 27 22:59:23 2020 +0200 ajustement style du header --- web/src/components/SearchInput.vue | 37 ++++++++++++++++++------------------ web/src/components/layout/Header.vue | 30 +++++++++-------------------- 2 files changed, 27 insertions(+), 40 deletions(-) diff --git a/web/src/components/SearchInput.vue b/web/src/components/SearchInput.vue index 9208eb5..18972e3 100644 --- a/web/src/components/SearchInput.vue +++ b/web/src/components/SearchInput.vue @@ -1,20 +1,16 @@ <template> <div class="search"> - <form @submit.prevent="search"> - <label> - tags: - <TagsInput id="tags" v-model="tags" :availableTags="queryTags" :noCreation="true"></TagsInput> - </label> - <label> - fulltext: - <input type="text" v-model="mFulltext" @keyup.enter="searchFulltext" /> - </label> - </form> + <div> + <label for="tags">tags</label> + <TagsInput id="tags" v-model="tags" :availableTags="queryTags" :noCreation="true"></TagsInput> + </div> + <div> + <label for="fulltext">fulltext</label> + <input id="fulltext" type="text" v-model="mFulltext" @keyup.enter="searchFulltext" /> + </div> <form :action="$fetch.createUrl('/opensearch')"> - <label> - web: - <input name="action" type="text" /> - </label> + <label for="web">web</label> + <input id="web" name="action" type="text" /> </form> </div> </template> @@ -71,12 +67,15 @@ export default SearchInput flex-direction: row; padding-top: 0; padding-bottom: 0; + } -form { - display: flex; - flex-direction: row; + +.search > * { + flex-grow: 2; } -input { - width: 100px; + +.search > * { + display: flex; + flex-direction: column; } </style> diff --git a/web/src/components/layout/Header.vue b/web/src/components/layout/Header.vue index 851d84b..9c226c1 100644 --- a/web/src/components/layout/Header.vue +++ b/web/src/components/layout/Header.vue @@ -1,26 +1,18 @@ <template> <header> - <router-link to="/" class="header-logo"> - <img alt="Bow logo" src="../../assets/img/logos/bow-text.svg" /> - </router-link> - - <SearchInput></SearchInput> + <SearchInput class="search-input"></SearchInput> <div id="header-user-infos"> <span v-if="authenticated"> <router-link to="/preferences"> - {{ this.user.login }} (bow user since {{ new Date(this.user.creationdate).getFullYear() }}) + {{ this.user.login }} </router-link> + <span id="since">(bow user since {{ new Date(this.user.creationdate).getFullYear() }})</span> <button @click="logout">Logout</button> </span> <span v-else> <router-link to="/login">Login</router-link> </span> - - <!-- <a href="/preferences" cssClass="header-link">User Login</a> - <a href="/logout" class="header-link"> - <i class="icon-logout icon"></i> - </a> --> </div> </header> </template> @@ -55,22 +47,18 @@ header { border-bottom: 1px solid #eee; - & > a, - & > div { - flex: 1; - height: 100%; - - padding: var(--margin--medium); + .search-input { + flex-grow: 2; } } -.header-logo { - text-align: left; +#since { + font-size: 75%; } -#header-user-infos { +#header-user-infos * { display: flex; - flex-direction: row; + flex-direction: column; align-items: center; justify-content: right; } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.