[Echobase-commits] r1038 - in trunk/echobase-ui/src/main: resources/lizmap/theme/css resources/lizmap/theme/css/images resources/lizmap/theme/css/img webapp/css

7 Jul 2014

Author: sbavencoff
Date: 2014-07-07 15:10:47 +0200 (Mon, 07 Jul 2014)
New Revision: 1038

Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1038

Log:
refs #4194 : used echobase style in lizmap frame

Added:
   trunk/echobase-ui/src/main/resources/lizmap/theme/css/images/sprite_20_black.png
Modified:
   trunk/echobase-ui/src/main/resources/lizmap/theme/css/img/loading.gif
   trunk/echobase-ui/src/main/resources/lizmap/theme/css/main.css
   trunk/echobase-ui/src/main/resources/lizmap/theme/css/map.css
   trunk/echobase-ui/src/main/resources/lizmap/theme/css/media.css
   trunk/echobase-ui/src/main/resources/lizmap/theme/css/view.css
   trunk/echobase-ui/src/main/webapp/css/screen.css

Copied: trunk/echobase-ui/src/main/resources/lizmap/theme/css/images/sprite_20_black.png (from rev 1036, trunk/echobase-ui/src/main/resources/lizmap/theme/css/images/sprite_20.png)
===================================================================
(Binary files differ)

Modified: trunk/echobase-ui/src/main/resources/lizmap/theme/css/img/loading.gif
===================================================================
(Binary files differ)

Modified: trunk/echobase-ui/src/main/resources/lizmap/theme/css/main.css
===================================================================

--- trunk/echobase-ui/src/main/resources/lizmap/theme/css/main.css	2014-07-07 13:00:29 UTC (rev 1037)
+++ trunk/echobase-ui/src/main/resources/lizmap/theme/css/main.css	2014-07-07 13:10:47 UTC (rev 1038)
@@ -1,5 +1,7 @@
 body {
-  background : #EFEFEF;
+  background: #03497c;
+  color : #ffec3e;
+  padding-top: 20px
 }
 
 /* for ie 8*/
@@ -16,15 +18,41 @@
 /* END for ie 8*/
 
 #header {
-  background : #2B2B2B;
-  color : #FBFBFB;
+  background: #03497c;
+  border-bottom: 2px solid #0080cb;
+  color : #ffec3e;
+  height : 30px;
+  width: 70%;
 }
 #logo {
-  background : url('img/logo.png') no-repeat;
+  height : 30px;
+  margin: 0px 5px;
+  background : none;
 }
+#logo h1 {
+  font-size : 1.5em;
+  margin-left: 10px;
+  margin: 5px 5px;
+  line-height: 20px;
+}
+#title{
+  height : 30px;
+  margin : 0px 5px;
+  padding-right:5px;
+}
+#title h1 {
+  margin : 0px 5px;
+  font-size : 1.5em;
+  line-height: 30px;
+}
 
 #headermenu {
-  background-color:#93C01F;
+  background-color: #ffe810;
+  border-bottom: 2px solid #0080cb;
+  width: 30%;
+  right: 0px;
+  left: auto;
+  top: 00px;
 }
 
 #auth {
@@ -57,6 +85,11 @@
 .navbar .navbar-inner .icon {
   background-image:url("images/sprite_20_tools.png");
 }
+
+.navbar .nav .login {
+  display : none;
+}
+
 .navbar .nav .login .icon {
   background-position: -80px -60px;
 }

Modified: trunk/echobase-ui/src/main/resources/lizmap/theme/css/map.css
===================================================================
--- trunk/echobase-ui/src/main/resources/lizmap/theme/css/map.css	2014-07-07 13:00:29 UTC (rev 1037)
+++ trunk/echobase-ui/src/main/resources/lizmap/theme/css/map.css	2014-07-07 13:10:47 UTC (rev 1038)
@@ -1,6 +1,10 @@
 
+#title {
+  right: 20%;
+}
+
 #title h1 {
-  color : #AAAAAA;
+  color : #ffec3e;
 }
 #title h2 {
   color : #585858;
@@ -96,21 +100,28 @@
 }
 
 #metadata {
-  background-color:#EFEFEF;
-  color:grey;
+  background: #03497c;
+  color:white;
 }
 
 #metadata h2{
-  color:#80B219;
+  color : #ffec3e;
 }
 
 #menu {
-  background : #F0F0F0;
+  background: #03497c;
 }
 
 #menu .ui-icon-locate-open {
   background-position : -16px -16px;
 }
+
+#toolbar h3,
+#menu h3 {
+ background: #ffe810;
+ color: #2B2B2B;
+
+}
 #toolbar h3 .icon,
 #menu h3 .icon {
   background-image : url(images/sprite_20_tools.png);
@@ -121,7 +132,7 @@
 }
 #toolbar .switcher h3 .icon,
 #menu .switcher h3 .icon {
-  background-position : -40px -160px;
+  background-position : -40px -180px;
 }
 #toolbar .locate h3 .icon,
 #menu .locate h3 .icon {
@@ -243,6 +254,11 @@
   border : solid 1px rgb(251,216,80);
 }
 
+#switcher {
+  border: 1px solid #ffec3e;
+  border-radius: 4px;
+}
+
 #switcher tr.liz-state-disabled span {
   color:#AAA;
 }
@@ -251,16 +267,16 @@
 }
 
 #switcher span.label{
-  color : rgb(51,51,51);
+  color : white;
   background: none;
 }
 #switcher .treeTable tr.expanded td a.expander {
   background-image : url("images/sprite_menu.png");
-  background-position : -16px -48px;
+  background-position : -16px -30px;
 }
 #switcher .treeTable tr.collapsed td a.expander {
   background-image : url("images/sprite_menu.png");
