← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21032: tracker-capture: minor style fix

 

------------------------------------------------------------
revno: 21032
committer: Abyot Asalefew Gizaw <abyota@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-11-11 17:46:28 +0200
message:
  tracker-capture: minor style fix
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css


--
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-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js	2015-10-23 08:08:54 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dashboard/dashboard-controller.js	2015-11-11 15:46:28 +0000
@@ -128,7 +128,7 @@
     
     var setWidgetsSize = function(){        
         
-        $scope.widgetSize = {smaller: "col-sm-6 col-md-4", bigger: "col-sm-6 col-md-8"};
+        $scope.widgetSize = {smaller: "col-sm-6 col-md-4 remove-one-pix", bigger: "col-sm-6 col-md-8"};
         
         if(!$scope.hasSmaller){
             $scope.widgetSize = {smaller: "col-sm-1", bigger: "col-sm-11"};

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2015-10-16 20:34:13 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2015-11-11 15:46:28 +0000
@@ -1179,4 +1179,9 @@
     font-weight: bold;
     cursor: default;
     width: 100%;
+}
+
+/* this is because bootstrap adds min-height of 1px for smaller sized columns to prevent them from collapsing when empty*/
+.remove-one-pix {
+    margin-top: -1px;
 }
\ No newline at end of file