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 14a97783fcf3d4a58e568edb2de2c44d932160a6 Author: kaufmann <kaufmann@codelutin.com> Date: Wed Aug 5 17:49:29 2020 +0200 Réorganisation des fichiers de style Less --- web/src/App.vue | 13 +++---- web/src/assets/less/_base.less | 2 +- web/src/assets/less/_colors.less | 47 ++++++------------------- web/src/assets/less/_globals.less | 30 ---------------- web/src/assets/less/_sizes.less | 21 ----------- web/src/assets/less/_templates.less | 18 ---------- web/src/assets/less/_theme-default.less | 44 +++++++++++++++++++++++ web/src/assets/less/_titles.less | 17 --------- web/src/assets/less/globals.less | 2 ++ web/src/assets/less/main.less | 6 +--- web/src/components/Bookmark.vue | 4 +-- web/src/components/CloudTags.vue | 4 +-- web/src/components/Navigation.vue | 4 +-- web/src/components/layout/Header.vue | 8 ++--- web/src/components/layout/HeaderSearchInput.vue | 2 +- 15 files changed, 74 insertions(+), 148 deletions(-) diff --git a/web/src/App.vue b/web/src/App.vue index a4e7b57..5c70801 100644 --- a/web/src/App.vue +++ b/web/src/App.vue @@ -72,19 +72,16 @@ export default App <style lang="less"> @import './assets/less/main'; - -body { - background-color: var(--color-bg); -} +@import './assets/less/globals'; #app { - font-family: Avenir, Helvetica, Arial, sans-serif; + color: var(--color-text); + font-family: var(--font); -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - text-align: center; - color: #2c3e50; -} + background-color: var(--color-bg); +} main { min-height: 100vh; diff --git a/web/src/assets/less/_base.less b/web/src/assets/less/_base.less index 7490175..3bb11e4 100644 --- a/web/src/assets/less/_base.less +++ b/web/src/assets/less/_base.less @@ -24,7 +24,7 @@ textarea { } select { - padding: var(--default-marge--small) var(--default-marge--medium); + padding: var(--margin--small) var(--margin--medium); background-color: inherit; border: 1px solid var(--color-main); diff --git a/web/src/assets/less/_colors.less b/web/src/assets/less/_colors.less index 4def905..872f5d1 100644 --- a/web/src/assets/less/_colors.less +++ b/web/src/assets/less/_colors.less @@ -1,45 +1,18 @@ * { - --color-link : var(--color-analog); - --color-hover : var(--color-complementary); - --color-active : var(--color-complementary--darker); + --color-text : #2c3e50; + --color-bg : var(--color-white); --color-bg-sidebar : var(--color-black); - - --color-error : var(--color-complementary); - - --color-text : var(--color-black); - --color-bookmarks-header : var(--color-grey-pale); --color-separation-border : #EEE; -} - - /* - --color-green-2 : #057974; - --color-grey : #999; ---color-blue-pale : #E9F2F5; -@color-main : @color-green; - -@color-background : #FFF; -@color-background-sidebar : @color-black; -@color-background-tag-cloud : @color-blue; -@color-background-list-odd : @color-blue-pale; -@color-background-list-even : darken(@color-blue-pale, 5%); - - @color-menu-link : #FFF; - @color-menu-link-hover : @color-red; -@color-link : @color-main; - @color-link-hover : @color-red; //darken(@color-green, 25%); - @color-link-active : darken(@color-red, 25%); -@color-button-border-1 : @color-main; -@color-button-border-2 : @color-green-2; - -@color-bookmark-background : mix(#FFF, @color-main, 98%); -@color-bookmark-title : @color-black; - -@color-form-label : lighten(@color-black, 25%); -@color-form-input-border : @color-grey; + --color-link : var(--color-analog); + --color-hover : var(--color-complementary); + --color-active : var(--color-complementary--darker); + --color-bookmarks-header : var(--color-white--darker); + --color-bookmark-bg : #FAFDFD; -@color-text-secondary : @color-grey; + --color-list-bg-odd : #E9F2F5; + --color-list-bg-even : #d7e8ed; +} -*/ diff --git a/web/src/assets/less/_globals.less b/web/src/assets/less/_globals.less deleted file mode 100644 index d157add..0000000 --- a/web/src/assets/less/_globals.less +++ /dev/null @@ -1,30 +0,0 @@ -:root { - --font: 'Fira Sans'; - --font-size : 16px; - - - --color-main : #09827C; //#079992; - --color-main--darker : #07625E; //#057974; - --color-complementary : #b71540; - --color-complementary--darker : #450818; //darken(@color-red, 25%); - --color-analog : #0a3d62; - --color-black : #1e2a2f; - --color-grey : #999999; - --color-grey-pale : #F4F4F4; - --color-white : #FFF; - --color-bg-bookmark : #FAFDFD; - - --default-footer-height : 100px; - - --default-marge--tiny: 5px; - --default-marge--small: 10px; - --default-marge--medium: 30px; - --default-marge--large: 50px; - - - --default-bookmark-radius : 3px; - -} - -@screen-desktop-low : 984px; -@screen-desktop-large : 1200px; diff --git a/web/src/assets/less/_sizes.less b/web/src/assets/less/_sizes.less deleted file mode 100644 index 736f6fb..0000000 --- a/web/src/assets/less/_sizes.less +++ /dev/null @@ -1,21 +0,0 @@ -* { - --sidebar-width : 75px; - --header-height : var(--sidebar-width); - --footer-height : 100px; - - --margin--tiny : 5px; - --margin--small : 10px; - --margin--medium : 30px; - --margin--large : 50px; -} - - - -// -// @default-font: 'Fira Sans'; -// @defaut-font-size: 16px; -// -// @default-bookmark-radius: 3px; -// -// @screen-desktop-low : 984px; -// @screen-desktop-large : 1200px; \ No newline at end of file diff --git a/web/src/assets/less/_templates.less b/web/src/assets/less/_templates.less deleted file mode 100644 index d194b2c..0000000 --- a/web/src/assets/less/_templates.less +++ /dev/null @@ -1,18 +0,0 @@ -.template-form-row { - padding-top: var(--margin--small); - padding-bottom: var(--margin--small); - display: flex; - flex-direction: column; - - text-align: left; - - label { - display: block; - float: left; - - margin-bottom: var(--margin--small); - margin-top: var(--margin--small); - font-size: 110%; - min-width: 25%; - } -} \ No newline at end of file diff --git a/web/src/assets/less/_theme-default.less b/web/src/assets/less/_theme-default.less new file mode 100644 index 0000000..b86308b --- /dev/null +++ b/web/src/assets/less/_theme-default.less @@ -0,0 +1,44 @@ +* { + /* Defaults font configuration */ + --font : 'Fira Sans', Helvetica, sans-serif; + --font-size : 16px; + + /* Defaults colors, mainly used in _colors.less */ + --color-main : #097772; //#09827C; + --color-main--darker : #07625E; + --color-complementary : #b71540; + --color-complementary--darker : #450818; + --color-analog : #0a3d62; + --color-analog--darker : #0a3d62; + --color-black : #1e2a2f; + --color-grey : #999999; + --color-white--darker : #F4F4F4; + --color-error : #b71540; + + /* Main display elements default sizes */ + --sidebar-width : 75px; + --header-height : var(--sidebar-width); + --footer-height : 100px; + + /* Default margin between elements */ + --margin--tiny : 5px; + --margin--small : 10px; + --margin--medium : 30px; + --margin--large : 50px; + + /* Some display configuration for reusable components */ + --default-bookmark-radius : 3px; + +} + +@font-face { + font-family: 'Fira Sans'; + src: url('../font/FiraSans-Regular.otf?v=eTg'); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: 'Fira Sans'; + src: url('../font/FiraSans-Bold.otf?v=eTg'); + font-weight: bold; +} \ No newline at end of file diff --git a/web/src/assets/less/_titles.less b/web/src/assets/less/_titles.less deleted file mode 100644 index 95a555e..0000000 --- a/web/src/assets/less/_titles.less +++ /dev/null @@ -1,17 +0,0 @@ -h1 { - margin-bottom: var(--default-marge--medium); - margin-top: var(--default-marge--small); - color: var(--color-main); - - &.list-title, - &.form-title { - margin-top: 0; - margin-bottom: var(--default-marge--small); - padding: var(--default-marge--large); - - text-align: center; - } - &.form-title { - background-color: var(--color-grey-pale); - } -} \ No newline at end of file diff --git a/web/src/assets/less/globals.less b/web/src/assets/less/globals.less new file mode 100644 index 0000000..4aab5b8 --- /dev/null +++ b/web/src/assets/less/globals.less @@ -0,0 +1,2 @@ +@screen-desktop-low : 984px; +@screen-desktop-large : 1200px; \ No newline at end of file diff --git a/web/src/assets/less/main.less b/web/src/assets/less/main.less index 2781612..5289347 100644 --- a/web/src/assets/less/main.less +++ b/web/src/assets/less/main.less @@ -1,10 +1,6 @@ -@import "_globals"; +@import "_theme-default"; @import "_animations"; @import "_base"; @import "_colors"; -// @import "_font"; @import "_icons"; -@import "_sizes"; -@import "_templates"; -@import "_titles"; diff --git a/web/src/components/Bookmark.vue b/web/src/components/Bookmark.vue index 09e5069..e252f37 100644 --- a/web/src/components/Bookmark.vue +++ b/web/src/components/Bookmark.vue @@ -116,8 +116,8 @@ b { margin-bottom: var(--margin--small); - background-color: var(--color-bg-bookmark); - border: 1px solid #eee; + background-color: var(--color-bookmark-bg); + border: 1px solid var(--color-separation-border); .screenshot { flex-grow: 0; diff --git a/web/src/components/CloudTags.vue b/web/src/components/CloudTags.vue index c3e998d..afa777b 100644 --- a/web/src/components/CloudTags.vue +++ b/web/src/components/CloudTags.vue @@ -53,8 +53,8 @@ export default CloudTags justify-content: center; align-items: center; - margin-bottom: var(--default-marge--small); - padding: var(--default-marge--large); + margin-bottom: var(--margin--small); + padding: var(--margin--large); color: white; text-align: center; diff --git a/web/src/components/Navigation.vue b/web/src/components/Navigation.vue index b8d5052..6aa9d46 100644 --- a/web/src/components/Navigation.vue +++ b/web/src/components/Navigation.vue @@ -69,8 +69,8 @@ export default Navigation align-items: center; justify-content: center; - margin: var(--default-marge--medium); - padding: var(--default-marge--small); + margin: var(--margin--medium); + padding: var(--margin--small); background: var(--color-bookmarks-header); border: 1px solid var(--color-separation-border); diff --git a/web/src/components/layout/Header.vue b/web/src/components/layout/Header.vue index b5355d8..000c4a0 100644 --- a/web/src/components/layout/Header.vue +++ b/web/src/components/layout/Header.vue @@ -52,14 +52,14 @@ export default Header </script> <style scoped lang="less"> -@import '../../assets/less/_globals'; +@import '../../assets/less/globals'; header { display: flex; flex-direction: column; align-items: center; justify-content: center; - border-bottom: 1px solid #eee; + border-bottom: 1px solid var(--color-separation-border); #header-search { flex-grow: 2; @@ -101,8 +101,8 @@ header { padding: 20px; background: #CCC; - border-left: 1px solid #EEE; - border-right: 1px solid #EEE; + border-left: 1px solid var(--color-separation-border); + border-right: 1px solid var(--color-separation-border); } #header-user-infos * { diff --git a/web/src/components/layout/HeaderSearchInput.vue b/web/src/components/layout/HeaderSearchInput.vue index a1ee01b..2af88f6 100644 --- a/web/src/components/layout/HeaderSearchInput.vue +++ b/web/src/components/layout/HeaderSearchInput.vue @@ -113,7 +113,7 @@ export default SearchInput & > * { - margin: var(--default-marge--small); + margin: var(--margin--small); } } </style> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.