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 4a93aad8c29e9e9c49d0faca2fc427dbbd9a774b Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Thu Feb 19 15:52:14 2015 +0100 Fixes display issues --- coselmar-ui/src/main/webapp/css/coselmar.css | 17 ++++++++++++++++- coselmar-ui/src/main/webapp/views/admin/admintools.html | 2 +- .../src/main/webapp/views/documents/document.html | 2 +- .../src/main/webapp/views/documents/documents.html | 2 +- .../src/main/webapp/views/documents/newdocument.html | 2 +- .../src/main/webapp/views/questions/newquestion.html | 2 +- .../src/main/webapp/views/questions/questions.html | 2 +- .../src/main/webapp/views/referential/referential.html | 2 +- coselmar-ui/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 | 2 +- 11 files changed, 26 insertions(+), 11 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 1c4bdc1..d2423f1 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -34,10 +34,13 @@ body { background: rgba( 57, 160, 168,0.5); } #main-container .container { - padding: 40px 20px 60px 20px; + padding: 20px 20px 50px 20px; background: #FFF; border: 1px solid #EEE; } +#main-container > .container { + width: 100% !important; +} #main-container { position: relative; margin: 0 auto; @@ -150,6 +153,12 @@ h1, h2 { padding-left: 5px; } +h1 { + font-size: 28px; +} +h2 { + font-size: 22px; +} /* Icons / Buttons -------------------------------------------------- */ @@ -457,6 +466,9 @@ input[type="file"] { -------------------------------------------------- */ @media screen and (max-width: 1080px) { + body { + font-size: 13px; + } #main-container, body .container { width: 90%; @@ -477,6 +489,9 @@ input[type="file"] { } @media screen and (max-width: 900px) { + body { + font-size: 12px; + } .navbar .navbar-brand { padding-right: 5px; } diff --git a/coselmar-ui/src/main/webapp/views/admin/admintools.html b/coselmar-ui/src/main/webapp/views/admin/admintools.html index 2c41cec..b337f8f 100644 --- a/coselmar-ui/src/main/webapp/views/admin/admintools.html +++ b/coselmar-ui/src/main/webapp/views/admin/admintools.html @@ -21,7 +21,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<div style="padding: 0px 0px 0px 30px"> +<div> <div class="page-header" style="margin: 0"> <h1> <!-- Heading goes here --> diff --git a/coselmar-ui/src/main/webapp/views/documents/document.html b/coselmar-ui/src/main/webapp/views/documents/document.html index 5ca277c..105901b 100644 --- a/coselmar-ui/src/main/webapp/views/documents/document.html +++ b/coselmar-ui/src/main/webapp/views/documents/document.html @@ -21,7 +21,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<div style="padding: 0px 0px 0px 30px"> +<div> <div ng-include="src='views/documents/viewDocument.html'" ng-if="editSession != true" /> <div ng-include="src='views/documents/editDocument.html'" ng-if="editSession == true" /> </div> diff --git a/coselmar-ui/src/main/webapp/views/documents/documents.html b/coselmar-ui/src/main/webapp/views/documents/documents.html index f6ee3a4..86f5502 100644 --- a/coselmar-ui/src/main/webapp/views/documents/documents.html +++ b/coselmar-ui/src/main/webapp/views/documents/documents.html @@ -21,7 +21,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<div style="padding: 0px 0px 0px 30px"> +<div> <div class="page-header" style="margin: 0"> <h1> <!-- Heading goes here --> diff --git a/coselmar-ui/src/main/webapp/views/documents/newdocument.html b/coselmar-ui/src/main/webapp/views/documents/newdocument.html index bf98b85..89b2a81 100644 --- a/coselmar-ui/src/main/webapp/views/documents/newdocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/newdocument.html @@ -21,7 +21,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<div style="padding: 0px 0px 0px 30px"> +<div> <div class="page-header" style="margin: 0"> <h2>{{ 'document.create.title' | translate }}</h2> <span translate="common.message.mandatoryFieldsInfo"></span> diff --git a/coselmar-ui/src/main/webapp/views/questions/newquestion.html b/coselmar-ui/src/main/webapp/views/questions/newquestion.html index c0ab8ff..80e580b 100644 --- a/coselmar-ui/src/main/webapp/views/questions/newquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/newquestion.html @@ -21,7 +21,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<div style="padding: 0px 0px 0px 30px"> +<div> <div class="page-header" style="margin: 0 0 20px 0;"> <h2>{{ 'question.add.title' | translate }}</h2> <span translate="common.message.mandatoryFieldsInfo"></span> diff --git a/coselmar-ui/src/main/webapp/views/questions/questions.html b/coselmar-ui/src/main/webapp/views/questions/questions.html index c0301b0..7bd3506 100644 --- a/coselmar-ui/src/main/webapp/views/questions/questions.html +++ b/coselmar-ui/src/main/webapp/views/questions/questions.html @@ -22,7 +22,7 @@ #L% --> -<div style="padding: 0px 0px 0px 30px"> +<div> <div class="page-header"> <h1> <!-- Heading goes here --> diff --git a/coselmar-ui/src/main/webapp/views/referential/referential.html b/coselmar-ui/src/main/webapp/views/referential/referential.html index 7e1e76a..4bff497 100644 --- a/coselmar-ui/src/main/webapp/views/referential/referential.html +++ b/coselmar-ui/src/main/webapp/views/referential/referential.html @@ -21,7 +21,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<div style="padding: 0px 0px 0px 30px"> +<div> <div class="page-header" style="margin: 0"> <h2>{{ 'referential.search.title' | translate }}</h2> </div> diff --git a/coselmar-ui/src/main/webapp/views/users/newuser.html b/coselmar-ui/src/main/webapp/views/users/newuser.html index b11473d..7da5592 100644 --- a/coselmar-ui/src/main/webapp/views/users/newuser.html +++ b/coselmar-ui/src/main/webapp/views/users/newuser.html @@ -21,7 +21,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<div style="padding: 0px 0px 0px 30px"> +<div > <div class="page-header" style="margin: 0"> <h2>{{ 'user.create.title' | translate }}</h2> <span translate="common.message.mandatoryFieldsInfo"></span> diff --git a/coselmar-ui/src/main/webapp/views/users/user.html b/coselmar-ui/src/main/webapp/views/users/user.html index 2d13054..c30de13 100644 --- a/coselmar-ui/src/main/webapp/views/users/user.html +++ b/coselmar-ui/src/main/webapp/views/users/user.html @@ -21,7 +21,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<div style="padding: 0px 0px 0px 30px"> +<div> <div class="page-header" style="margin: 0"> <h1> {{user.firstName}} {{user.name}} diff --git a/coselmar-ui/src/main/webapp/views/users/users.html b/coselmar-ui/src/main/webapp/views/users/users.html index 99d39a2..5364160 100644 --- a/coselmar-ui/src/main/webapp/views/users/users.html +++ b/coselmar-ui/src/main/webapp/views/users/users.html @@ -21,7 +21,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<div style="padding: 0px 0px 0px 30px"> +<div> <div class="page-header" style="margin: 0"> <h1> <!-- Heading goes here --> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.