dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16215
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-07-23 11:56:14 +0200
message:
  Tracker capture, vertical spacing for profile and notes component buttons
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/bootstrap/css/bootstrap.min.css
  dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html
  dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.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-commons-resources/src/main/webapp/dhis-web-commons/bootstrap/css/bootstrap.min.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/bootstrap/css/bootstrap.min.css	2014-03-17 14:48:42 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/bootstrap/css/bootstrap.min.css	2014-07-23 09:56:14 +0000
@@ -1622,7 +1622,7 @@
 	padding: 6px 12px;
 	margin-bottom: 0;
 	font-size: 14px;
-	font-weight: normal;
+	font-weight: bold;
 	line-height: 1.428571429;
 	text-align: center;
 	white-space: nowrap;
@@ -1661,12 +1661,12 @@
 	box-shadow: none
 }
 .btn-default {
-	color: #333;
+	color: #555;
 	background-color: #fff;
 	border-color: #ccc
 }
 .btn-default:hover, .btn-default:focus, .btn-default:active, .btn-default.active, .open .dropdown-toggle.btn-default {
-	color: #333;
+	color: #444;
 	background-color: #ebebeb;
 	border-color: #adadad
 }

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html	2014-07-17 10:35:43 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/notes/notes.html	2014-07-23 09:56:14 +0000
@@ -18,16 +18,18 @@
         
         <div class="add-note" ng-show="addNoteField">
             <textarea class="form-control" rows="3" ng-model="note" placeholder="{{'add_your_note_here'| translate}}"></textarea> 
-            <button type="button" 
-                    class="btn btn-primary"
-                    ng-click="addNote()">
-                {{'save'| translate}}
-            </button>        
-            <button type="button" 
-                    class="btn btn-default small-horizonal-spacing" 
-                    ng-click="closeAddNote()">
-                {{'cancel'| translate}}
-            </button>
+            <div class="vertical-spacing">
+	            <button type="button" 
+	                    class="btn btn-primary"
+	                    ng-click="addNote()">
+	                {{'save'| translate}}
+	            </button>        
+	            <button type="button" 
+	                    class="btn btn-default small-horizonal-spacing" 
+	                    ng-click="closeAddNote()">
+	                {{'cancel'| translate}}
+	            </button>
+	        </div>
         </div>
 
         <div ng-show='selectedEnrollment' class='remove-default-padding overflow-ellipsis'>

=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html	2014-07-13 13:08:50 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/components/profile/profile.html	2014-07-23 09:56:14 +0000
@@ -52,7 +52,7 @@
             </tr>           
         </table>
 
-        <div ng-if="editProfile">
+        <div ng-if="editProfile" class="vertical-spacing">
 
             <button type="button" 
                     class="btn btn-primary small-horizonal-spacing"