From 6e84f0a5a34dffad47697409d74aaab0f8618b02 Mon Sep 17 00:00:00 2001 From: charithag Date: Wed, 27 Apr 2016 16:37:05 +0530 Subject: [PATCH] Fix font issue --- .../public/css/custom-desktop.css | 20 ------------------- .../app/units/cdmf.unit.ui.theme/theme.json | 4 ++-- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css index 094ff3598ad..3dc0bec37f3 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css @@ -16,26 +16,6 @@ * under the License. */ -/* ======================================================================== - * methods/mixins - * ======================================================================== */ -/* ======================================================================== - * default values - * ======================================================================== */ -@font-face { - font-family: "Roboto"; - font-weight: 400; - font-style: "normal"; - src: url("libs/theme-wso2_1.0/fonts/Roboto/Roboto-Regular.eot"); - src: url("libs/theme-wso2_1.0/fonts/Roboto/Roboto-Regular.eot?#iefix") format("embedded-opentype"), local("Roboto Regular"), local("Roboto-Regular"), url("libs/theme-wso2_1.0/fonts/Roboto/Roboto-Regular.woff2") format("woff2"), url("libs/theme-wso2_1.0/fonts/Roboto/Roboto-Regular.woff") format("woff"), url("libs/theme-wso2_1.0/fonts/Roboto/Roboto-Regular.ttf") format("truetype"), url("libs/theme-wso2_1.0/fonts/Roboto/Roboto-Regular.svg#Roboto") format("svg"); -} - -/* ======================================================================== - * loading fonts - * ======================================================================== */ -/* ======================================================================== - * icon styles - * ======================================================================== */ .icon-success { color: #5cb85c; } diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/theme.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/theme.json index 26683add8af..da92b2608f3 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/theme.json +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/theme.json @@ -1,4 +1,4 @@ { - "version": "1.0.0", - "extends" : "uuf.unit.theme" + "version": "1.0.0", + "extends": "uuf.unit.theme" } \ No newline at end of file