Merge pull request #338 from thusithak/theme-migration

Theme migration for 2.2.0

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/layouts/cdmf.layout.default.hbs

@@ -58,10 +58,12 @@ under the License. --}}
         <!-- page-content-wrapper -->
         <div class="page-content-wrapper">
             {{defineZone "contentTitle"}}
-            <div class="container-fluid body-wrapper">
+            <div class="container-fluid ">
+                <div class="body-wrapper">
                     {{defineZone "content"}}
                 </div>
             </div>
+        </div>
         <!-- /page-content-wrapper -->
 
         <footer class="footer">

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs

@@ -19,7 +19,8 @@
 {{unit "cdmf.unit.ui.title" pageTitle="Login"}}
 
 {{#zone "content"}}
-    <div class="container col-xs-12 col-sm-6 col-md-6 col-lg-3 col-centered wr-content wr-login col-centered">
+    <div class="row">
+        <div class="col-xs-12 col-sm-6 col-md-6 col-lg-4 col-sm-offset-3 col-md-offset-3 col-lg-offset-4">
 
             <p class="page-sub-title">Login</p>
             <hr />
@@ -53,4 +54,5 @@
                 </form>
             </div>
         </div>
+    </div>
 {{/zone}}

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs

@@ -17,7 +17,7 @@
 }}
 {{#zone "navMenu-icon"}}
     <span class="icon fw-stack">
-        <i class="fw fw-tiles fw-stack-1x toggle-icon-up"></i>
+        <i class="fw fw-menu fw-stack-1x toggle-icon-down"></i>
     </span>
 {{/zone}}
 
@@ -105,8 +105,7 @@
          data-offset-top="80">
         <ul class="sidebar-messages">
         </ul>
-        <h4 class="text-center"><a href="{{appContext}}notification-listing" class="text-center">Show all notifications</a>
+        <div class="text-center"><a href="{{appContext}}notification-listing" class="btn btn-primary">Show all notifications</a></div>
-        </h4>
     </div>
 {{/zone}}
 {{#zone "bottomJs"}}

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%;

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;
@@ -859,7 +855,7 @@ header .dropdown[aria-expanded=true], header .dropdown:hover {
   line-height: 50px;
   text-transform: uppercase;
   background: #010F1F;
-  height: 50px;
+  height: 40px;
   font-size: 14px;
 }
 
@@ -3606,7 +3602,6 @@ a.cu-btn, a.cu-btn-inner {
 	font-weight:400;
 	display: inline-block;
 	text-transform: uppercase;
-    height: 53px;
     padding: 13px 10px;
 }
 
@@ -5051,6 +5046,7 @@ a.wr-side-panel-toggle-btn.selected {
     height: 100%;
     background: #ffffff;
     border: 1px solid #e8e8e8;
+    margin-bottom:40px;
 }
 
 .wr-advance-operations .row:first-child {

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,5 @@
 {
   "version": "1.0.0",
-  "extends": "uuf.unit.theme"
+  "extends": "uuf.unit.theme",
+  "enabled": false
 }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/layouts/uuf.layout.default.hbs

@@ -46,10 +46,12 @@
 <!-- page-content-wrapper -->
 <div class="page-content-wrapper">
     {{defineZone "contentTitle"}}
-    <div class="container-fluid body-wrapper">
+    <div class="container-fluid ">
+        <div class="body-wrapper">
             {{defineZone "content"}}
         </div>
     </div>
+</div>
 <!-- /page-content-wrapper -->
 
 <!-- footer -->

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/layouts/uuf.layout.sign-in.hbs

@@ -35,10 +35,12 @@
 
 <!-- page-content-wrapper -->
 <div class="page-content-wrapper">
-    <div class="container-fluid body-wrapper">
+    <div class="container-fluid ">
+        <div class="body-wrapper">
             {{defineZone "content"}}
         </div>
     </div>
+</div>
 <!-- /page-content-wrapper -->
 
 <!-- footer -->

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;

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/theme.hbs

@@ -26,6 +26,7 @@
     {{~css "lib/font-wso2_1.2/css/font-wso2.css" combine=false}}
     <!-- Theme LESS -->
     {{~css "less/theme.less" combine=false}}
+    {{~css "css/theme-wso2.css"}}
 {{/zone}}
 
 {{~#zone "topJs"}}