[pollen] branch develop updated (1e29b02 -> 83ff77f)
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 1e29b02 add trigger change when remove date in dateTimePicker directive new 83ff77f add button return in favoriteList edit 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 83ff77f11b21443b87ea2c77622b6be5a6c9b08b Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Aug 19 17:06:24 2014 +0200 add button return in favoriteList edit Summary of changes: pollen-ui-angular/src/main/webapp/less/variables.less | 5 ++++- pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) -- 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 develop in repository pollen. See http://git.chorem.org/pollen.git commit 83ff77f11b21443b87ea2c77622b6be5a6c9b08b Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Aug 19 17:06:24 2014 +0200 add button return in favoriteList edit --- pollen-ui-angular/src/main/webapp/less/variables.less | 5 ++++- pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pollen-ui-angular/src/main/webapp/less/variables.less b/pollen-ui-angular/src/main/webapp/less/variables.less index 21bf6a0..b7a99ac 100644 --- a/pollen-ui-angular/src/main/webapp/less/variables.less +++ b/pollen-ui-angular/src/main/webapp/less/variables.less @@ -109,11 +109,14 @@ content: @fa-var-download; } -/* override fa-save */ .@{fa-css-prefix}-remove:before { content: @fa-var-times; } +.@{fa-css-prefix}-return:before { + content: @fa-var-arrow-left; +} + .@{fa-css-prefix}-info-error:before { content: @fa-var-exclamation-circle; } diff --git a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html index 6ad4fd6..d1b4d54 100644 --- a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html @@ -73,6 +73,7 @@ </table> <div class="text-right"> + <a href="#/favoriteList" class="btn btn-default"><span class="fa fa-return"></span> {{ 'action.return' | translate }}</a> <button class="btn btn-info" ng-click="newFavoriteList()"><span class="fa fa-plus"></span> {{ 'action.favoriteList.add' | translate }}</button> </div> </div> \ 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