-  background-position : -32px -64px;
+  background-position : -32px -12px;
 }
 #switcher .treeTable span.selected {
   background-color : rgb(153,153,153);
@@ -271,6 +287,11 @@
   background-image : url("images/download_layer.gif");
 }
 
+#switcher div.legendGraphics {
+  background: white;
+  border-radius: 3px;
+}
+
 #baselayer-select-input {
   background : none repeat scroll 0% 0% rgb(240, 240, 240);
   border : solid 1px #DDD;
@@ -279,22 +300,23 @@
 
 /*navbar*/
 #navbar div.slider{
-  background : #C81F2D;
-  border : solid 1px white;
+  background: #ffe810;
+  border: 3px solid #023b66;
 }
 #navbar div.slider a{
   background : black;
   border : solid 1px black;
 }
 #navbar button.ui-button-icon-only{
-  background : #CE1F2D;
-  border : solid 1px white;
+  background: #ffe810;
+  border: 3px solid #023b66;
+  border-radius: 5px;
 }
 #navbar button.ui-state-select{
-  background-color : #3A3C3D;
+  background-color : #CE1F2D;
 }
 #navbar .ui-state-default .ui-icon {
-  background-image : url("images/sprite_20.png");
+  background-image : url("images/sprite_20_black.png");
 }
 #navbar .ui-button-icon-only .ui-icon-pan {
   background-position : 0px -20px;
@@ -323,15 +345,25 @@
 
 /*Overview map*/
 #overview-bar {
-  background : none repeat scroll 0% 0% rgb(240, 240, 240);
-  border : solid 1px #606060;
+  border: 1px solid #ffec3e;
+  background: #03497c;
+  border-radius: 4px;
+  color : white;
 }
 
 #overview-bar .label {
-  color : rgb(51,51,51);
+  color : white;
   background: none;
 }
 
+
+.olControlScaleLineBottom {
+   border-color: #ffe810;
+}
+.olControlScaleLineTop {
+   border-color: #ffe810;
+}
+
 #overview-bar .button {
   border-left : solid 1px #606060;
   background : #DDD;
@@ -459,12 +491,12 @@
 
 /*dialog wait*/
 .liz-dialog-wait {
-  background: #F6F6F6;
-  border: 1px solid #606060;
+  background: #03497c;
+  border-bottom: 2px solid #0080cb;
 }
 .liz-dialog-wait .ui-dialog-titlebar{
-  background : #2B2B2B;
-  color : #FBFBFB;
+  background: #03497c;
+  color : #ffec3e;
 }
 .liz-dialog-wait .ui-dialog-titlebar-close{
   display:none;
@@ -473,3 +505,16 @@
   opacity : 0.8;
   background : black;
 }
+
+#hideMetadata {
+  background: url(images/bt_jaune.jpg) repeat-x 0 0;
+  width: auto;
+  height: 38px;
+  padding: 0 10px;
+  border: 5px solid #023b66;
+  font-weight: bold;
+  font-size: 140%;
+  line-height: 38px;
+  color: #044f90;
+  cursor: pointer;
+}

Modified: trunk/echobase-ui/src/main/resources/lizmap/theme/css/media.css
===================================================================
--- trunk/echobase-ui/src/main/resources/lizmap/theme/css/media.css	2014-07-07 13:00:29 UTC (rev 1037)
+++ trunk/echobase-ui/src/main/resources/lizmap/theme/css/media.css	2014-07-07 13:10:47 UTC (rev 1038)
@@ -54,8 +54,8 @@
   }
   #headermenu{
 /*    height:30px;*/
-    position: fixed;
-    top: 30px;
+ //   position: fixed;
+ //   top: 30px;
   }
   .navbar-inner {
     min-height:30px;

Modified: trunk/echobase-ui/src/main/resources/lizmap/theme/css/view.css
===================================================================
--- trunk/echobase-ui/src/main/resources/lizmap/theme/css/view.css	2014-07-07 13:00:29 UTC (rev 1037)
+++ trunk/echobase-ui/src/main/resources/lizmap/theme/css/view.css	2014-07-07 13:10:47 UTC (rev 1038)
@@ -1,7 +1,36 @@
 .thumbnail {
-  background-color: white;
+  border: 1px solid #ffec3e;
+  background: #03497c;
 }
+
+a.btn {
+  background: url(images/bt_jaune.jpg) repeat-x 0 0;
+  width: auto;
+  padding: 0 10px;
+  border: 5px solid #023b66;
+  font-weight: bold;
+  color: #044f90;
+  cursor: pointer;
+}
+
 .liz-project-desc {
   color: white;
   background-color: rgba(0, 0, 0, 0.5);
 }
+
+.modal {
+  background: #03497c;
+}
+
+.modal-header {
+  border-bottom: 2px solid #0080cb;
+}
+
+.modal .close {
+  color : #ffec3e;
+}
+
+.modal-footer {
+  background: #03497c;
+  border-top: 2px solid #0080cb;
+}

Modified: trunk/echobase-ui/src/main/webapp/css/screen.css
===================================================================
--- trunk/echobase-ui/src/main/webapp/css/screen.css	2014-07-07 13:00:29 UTC (rev 1037)
+++ trunk/echobase-ui/src/main/webapp/css/screen.css	2014-07-07 13:10:47 UTC (rev 1038)
@@ -766,4 +766,5 @@
 #spatialViewContent {
     width: 99%;
     height: 800px;
+    border: none;
 }

    

[Echobase-commits] r1038 - in trunk/echobase-ui/src/main: resources/lizmap/theme/css resources/lizmap/theme/css/images resources/lizmap/theme/css/img webapp/css

sbavencoff＠users.forge.codelutin.com