← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21739: layout fix for audit icons together with radiobuttons

 

------------------------------------------------------------
revno: 21739
committer: Markus Bekken <markus.bekken@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2016-01-14 18:33:09 +0100
message:
  layout fix for audit icons together with radiobuttons
modified:
  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/views/dhis2-radio-button.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-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	2016-01-14 14:03:34 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/styles/style.css	2016-01-14 17:33:09 +0000
@@ -1376,6 +1376,10 @@
     margin-left: -8px;
 }
 
+.custom-radio-container{
+    display: inline-block;
+}
+
 .custom-radio-text {
     display: inline-block;
     margin-left: -5px;

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/dhis2-radio-button.html'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/dhis2-radio-button.html	2015-12-17 15:00:48 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/views/dhis2-radio-button.html	2016-01-14 17:33:09 +0000
@@ -25,7 +25,7 @@
 -->
  
 
-<div ng-if="!disabled" class="custom-radio-group">     
+<div ng-if="!disabled" class="custom-radio-group custom-radio-container">     
     <span ng-click="valueClicked('true')">
         <span class="fa-stack">                                                                                                        
             <span class='fa fa-stack-1x fa-circle radio-default fa-stack-custom-large' ng-class='radioButtonColor("true")'></span>        
@@ -59,7 +59,7 @@
         </label>
     </div>
 </div>
-<div ng-if="disabled">
+<div ng-if="disabled" class="custom-radio-container">
     <span class="fa-icon-width" ng-class="getDisabledIcon(value)"></span>
     <span>{{getDisabledValue(value) | translate}}</span>         
 </div>