branch develop updated (7735e70 -> fae4d21)
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 7735e70 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new fae4d21 Display corrections & add media queries 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 fae4d21d4bd234b3a1bf8530a21300006061bbbc Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Thu Feb 12 17:49:19 2015 +0100 Display corrections & add media queries Summary of changes: coselmar-ui/src/main/webapp/css/coselmar.css | 70 +++++++++++++++++++++- coselmar-ui/src/main/webapp/index.html | 8 ++- .../webapp/views/documents/modalDocumentEdit.html | 2 +- 3 files changed, 75 insertions(+), 5 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 fae4d21d4bd234b3a1bf8530a21300006061bbbc Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Thu Feb 12 17:49:19 2015 +0100 Display corrections & add media queries --- coselmar-ui/src/main/webapp/css/coselmar.css | 70 +++++++++++++++++++++- coselmar-ui/src/main/webapp/index.html | 8 ++- .../webapp/views/documents/modalDocumentEdit.html | 2 +- 3 files changed, 75 insertions(+), 5 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 2634bce..97be91b 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -69,6 +69,7 @@ body > .container { .navbar .navbar-form.navbar-right .user-info { color: #39A0A8; padding: 2px 0; + font-size: 13px; font-weight: bold; } @@ -314,6 +315,10 @@ dl dd .status-adjourned { /* Override Boostrap default classes -------------------------------------------------- */ +body .container { + width: 970px; +} + .btn-primary { background-color: #39a0a8; border-color: #3a8a8a; @@ -355,8 +360,7 @@ dl dd .status-adjourned { } .navbar .navbar-nav > li > a { - padding-top: 20px; - padding-bottom: 20px; + padding: 20px 12px 20px 12px; color: #39A0A8; } @@ -429,3 +433,65 @@ a.dropdown-toggle:hover .caret { input[type="file"] { height: auto; } + + +/* Media queries +-------------------------------------------------- */ + +@media screen and (max-width: 1080px) { + body .container { + width: 90%; + } + + + .navbar .navbar-brand .logo { + height: 30px; + padding-top: 3px; + } + .navbar .navbar-brand span.title { + font-size: 11px; + } + .navbar .navbar-nav > li > a { + padding-left: 6px; + padding-right: 6px; + } +} + +@media screen and (max-width: 900px) { + .navbar .navbar-brand { + padding-right: 5px; + } + .navbar .navbar-nav > li > a { + padding-left: 3px; + padding-right: 3px; + } + .navbar .navbar-nav > li { + border-color: #ddd; + } + .navbar .navbar-nav > li:last-child { + border-color: #ddd; + } + .navbar .navbar-form.navbar-right .user-info { + font-size: 12px; + } + .navbar .navbar-form .btn { + font-size: 11px; + margin: 0 0 0 5px; + } +} + +@media screen and (min-width: 769px) and (max-width: 900px) { + .navbar .navbar-brand .logo { + display: block; + float: none; + height: 24px; + padding-top: 0; + } + .navbar .navbar-brand span.title { + display: block; + float: left; + font-size: 11px; + padding: 4px 0 0; + transform: none; + } +} \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/index.html b/coselmar-ui/src/main/webapp/index.html index ae22b95..0ebfde8 100644 --- a/coselmar-ui/src/main/webapp/index.html +++ b/coselmar-ui/src/main/webapp/index.html @@ -25,7 +25,8 @@ <head> <meta charset="utf-8" /> - + <title>Coselmar {{ 'application.title' | translate}}</title> + <link rel="stylesheet" href="webjars/bootstrap/3.3.1/css/bootstrap.css"> <link rel="stylesheet" href="webjars/font-awesome/4.2.0/css/font-awesome.css"> <link rel="stylesheet" href="css/coselmar.css"> @@ -74,7 +75,10 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand visible-xs" href="#" translate="application.title">Coselmar Referential</a> + <a class="navbar-brand visible-xs" href="#"> + <img src="img/logo.gif" class="logo" /> + <span class="title">{{ 'application.title' | translate}}</span> + </a> </div> <nav class="hidden-xs"> <ul class="nav navbar-nav"> diff --git a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html index a54e568..7697cae 100644 --- a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html +++ b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html @@ -139,7 +139,7 @@ <div class="col-md-7"> - <span ng-repeat="keyword in document.keywords" class="" aria-hidden="true"> + <span ng-repeat="keyword in document.keywords" class="tag" aria-hidden="true"> {{keyword}} <button type="button" class="close" title="remove" ng-click="removeKeyword(keyword);"> × -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm