March 2015 - Pollen-commits - mailman.cloud.codelutin.com

01/01: Refs #1204 : Fixes less error
by chorem.org scm 17 Mar '15

17 Mar '15

This is an automated email from the git hooks/post-receive script. New commit to branch refonteUI in repository pollen. See http://git.chorem.org/pollen.git commit d1937b23e61f2ee6cf36c67b6b2fa1908c641ea2 Author: Léo Kaufmann <kaufmann(a)codelutin.com> Date: Tue Mar 17 17:05:48 2015 +0100 Refs #1204 : Fixes less error --- pollen-ui-angular/pom.xml | 1 - pollen-ui-angular/src/main/webapp/less/main.less | 22 +++++++++++++++------- .../src/main/webapp/less/variables.less | 3 +++ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/pollen-ui-angular/pom.xml b/pollen-ui-angular/pom.xml index 8e3d003..f27534d 100644 --- a/pollen-ui-angular/pom.xml +++ b/pollen-ui-angular/pom.xml @@ -147,7 +147,6 @@ <outputDirectory>${project.basedir}/src/main/webapp/css</outputDirectory> <compress>true</compress> <includes> - <include>style.less</include> <include>main.less</include> </includes> </configuration> diff --git a/pollen-ui-angular/src/main/webapp/less/main.less b/pollen-ui-angular/src/main/webapp/less/main.less index 5b33890..4cf9a94 100644 --- a/pollen-ui-angular/src/main/webapp/less/main.less +++ b/pollen-ui-angular/src/main/webapp/less/main.less @@ -57,11 +57,11 @@ body { /* Layout -------------------------------------------------- */ #wrapper #side-menu { - width: 10%; + width: @side-menu-width; } #top-bar .content, #wrapper #poll-content { - margin-left: 10%; /* Same width as #wrapper #side-menu */ + margin-left: @side-menu-width; position: relative; } @@ -169,15 +169,23 @@ main .actions-buttons { li { font-size: 13px; margin: 60px 0; - color: #CCC; - &:hover { - color: #777; + a { + color: #CCC; + font-weight: bold; + + &:hover { + color: #777; + } } - &.current { - color: #777; + + &.active { position: relative; + a { + color: #777; + } + &:after, &:before { right: -1px; diff --git a/pollen-ui-angular/src/main/webapp/less/variables.less b/pollen-ui-angular/src/main/webapp/less/variables.less index 09a0223..33a0290 100644 --- a/pollen-ui-angular/src/main/webapp/less/variables.less +++ b/pollen-ui-angular/src/main/webapp/less/variables.less @@ -31,6 +31,9 @@ @palette-light-white: #FFF; @palette-light-grey: #e8e8e8; +@side-menu-width: 6%; + + @border-color : #dddddd; @danger-color : @brand-danger; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch refonteUI updated (333c567 -> d1937b2)
by chorem.org scm 17 Mar '15

17 Mar '15

This is an automated email from the git hooks/post-receive script. New change to branch refonteUI in repository pollen. See http://git.chorem.org/pollen.git from 333c567 Refs #1204 : Continuing page reorganization and new design integration new d1937b2 Refs #1204 : Fixes less error The 1 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 d1937b23e61f2ee6cf36c67b6b2fa1908c641ea2 Author: Léo Kaufmann <kaufmann(a)codelutin.com> Date: Tue Mar 17 17:05:48 2015 +0100 Refs #1204 : Fixes less error Summary of changes: pollen-ui-angular/pom.xml | 1 - pollen-ui-angular/src/main/webapp/less/main.less | 22 +++++++++++++++------- .../src/main/webapp/less/variables.less | 3 +++ 3 files changed, 18 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch refonteUI updated (c3960ad -> 333c567)
by chorem.org scm 17 Mar '15

17 Mar '15

