branch develop updated (fb2c3bc -> 4baa64d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from fb2c3bc [jgitflow-maven-plugin]updating poms for 0.6-SNAPSHOT development new f1f7e6f Refs#6432 : Add css modifications new 4baa64d Merge branch 'develop' of https://git.codelutin.com/coselmar into develop The 2 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 4baa64d5b1944fa08e3129df380b59c4fbc6e919 Merge: f1f7e6f fb2c3bc Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Tue Jan 13 15:48:43 2015 +0100 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop commit f1f7e6f2ca7f7a18842ee1c32480d5fe552c9136 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Tue Jan 13 15:47:01 2015 +0100 Refs#6432 : Add css modifications Summary of changes: coselmar-ui/src/main/webapp/css/coselmar.css | 10 +++++++++- coselmar-ui/src/main/webapp/index.html | 2 +- coselmar-ui/src/main/webapp/views/documents/newdocument.html | 2 +- coselmar-ui/src/main/webapp/views/users/users.html | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit f1f7e6f2ca7f7a18842ee1c32480d5fe552c9136 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Tue Jan 13 15:47:01 2015 +0100 Refs#6432 : Add css modifications --- coselmar-ui/src/main/webapp/css/coselmar.css | 10 +++++++++- coselmar-ui/src/main/webapp/index.html | 2 +- coselmar-ui/src/main/webapp/views/documents/newdocument.html | 2 +- coselmar-ui/src/main/webapp/views/users/users.html | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 1e82598..9eb9569 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -98,6 +98,10 @@ a { padding: 5px 20px; } +.clear { + clear: both; +} + /* Titles -------------------------------------------------- */ h1, h2 { @@ -166,4 +170,8 @@ body > .container .btn-primary { /* remove the stupid float on right with bootstrap close class */ .close { float: none; -} \ No newline at end of file +} + +input[type="file"] { + height: auto; +} diff --git a/coselmar-ui/src/main/webapp/index.html b/coselmar-ui/src/main/webapp/index.html index 518ab6e..0493c56 100644 --- a/coselmar-ui/src/main/webapp/index.html +++ b/coselmar-ui/src/main/webapp/index.html @@ -141,7 +141,7 @@ <footer class="footer"> <div class="container"> - <a href="http://www.coselamr.fr" target="_blank">Coselmar</a> + <a href="http://www.coselmar.fr" target="_blank">Coselmar</a> <a href="https://forge.codelutin.com/projects/coselmar/files" target="_blank">{{version}}</a> <span class="separator">-</span> <a href="http://www.gnu.org/licenses/gpl.html" target="_blank">Licence</a> diff --git a/coselmar-ui/src/main/webapp/views/documents/newdocument.html b/coselmar-ui/src/main/webapp/views/documents/newdocument.html index 8b42df5..8309149 100644 --- a/coselmar-ui/src/main/webapp/views/documents/newdocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/newdocument.html @@ -119,7 +119,7 @@ </div> </div> <p ng-show="!document.externalUrl && !file.upload" - class="help-block text-center">A File or an external URL is + class="help-block text-center clear">A File or an external URL is required.</p> </div> diff --git a/coselmar-ui/src/main/webapp/views/users/users.html b/coselmar-ui/src/main/webapp/views/users/users.html index ab0a4de..75fbc0a 100644 --- a/coselmar-ui/src/main/webapp/views/users/users.html +++ b/coselmar-ui/src/main/webapp/views/users/users.html @@ -29,7 +29,7 @@ </h1> </div> - <div> + <div class="table-responsive"> <div> <div class="form-group"> <a href="#/users/new" class="form-inline navbar-left btn btn-primary">Add an user</a> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 4baa64d5b1944fa08e3129df380b59c4fbc6e919 Merge: f1f7e6f fb2c3bc Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Tue Jan 13 15:48:43 2015 +0100 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm