Changeset 374

Timestamp:

02/28/12 19:06:23 (12 years ago)

Author:

vmipsl

Message:

style IE, Safari, ...
clean <?com.medias.xml

Location:

ether_2012/trunk/web

Files:

• WEB-INF/classes/json/json-context.xml (modified) (1 diff)
• WEB-INF/classes/log4j.xml (modified) (1 diff)
• resources/css/ether.css (modified) (13 diffs)
• resources/css/mainEther.css (modified) (1 diff)
• resources/css/verticalSlide.css (modified) (5 diffs)

ether_2012/trunk/web/WEB-INF/classes/json/json-context.xml

@@ -1 @@
-<?com.medias.xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

ether_2012/trunk/web/WEB-INF/classes/log4j.xml

@@ -1 @@
-<?com.medias.xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" threshold="all" debug="true">

ether_2012/trunk/web/resources/css/ether.css

@@ -19 +19 @@
     position: relative;
     left: 600px;
-    background-color: white;
+    background-color: #F4F4F4;
     width: 13px;
     height: 108px;
@@ -29 +29 @@
     -moz-box-shadow: 2px 3px 7px rgba(0, 0, 0, 0.3);
     -webkit-box-shadow: 2px 3px 7px rgba(0, 0, 0, 0.3);
+    box-shadow: 2px 3px 7px rgba(0, 0, 0, 0.3);
     width: 980px;
     float: left;
@@ -50 +51 @@
     -moz-box-shadow: 2px 3px 7px 0 rgba(0, 0, 0, 0.3);
     -webkit-box-shadow: 2px 3px 7px 0 rgba(0, 0, 0, 0.3);
+    box-shadow: 2px 3px 7px rgba(0, 0, 0, 0.3);
     height: 108px;
     width: 604px;
+    background-color: #F4F4F4;
 }
 
@@ -83 +86 @@
     -moz-box-shadow: 2px 3px 7px rgba(0, 0, 0, 0.3);
     -webkit-box-shadow: 2px 3px 7px rgba(0, 0, 0, 0.3);
+    box-shadow: 2px 3px 7px rgba(0, 0, 0, 0.3);
     margin-top: 13px;
     width: 589px;
@@ -88 +92 @@
     padding-left: 10px;
     padding-top: 5px;
+    background-color: #F4F4F4;
 }
 
@@ -95 +100 @@
     -moz-box-shadow: 2px 3px 7px rgba(0, 0, 0, 0.3);
     -webkit-box-shadow: 2px 3px 7px rgba(0, 0, 0, 0.3);
+    box-shadow: 2px 3px 7px rgba(0, 0, 0, 0.3);
     float: left;
     margin-left: 5px;
     width: 367px;
     min-height: 155px;
+    background-color: #F4F4F4;
 }
 
@@ -105 +112 @@
     -moz-border-radius: 4px 4px 4px 4px;
     -webkit-border-radius: 4px 4px 4px 4px;
-    background: -moz-linear-gradient(left, white, #C0C0C0);
-    background: -webkit-linear-gradient(left, white, #COCOCO);
+    background: -moz-linear-gradient(left, #F4F4F4, #C0C0C0);
+    background: -webkit-linear-gradient(left, #F4F4F4, #COCOCO);
+    background: -ms-linear-gradient(left, #F4F4F4, #COCOCO); /*For IE10*/
     width: 300px;
     height: 30px;
@@ -139 +147 @@
     width: 460px;
     margin-bottom: 0;
+    background-color: #F4F4F4;
 }
 
 .containerNewsTexts {
+    background: #F4F4F4;
     background: -moz-linear-gradient(0deg, #003d6c -9%, rgba(125, 185, 232, 0.48) 30%, rgba(125, 185, 232, 0) 83%) repeat scroll 0 0 transparent;
+    background: -ms-linear-gradient(0deg, #003d6c -9%, rgba(125, 185, 232, 0.48) 30%, rgba(125, 185, 232, 0) 83%) repeat scroll 0 0 transparent; /*For IE10*/
+    filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = 'white', endColorstr = '#3299CC'); /*For IE7-8-9*/
     float: right;
     height: 150px;
@@ -177 +189 @@
 .containerBottom {
     background: -moz-linear-gradient(left center, white, #C0C0C0) repeat scroll 0 0 transparent;
+    background: -ms-linear-gradient(left center, white, #C0C0C0) repeat scroll 0 0 transparent; /*For IE10*/
+    filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = 'white', endColorstr = '#C0C0C0'); /*For IE7-8-9*/
     color: #003D6C;
     height: 26px;
@@ -221 +235 @@
 
 /** ***************************************************** **/
-/** *********************** SLIDES ********************** **/
+/** *********************** OTHERS ********************** **/
 /** ***************************************************** **/
 .roundTable {
@@ -229 +243 @@
     width: 100%;
 }
+
+/** ***************************************************** **/
+
+/** ***************************************************** **/
+/** *********************** SLIDES ********************** **/
+/** ***************************************************** **/
 
 .slideTable {
@@ -267 +287 @@
 
 .slideSubLevels {
-    min-height: 193px;
+    min-height: 230px;
 }
 
@@ -289 +309 @@
 }
 
-/** ***************************************************** **/
+.containerSubLevel {
+    -moz-border-radius: 4px 4px 4px 4px;
+    float: left;
+    border: 2px solid #C0C0C0;
+    color: #003D6C;
+    padding: 5px 5px 0;
+    text-align: center;
+    vertical-align: bottom;
+}
+
+#subLevelsCampaigns {
+/*margin-left: 400px;*/
+/*vertical-align: bottom;*/
+}
+
+#tdCampaigns table td {
+    border: none;
+}
+
+/** ***************************************************** **/

ether_2012/trunk/web/resources/css/mainEther.css

@@ -14 +14 @@
 .pageWrapper {
     width: 980px;
-    text-align: left;
+    /*text-align: left;*/
     margin: auto;
 }

ether_2012/trunk/web/resources/css/verticalSlide.css

@@ -8 +8 @@
     background: -moz-linear-gradient(white, #C0C0C0);
     background: -webkit-linear-gradient(white, #COCOCO);
+    filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = 'white', endColorstr = '#C0C0C0'); /*For IE7-8-9*/
     -moz-border-radius: 4px 4px 4px 4px;
     -webkit-border-radius: 4px 4px 4px 4px;
@@ -71 +72 @@
 /** #slide_activities_title **/
 #slide_activities_title:hover, #slide_activities_title.activated {
+    background: #003d6c;
     background: -moz-linear-gradient(#9ac8ec, #003d6c);
     background: -webkit-linear-gradient(#9ac8ec, #003d6c);
+    filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = '#9ac8ec', endColorstr = '#003d6c'); /*For IE7-8-9*/
     color: white;
 }
@@ -83 +86 @@
 /** #slide_data_title **/
 #slide_data_title:hover, #slide_data_title.activated {
+    background: #d51311;
     background: -moz-linear-gradient(#f9adad, #d51311) repeat scroll 0 0 transparent;
     background: -webkit-linear-gradient(#f9adad, #d51311) repeat scroll 0 0 transparent;
+    filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = '#f9adad', endColorstr = '#d51311'); /*For IE7-8-9*/
     color: white;
 }
@@ -95 +100 @@
 /** #slide_databases_title **/
 #slide_databases_title:hover, #slide_databases_title.activated {
+    background: #ffcf02;
     background: -moz-linear-gradient(#f8edc2, #ffcf02) repeat scroll 0 0 transparent;
     background: -webkit-linear-gradient(#f8edc2, #ffcf02) repeat scroll 0 0 transparent;
+    filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = '#f8edc2', endColorstr = '#ffcf02'); /*For IE7-8-9*/
     color: white;
 }
@@ -107 +114 @@
 /** #slide_services_title **/
 #slide_services_title:hover, #slide_services_title.activated {
+    background: #0569c7;
     background: -moz-linear-gradient(#a6d1f8, #0569c7) repeat scroll 0 0 transparent;
     background: -webkt-linear-gradient(#a6d1f8, #0569c7) repeat scroll 0 0 transparent;
+    filter: progid:DXImageTransform.Microsoft.gradient(GradientType = 0, startColorstr = '#a6d1f8', endColorstr = '#0569c7'); /*For IE7-8-9*/
     color: white;
 }