From 8a17ec9e48cf870c9e228b2fe91daee4d804f344 Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Thu, 25 Aug 2016 12:30:56 +0530 Subject: [PATCH 1/2] Changing the login button to new theme --- .../app/units/cdmf.unit.ui.theme/public/css/custom-common.css | 1 + .../units/cdmf.unit.ui.theme/public/css/custom-desktop.css | 4 ---- .../public/lib/theme-wso2_1.0/less/theme-wso2.less | 4 ---- 3 files changed, 1 insertion(+), 8 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-common.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-common.css index 2fe6356b17..8afcca89ce 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-common.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-common.css @@ -25,6 +25,7 @@ font-weight: 100; } + .wr-input-control .cus-col-25 { float: left; width: 25%; 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 3c7c2d7270..cf413bec75 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 @@ -734,10 +734,6 @@ header .brand h1 { text-transform: uppercase; } -header .auth { - margin: 0 -15px; -} - header .dropdown { display: inline-block; color: #ffffff; diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/less/theme-wso2.less b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/less/theme-wso2.less index e07e7d6fa5..1e51ba60af 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/less/theme-wso2.less +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/less/theme-wso2.less @@ -622,10 +622,6 @@ header .brand { } } -header .auth { - margin: 0 -15px; -} - header .dropdown { display: inline-block; color: @base-light-color; From 802d5e5fe9e93f5927439afb967e3064c74ca8e7 Mon Sep 17 00:00:00 2001 From: Imesh Chandrasiri Date: Thu, 25 Aug 2016 14:42:26 +0530 Subject: [PATCH 2/2] Markup change to suite the padding --- .../devicemgt/app/layouts/cdmf.layout.default.hbs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/layouts/cdmf.layout.default.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/layouts/cdmf.layout.default.hbs index e4e75b3bd0..57f7736618 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/layouts/cdmf.layout.default.hbs +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/layouts/cdmf.layout.default.hbs @@ -58,8 +58,10 @@ under the License. --}}
{{defineZone "contentTitle"}} -
- {{defineZone "content"}} +
+
+ {{defineZone "content"}} +