Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x

merge-requests/7/head
charitha 8 years ago
commit a8fff3736a

@ -10,6 +10,7 @@
"dashboardServerURL" : "%https.ip%",
"androidEnrollmentDir": "/android-web-agent/enrollment",
"windowsEnrollmentDir": "/windows-web-agent/enrollment",
"iOSEnrollmentDir": "/ios-web-agent/enrollment",
"iOSConfigRoot" : "%https.ip%/ios-enrollment/",
"iOSAPIRoot" : "%https.ip%/ios/",
"adminService": "%https.ip%",

@ -36,7 +36,7 @@
{{#zone "topJs"}}
<script type="text/javascript">
var context = "{{@app.context}}"
var context = "{{@app.context}}";
</script>
{{/zone}}

@ -6512,6 +6512,12 @@ select > option:hover {
content: "*";
}
.device-type-img.fw {
font-size: 250px;
color: white;
background: #11375b;
padding: 35px;
}
.table.list-table:not(.grid-view){
margin: 0px !important;
}

Loading…
Cancel
Save