Merge branch 'develop'

2014-02-02 13:06:01 -05:00
parent 901bf4dcb0 16d1dfc586
commit fc47d7174f
2 changed files with 4 additions and 1 deletions
@@ -1,4 +1,4 @@
-angular.module("umbraco").controller("Imulus.ArchetypeController", function ($scope, $http, $interpolate, assetsService, angularHelper, notificationsService) {
+angular.module("umbraco").controller("Imulus.ArchetypeController", function ($scope, $http, assetsService, angularHelper, notificationsService) {
 
    //$scope.model.value = "";

@@ -46,6 +46,9 @@
        width: 80%;
        margin-bottom: 0;
        padding: 0;
+        span {
+            display: inline-block;
+        }
    }
 }