dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #31252
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15908: Tracker capture. Minor css fixes.
------------------------------------------------------------
revno: 15908
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-06-30 12:54:21 +0200
message:
Tracker capture. Minor css fixes.
modified:
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html
--
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-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2014-06-30 05:56:38 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2014-06-30 10:54:21 +0000
@@ -248,10 +248,7 @@
top:115px;
background-color:#ffffff;
border:1px solid #d0d0d0;
- padding-top:1px;
- padding-right:1px;
- padding-left:1px;
- padding-bottom:1px;
+ padding: 1px;
}
/*----------------------------------------------------------------------------*/
@@ -261,10 +258,7 @@
div.link-area-tracking {
display:inline-block;
border:1px solid #d0d0d0;
- padding-top:1px;
- padding-right:1px;
- padding-left:1px;
- padding-bottom:0px;
+ padding: 1px 1px 0 1px;
height:200px;
width:60%;
overflow:hidden;
@@ -548,7 +542,7 @@
}
.dashboard-widget-container {
- //max-height: 400px !important;
+ /*max-height: 400px !important;*/
height: auto;
overflow-x:auto;
overflow-y:auto;
@@ -631,7 +625,7 @@
z-index: 1040;
display: none;
overflow: auto;
- overflow-y: scroll
+ overflow-y: scroll;
}
.modal.fade .modal-dialog {
-webkit-transform: translate(0,-25%);
@@ -645,7 +639,7 @@
.modal.in .modal-dialog {
-webkit-transform: translate(0,0);
-ms-transform: translate(0,0);
- transform: translate(0,0)
+ transform: translate(0,0);
}
.modal-dialog {
position: relative;
@@ -664,7 +658,7 @@
outline: 0;
-webkit-box-shadow: 0 3px 9px rgba(0,0,0,0.5);
box-shadow: 0 3px 9px rgba(0,0,0,0.5);
- background-clip: padding-box
+ background-clip: padding-box;
}
.modal-backdrop {
position: fixed;
@@ -673,7 +667,7 @@
bottom: 0;
left: 0;
z-index: 1030;
- background-color: #000
+ background-color: #000;
}
.modal-backdrop.fade {
opacity: 0;
@@ -686,10 +680,10 @@
.modal-header {
min-height: 16.428571429px;
padding: 0 15px;
- border-bottom: 1px solid #e5e5e5
+ border-bottom: 1px solid #e5e5e5;
}
.modal-header .close {
- margin-top: -2px
+ margin-top: -2px;
}
.modal-title {
margin: 0;
@@ -708,7 +702,7 @@
content: " "
}
.modal-footer:after {
- clear: both
+ clear: both;
}
.modal-footer:before, .modal-footer:after {
display: table;
@@ -719,34 +713,34 @@
}
.modal-footer .btn+ .btn {
margin-bottom: 0;
- margin-left: 5px
+ margin-left: 5px;
}
.modal-footer .btn-group .btn+ .btn {
- margin-left: -1px
+ margin-left: -1px;
}
.modal-footer .btn-block+ .btn-block {
- margin-left: 0
+ margin-left: 0;
}
@media screen and (min-width: 768px) {
.modal-dialog {
width: 600px;
padding-top: 30px;
- padding-bottom: 30px
+ padding-bottom: 30px;
}
.modal-content {
-webkit-box-shadow: 0 5px 15px rgba(0,0,0,0.5);
- box-shadow: 0 5px 15px rgba(0,0,0,0.5)
+ box-shadow: 0 5px 15px rgba(0,0,0,0.5);
}
}
.expanded{
border: 1px solid #aaa;
- padding: 6px 12px;
+ padding: 6px 8px;
font-size: 14px;
}
input[type=number], input[type=text], input[type=password], textarea {
border: 1px solid #aaa;
- padding: 6px 12px;
+ padding: 6px 8px;
font-size: 14px;
}
@@ -827,10 +821,6 @@
border-color:red;
}
-/*.alert {
- padding: 5px;
-}*/
-
.input-field {
border: 1px solid #aaa;
padding: 4px 1px;
@@ -845,7 +835,7 @@
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
-webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
- transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s
+ transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
}
.form-control {
@@ -865,7 +855,7 @@
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
-webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
- transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s
+ transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
}
.form-control-program {
@@ -885,7 +875,7 @@
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
-webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
- transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s
+ transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
}
.form-control-select2 {
@@ -905,7 +895,7 @@
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
-webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
- transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s
+ transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
}
.underline {
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html 2014-06-27 14:49:34 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/views/search.html 2014-06-30 10:54:21 +0000
@@ -5,7 +5,7 @@
<tr>
<td>{{'org_unit'| translate}}</td>
<td>
- <label><input type="radio" ng-model="ouMode.name" name="selected" value="SELECTED">{{'selected'| translate}}</label><br/>
+ <label><input type="radio" ng-model="ouMode.name" name="selected" value="SELECTED"> {{'selected'| translate}}</label><br/>
<label><input type="radio" ng-model="ouMode.name" name="children" value="CHILDREN"> {{'immediate_children'| translate}}</label><br/>
<label><input type="radio" ng-model="ouMode.name" name="descendants" value="DESCENDANTS"> {{'all_children'| translate}}</label>
</td>
