branch bow-v2-go updated (76b9f3f -> dd4a7dd)
This is an automated email from the git hooks/post-receive script. New change to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from 76b9f3f deplacement du Add dans la Sidebar deplacement de la recherche dans le header new c50242e Correction de warning EsLint new 6aec4df Nouvelle UI - Bookmarks new dd4a7dd Nouvelle UI - Affichage des bookmarks en liste The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit dd4a7dd52ab056b8bc9859e493723b45e0fa4836 Author: kaufmann <kaufmann@codelutin.com> Date: Tue Apr 14 17:58:32 2020 +0200 Nouvelle UI - Affichage des bookmarks en liste commit 6aec4df90de0e88a1b7e006bb750079ff55dabd7 Author: kaufmann <kaufmann@codelutin.com> Date: Tue Apr 14 17:57:47 2020 +0200 Nouvelle UI - Bookmarks commit c50242ec055c169e2dfbc68df61a5f3fec70ba06 Author: kaufmann <kaufmann@codelutin.com> Date: Tue Apr 14 17:56:12 2020 +0200 Correction de warning EsLint Summary of changes: web/src/App.vue | 61 +++++++++-------- web/src/assets/less/_colors.less | 1 + web/src/components/Bookmark.vue | 14 ++++ web/src/components/layout/Sidebar.vue | 3 + web/src/views/Home.vue | 8 +++ web/src/views/Login.vue | 119 +++++++++++++++++----------------- 6 files changed, 115 insertions(+), 91 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 c50242ec055c169e2dfbc68df61a5f3fec70ba06 Author: kaufmann <kaufmann@codelutin.com> Date: Tue Apr 14 17:56:12 2020 +0200 Correction de warning EsLint --- web/src/App.vue | 61 ++++++++++++------------- web/src/views/Login.vue | 119 ++++++++++++++++++++++++------------------------ 2 files changed, 89 insertions(+), 91 deletions(-) diff --git a/web/src/App.vue b/web/src/App.vue index 858f7f0..74518cc 100644 --- a/web/src/App.vue +++ b/web/src/App.vue @@ -4,7 +4,7 @@ <main> <Header /> - <router-view :key="$route.fullPath"/> + <router-view :key="$route.fullPath" /> </main> <Footer /> @@ -21,45 +21,44 @@ import Sidebar from './components/layout/Sidebar.vue'; name: 'App', components: { Header, Footer, Sidebar } }) -class App extends Vue { -} -export default App +class App extends Vue {} +export default App; </script> <style lang="less"> - @import './assets/less/main'; +@import './assets/less/main'; - body { - padding-left: var(--sidebar-width); +body { + padding-left: var(--sidebar-width); - background-color: var(--color-bg); - } + background-color: var(--color-bg); +} - #app { - font-family: Avenir, Helvetica, Arial, sans-serif; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - text-align: center; - color: #2c3e50; - } +#app { + font-family: Avenir, Helvetica, Arial, sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + text-align: center; + color: #2c3e50; +} - #nav { - padding: var(--margin--medium) ; - } +#nav { + padding: var(--margin--medium); +} - #nav a { - font-weight: bold; - color: #2c3e50; - } +#nav a { + font-weight: bold; + color: #2c3e50; +} - #nav a.router-link-exact-active { - color: #42b983; - } +#nav a.router-link-exact-active { + color: #42b983; +} - main { - // width: calc(100vw - var(--sidebar-width)); - // min-height: 100vh; +main { + // width: calc(100vw - var(--sidebar-width)); + // min-height: 100vh; - padding-bottom: var(--footer-height); - } + padding-bottom: var(--footer-height); +} </style> diff --git a/web/src/views/Login.vue b/web/src/views/Login.vue index c35977d..d62d6e6 100644 --- a/web/src/views/Login.vue +++ b/web/src/views/Login.vue @@ -24,14 +24,13 @@ <a href="#">Register</a><br /> <a href="#">Forgottent password ?</a> - </form> <div v-if="errorMsg" class="error-message">{{ errorMsg }}</div> </div> </template> <script> -import { Component, Vue } from 'vue-property-decorator' +import { Component, Vue } from 'vue-property-decorator'; import Button from '@/components/common/Button.vue'; @Component({ @@ -42,9 +41,9 @@ class Login extends Vue { data = { email: '', password: '' - } + }; - errorMsg = '' + errorMsg = ''; login() { this.$fetch.post('/users/auth', this.data).then( @@ -54,85 +53,85 @@ class Login extends Vue { }, err => { console.log('ko', err) - this.errorMsg = err.cause + this.errorMsg = err.cause; } - ) + ); } } -export default Login +export default Login; </script> <style scoped lang="less"> - @import '../assets/less/main'; +@import '../assets/less/main'; - .login { - display: flex; - flex-direction: column; - align-content: center; - align-items: center; - justify-content: center; +.login { + display: flex; + flex-direction: column; + align-content: center; + align-items: center; + justify-content: center; - min-height: calc(~"100vh" - var(--header-height) - var(--footer-height)); + min-height: calc(~"100vh" - var(--header-height) - var(--footer-height)); - background-color: var(--color-main); - color: #FFF; + background-color: var(--color-main); + color: #fff; - form { - padding: var(--margin--medium) var(--margin--large); + form { + padding: var(--margin--medium) var(--margin--large); - border-radius: 10px 10px 0 0; - box-shadow: 0 -16px 23px #0001; - - animation: reveal-down 1s ease; - } - } - .form-row { - .template-form-row(); + border-radius: 10px 10px 0 0; + box-shadow: 0 -16px 23px #0001; - min-width: 300px; + animation: reveal-down 1s ease; } +} +.form-row { + .template-form-row(); - input[type="text"], - input[type="password"] { - background-color: #FFF5; - border-color: #FFF; + min-width: 300px; +} - } +input[type="text"], +input[type="password"] { + background-color: #fff5; + border-color: #fff; +} - .button { - margin-bottom: var(--margin--medium); - margin-top: var(--margin--small); - padding: var(--margin--small) var(--margin--medium); +.button { + margin-bottom: var(--margin--medium); + margin-top: var(--margin--small); + padding: var(--margin--small) var(--margin--medium); - background-color: #FFF; - border-color: var(--color-black); - color: var(--color-black); - font-size: 16px; + background-color: #fff; + border-color: var(--color-black); + color: var(--color-black); + font-size: 16px; - transition: background 0.3s ease , color 0.3s ease; + transition: background 0.3s ease, color 0.3s ease; - &:hover, - &:focus { - background-color: transparent; - color: #FFF; - } + &:hover, + &:focus { + background-color: transparent; + color: #fff; } +} - a { - color: #FFF; - &:hover { - color: var(--color-hover); - } +a { + color: #fff; + &:hover { + color: var(--color-hover); } - .error-message { - padding: var(--margin--small); - min-width: calc(300px + 2 * var(--margin--large)); +} +.error-message { + padding: var(--margin--small); + min-width: calc(300px + 2 * var(--margin--large)); - background: var(--color-complementary); - font-weight: bold; + background: var(--color-complementary); + border-top: 3px solid #fff; + border-radius: 0 0 10px 10px; + font-weight: bold; - animation: reveal-down 1s ease; - } + animation: reveal-down 1s ease; +} </style> - -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 6aec4df90de0e88a1b7e006bb750079ff55dabd7 Author: kaufmann <kaufmann@codelutin.com> Date: Tue Apr 14 17:57:47 2020 +0200 Nouvelle UI - Bookmarks --- web/src/assets/less/_colors.less | 1 + web/src/components/Bookmark.vue | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/web/src/assets/less/_colors.less b/web/src/assets/less/_colors.less index 6821bad..48565ed 100644 --- a/web/src/assets/less/_colors.less +++ b/web/src/assets/less/_colors.less @@ -7,6 +7,7 @@ --color-black : #1e2a2f; --color-grey : #999999; --color-white : #FFF; + --color-bg-bookmark: #FAFDFD; --color-hover : var(--color-complementary); --color-active : var(--color-complementary--darker); diff --git a/web/src/components/Bookmark.vue b/web/src/components/Bookmark.vue index 57ce19f..aecb3e7 100644 --- a/web/src/components/Bookmark.vue +++ b/web/src/components/Bookmark.vue @@ -59,3 +59,17 @@ class Bookmark extends Vue { export default Bookmark </script> + +<style lang="less"> +.bookmark { + display: flex; + flex-direction: row; + justify-content: space-around; //center; + align-items: center; + + margin-bottom: var(--margin--small); + + background-color: var(--color-bg-bookmark); + border: 1px solid #eee; +} +</style> \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 dd4a7dd52ab056b8bc9859e493723b45e0fa4836 Author: kaufmann <kaufmann@codelutin.com> Date: Tue Apr 14 17:58:32 2020 +0200 Nouvelle UI - Affichage des bookmarks en liste --- web/src/components/layout/Sidebar.vue | 3 +++ web/src/views/Home.vue | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/web/src/components/layout/Sidebar.vue b/web/src/components/layout/Sidebar.vue index ab859f0..9c192e6 100644 --- a/web/src/components/layout/Sidebar.vue +++ b/web/src/components/layout/Sidebar.vue @@ -22,6 +22,9 @@ import { Component, Vue } from 'vue-property-decorator' components: {} }) class Sidebar extends Vue { + add() { + this.$router.push({ name: 'Edit', params: { id: 'new' } }) + } } export default Sidebar diff --git a/web/src/views/Home.vue b/web/src/views/Home.vue index 46869ed..a83af59 100644 --- a/web/src/views/Home.vue +++ b/web/src/views/Home.vue @@ -72,3 +72,11 @@ class Home extends Vue { export default Home </script> + +<style lang="less"> +.bookmarks-list { + padding-top: var(--margin--large); + padding-left: var(--margin--medium); + padding-right: var(--margin--medium); +} +</style> \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm