dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #12105
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3632: CSS fixes.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 3632 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-05-16 17:26:21 +0200
message:
CSS fixes.
modified:
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/IconCombo.css
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/msg/msg.css
dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/msg/msg.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 2011-05-16 14:35:26 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css 2011-05-16 15:25:26 +0000
@@ -338,6 +338,16 @@
font-family:lucida sans unicode,arial,ubuntu;
}
+/* Ext TabPanel */
+.x-tab-panel-body {
+ border-color:#ffffff;
+ font-family:lucida sans unicode,arial,ubuntu;
+}
+.panel-tab-title {
+ font:normal 11px lucida sans unicode,arial,ubuntu;
+ color:#333;
+}
+
/* Ext Gridpanel */
.x-grid3-cell-inner {
color:#111111;
@@ -359,12 +369,6 @@
border-left:0px none;
}
-/* Msg */
-.x-msg-hl {
- font-weight:bold;
- color:#444;
-}
-
/* DHIS Help */
#help {
padding:0px 8px 8px 8px;
@@ -372,18 +376,17 @@
#help h3 {
padding:8px 0 0 0;
font:bold 11px arial;
- color:#333;
- letter-spacing:0px;
+ color:#222222;
}
#help p {
padding:4px 0 4px 0;
font:normal 11px lucida sans unicode,arial,ubuntu;
- color:#333;
+ color:#222222;
}
/* GIS */
.thematic-br {
- padding:8px 0 0 0;
+ padding:7px 0 0 0;
}
.menu-item-inline-bg {
background:url('../../../images/history2_small.png') no-repeat left center;
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/IconCombo.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/IconCombo.css 2011-05-12 15:07:02 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/iconcombo/IconCombo.css 2011-05-16 15:25:26 +0000
@@ -126,11 +126,6 @@
z-index: -1;
padding-left: 8px;
}
-
-.x-form-field-wrap .ux-icon-combo-icon {
- top: 3px;
- left: 5px;
-}
.ux-icon-combo-item {
background-repeat: no-repeat ! important;
background-position: 5px 50% ! important;
@@ -138,3 +133,7 @@
height: 16px;
padding-left: 50px;
}
+.x-form-field-wrap .ux-icon-combo-icon {
+ top: 3px;
+ left: 5px;
+}
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/msg/msg.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/msg/msg.css 2010-11-26 17:56:40 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/msg/msg.css 2011-05-16 15:25:26 +0000
@@ -1,61 +1,21 @@
-/*
- * Ext JS Library 2.2
- * Copyright(c) 2006-2008, Ext JS, LLC.
- * licensing@xxxxxxxxx
- *
- * http://extjs.com/license
- */
-body {
- font-family:arial,tahoma,verdana,sans-serif;
+.msg body {
+ font:normal 11px arial,ubuntu;
+ color:#111111;
padding:20px;
padding-top:32px;
font-size:13px;
background-color:#fff !important;
}
-h1 {
- font-size:large;
- margin-bottom:20px;
-}
-h2 {
- font-size:14px;
- color:#333;
- font-weight:bold;
- margin:10px 0;
-}
-h3 {
- font:17px;
- color:#111111;
- letter-spacing:0px;
-}
-h4 {
- font-size:16px;
- color:red;
- letter-spacing:1px;
-}
-
-.example-info{
- width:150px;
- border:1px solid #c3daf9;
- border-top:1px solid #DCEAFB;
- border-left:1px solid #DCEAFB;
- background:#ecf5fe url( info-bg.gif ) repeat-x;
- font-size:10px;
- padding:8px;
-}
-pre.code{
- background: #F8F8F8;
- border: 1px solid #e8e8e8;
- padding:10px;
- margin:10px;
- margin-left:0px;
- border-left:5px solid #e8e8e8;
- font-size: 12px !important;
- line-height:14px !important;
+.msg .icon {
+ vertical-align:middle;
+ padding:0px 8px 0px 0px;
}
.msg .x-box-mc {
- font-size:12px;
- color:#111;
- padding:8px 23px 8px 12px;
+ padding:8px 23px 7px 12px;
+}
+.x-msg-hl {
+ font-weight:bold;
+ color:#222222;
}
#msg-div {
display: table;
@@ -63,6 +23,3 @@
margin-right:auto;
z-index:20000;
}
-.x-grid3-row-body p {
- margin:5px 5px 10px 5px !important;
-}
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/msg/msg.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/msg/msg.js 2010-11-09 17:31:22 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/msg/msg.js 2011-05-16 15:25:26 +0000
@@ -5,7 +5,7 @@
var icon = bool ? '../../images/check.png' : '../../images/error2.png';
return ['<div class="msg">',
'<div class="x-box-tl"><div class="x-box-tr"><div class="x-box-tc"></div></div></div>',
- '<div class="x-box-ml"><div class="x-box-mr"><div class="x-box-mc"><img src="' + icon + '" style="vertical-align:middle; padding:0px 8px 2px 0px;"/>', s, '</div></div></div>',
+ '<div class="x-box-ml"><div class="x-box-mr"><div class="x-box-mc"><img src="' + icon + '" class="icon"/>', s, '</div></div></div>',
'<div class="x-box-bl"><div class="x-box-br"><div class="x-box-bc"></div></div></div>',
'</div>'].join('');
}
@@ -44,4 +44,4 @@
}
}
};
-}();
\ No newline at end of file
+}();
