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 aac2c1ffb77d83dc70d5d40f77e6a29eb42d7220 Merge: 58ade4f 15ec2ea Author: Yannick Martel <martel@©odelutin.com> Date: Fri Dec 5 11:14:09 2014 +0100 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop Conflicts: coselmar-ui/src/main/webapp/css/coselmar.css coselmar-ui/src/main/webapp/index.html coselmar-bundle/pom.xml | 8 +- coselmar-persistence/pom.xml | 1 - coselmar-rest/pom.xml | 8 +- coselmar-ui/pom.xml | 3 - coselmar-ui/src/main/webapp/css/coselmar.css | 126 ++++++++++++++++++--- coselmar-ui/src/main/webapp/index.html | 12 +- .../src/main/webapp/views/documents/document.html | 2 +- .../src/main/webapp/views/documents/documents.html | 4 +- .../main/webapp/views/documents/newdocument.html | 15 ++- coselmar-ui/src/main/webapp/views/home.html | 2 +- .../src/main/webapp/views/users/edituser.html | 2 +- .../src/main/webapp/views/users/newuser.html | 2 +- coselmar-ui/src/main/webapp/views/users/user.html | 2 +- coselmar-ui/src/main/webapp/views/users/users.html | 8 +- pom.xml | 49 +------- 15 files changed, 149 insertions(+), 95 deletions(-) diff --cc coselmar-ui/src/main/webapp/css/coselmar.css index fa181c4,b79fd0a..1e82598 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@@ -51,25 -71,94 +71,99 @@@ body > .container color: #999; text-align: center; z-index:1000; + border-top: 1px solid #aaa; + font-size: 90%; + } + + .footer .separator { + padding: 0 15px; + } + + + + /* General + -------------------------------------------------- */ + a { + color: #008EB4; + } + + .float-right { + float: right; + } + + .info-panel { + border: 1px solid #EEE; + border-left: 3px solid #39a0a8; + margin: 30px 0; + padding: 5px 20px; + } + + /* Titles + -------------------------------------------------- */ + h1, h2 { + color: #39a0a8; + border-bottom: 1px solid rgba( 57, 160, 168,0.2); + padding-left: 5px; + } + + + /* Icons / Buttons + -------------------------------------------------- */ + .btn .glyphicon { + padding-right: 8px; + } + + .btn-action { + background-color: transparent; + transition: all 0.4s ease-in-out 0s; + border: 1px solid #39a0a8; + color: #39a0a8; + margin-left: 15px; + } + + .btn-action:hover { + background-color: #39a0a8; + color: #FFF; + } + + .btn-edit { + color: #f0ad4e; + border-color: #f0ad4e; + } + .btn-edit:hover { + background-color: #f0ad4e; + } + + .btn-disable { + color: #d9534f; + border-color: #d9534f; + } + .btn-disable:hover { + background-color: #d9534f; + } + + /* Override Boostrap default classes + -------------------------------------------------- */ + .btn-primary { + background-color: #39a0a8; + border-color: #3a8a8a; + } + + .page-header { + background-color: #FAFAFA; + border: 0; + padding: 5px 0 0 0; + } + + .navbar-form.navbar-right { + padding: 0; + } - .separator { - padding-left:.75%; - padding-right:.75%; - } - - a { - color: #999; - text-decoration:none; - - &:hover { - color:#fff; - background-color:transparent; - text-decoration:none; - } - } + body > .container .btn-primary { + padding: 3px 10px; } + +/* remove the stupid float on right with bootstrap close class */ +.close { + float: none; +} diff --cc pom.xml index 106641c,4d69b33..7f6febc --- a/pom.xml +++ b/pom.xml @@@ -145,11 -142,8 +142,10 @@@ <tomcatEmbedVersion>7.0.50</tomcatEmbedVersion> + <angularUiSelectVersion>0.9.0</angularUiSelectVersion> + </properties> - <repositories> <repository> <id>coselmar-nexus-repository</id> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.