This is an automated email from the git hooks/post-receive script. New change to branch refonteUI in repository pollen. See http://git.chorem.org/pollen.git from c3960ad Init refonteUI branch for new design integration. Begining of page reorganization new 333c567 Refs #1204 : Continuing page reorganization and new design integration The 1 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 333c56754d2b3056fb58ec1a047ed189304d78e6 Author: Léo Kaufmann <kaufmann(a)codelutin.com> Date: Tue Mar 17 16:16:52 2015 +0100 Refs #1204 : Continuing page reorganization and new design integration Summary of changes: pollen-ui-angular/pom.xml | 1 + .../src/main/webapp/font/Pacifico.ttf | Bin 0 -> 43632 bytes pollen-ui-angular/src/main/webapp/i18n/en.js | 9 +- pollen-ui-angular/src/main/webapp/i18n/fr.js | 12 +- pollen-ui-angular/src/main/webapp/index.html | 204 ++++--- pollen-ui-angular/src/main/webapp/less/main.less | 629 +++++++++++++++++++++ .../src/main/webapp/less/variables.less | 4 +- .../src/main/webapp/partials/footer.html | 14 + .../src/main/webapp/partials/home.html | 39 +- .../src/main/webapp/partials/inline-poll.html | 226 ++++---- .../src/main/webapp/partials/poll-info.html | 101 ++-- .../src/main/webapp/partials/poll-link.html | 5 +- .../src/main/webapp/partials/poll-list.html | 70 ++- .../src/main/webapp/partials/poll-poll.html | 92 +-- .../src/main/webapp/partials/poll-settings.html | 56 +- .../{dateTimePicker.html => poll-vote.html} | 17 +- .../src/main/webapp/partials/poll.html | 212 ++++--- .../src/main/webapp/partials/user-edit.html | 22 +- 18 files changed, 1222 insertions(+), 491 deletions(-) create mode 100644 pollen-ui-angular/src/main/webapp/font/Pacifico.ttf create mode 100644 pollen-ui-angular/src/main/webapp/less/main.less create mode 100644 pollen-ui-angular/src/main/webapp/partials/footer.html copy pollen-ui-angular/src/main/webapp/partials/{dateTimePicker.html => poll-vote.html} (69%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (aef08a0 -> 77a870f)
by chorem.org scm 13 Mar '15

13 Mar '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from aef08a0 fixes #1201 Do not go back to the home page when login fails new 77a870f start making the poll creation as a real form The 1 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 77a870fe889eec473b8bebe41bfa522123d85a3b Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 13 17:41:13 2015 +0100 start making the poll creation as a real form Summary of changes: pollen-ui-angular/src/main/webapp/i18n/en.js | 3 ++- pollen-ui-angular/src/main/webapp/i18n/fr.js | 3 ++- pollen-ui-angular/src/main/webapp/index.html | 2 +- .../src/main/webapp/js/controllers/pollCtrl.js | 1 + .../src/main/webapp/js/controllers/userCtrl.js | 2 +- .../src/main/webapp/partials/poll-poll.html | 27 ++++++++-------------- 6 files changed, 17 insertions(+), 21 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (78a171e -> aef08a0)
by chorem.org scm 13 Mar '15

13 Mar '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 78a171e fix lame test (test the edit poll page without providing a poll...) new aef08a0 fixes #1201 Do not go back to the home page when login fails The 1 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 aef08a0d986c7623192536516572a0aab40f5b6b Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Mar 13 15:18:07 2015 +0100 fixes #1201 Do not go back to the home page when login fails Summary of changes: .../src/main/webapp/js/controllers/userCtrl.js | 24 +++++++++++++--------- .../src/main/webapp/partials/user-login.html | 4 ++-- 2 files changed, 16 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch refonteUI created (now c3960ad)
by chorem.org scm 12 Mar '15

12 Mar '15

This is an automated email from the git hooks/post-receive script. New change to branch refonteUI in repository pollen. See http://git.chorem.org/pollen.git at c3960ad Init refonteUI branch for new design integration. Begining of page reorganization This branch includes the following new commits: new c3960ad Init refonteUI branch for new design integration. Begining of page reorganization The 1 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 c3960adb92c78c7afc4e00abb01536325f5ab0ae Author: Léo Kaufmann <kaufmann(a)codelutin.com> Date: Thu Mar 12 17:38:14 2015 +0100 Init refonteUI branch for new design integration. Begining of page reorganization -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1