inosh
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #338 from thusithak/theme-migration

Browse Source 
Theme migration for 2.2.0
4.x.x
Rasika Perera 8 years ago committed by GitHub
parent 9e0edf84ab 00bf595cb2
commit 4b1c9d0d95
11 changed files with 8975 additions and 50 deletions
Show Stats Download Patch File Download Diff File

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

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

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

@ -19,38 +19,40 @@
{{unit "cdmf.unit.ui.title" pageTitle="Login"}} {{unit "cdmf.unit.ui.title" pageTitle="Login"}}
{{#zone "content"}} {{#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> <p class="page-sub-title">Login</p>
<hr /> <hr />
{{#if message}} {{#if message}}
<div class="alert alert-danger" style="padding-right: 15px;"> <div class="alert alert-danger" style="padding-right: 15px;">
<i class="icon fw fw-warning"></i> {{message}}! <i class="icon fw fw-warning"></i> {{message}}!
</div>
{{/if}}
<div class="panel-body">
<form id="signInForm" method="POST" action="{{@app.context}}/uuf/login">
<div class="form-group">
<label for="username">Username *</label>
<input type="text" name="username" class="form-control" placeholder="Enter your username"
autofocus="autofocus" required="required" />
</div>
<div class="form-group">
<label for="password">Password *</label>
<input type="password" name="password" class="form-control" placeholder="Enter your password"
required="required" />
</div> </div>
{{#if referer}} {{/if}}
<input type="hidden" name="referer" value="{{referer}}" />
{{/if}} <div class="panel-body">
<div class="wr-input-control wr-btn-grp"> <form id="signInForm" method="POST" action="{{@app.context}}/uuf/login">
<button class="wr-btn btn-download-agent"> <div class="form-group">
Login <label for="username">Username *</label>
</button> <input type="text" name="username" class="form-control" placeholder="Enter your username"
{{defineZone "signInForm-below" scope="protected"}} autofocus="autofocus" required="required" />
</div> </div>
</form> <div class="form-group">
<label for="password">Password *</label>
<input type="password" name="password" class="form-control" placeholder="Enter your password"
required="required" />
</div>
{{#if referer}}
<input type="hidden" name="referer" value="{{referer}}" />
{{/if}}
<div class="wr-input-control wr-btn-grp">
<button class="wr-btn btn-download-agent">
Login
</button>
{{defineZone "signInForm-below" scope="protected"}}
</div>
</form>
</div>
</div> </div>
</div> </div>
{{/zone}} {{/zone}}

5
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
Unescape View File

@ -17,7 +17,7 @@
}} }}
{{#zone "navMenu-icon"}} {{#zone "navMenu-icon"}}
<span class="icon fw-stack"> <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> </span>
{{/zone}} {{/zone}}
@ -105,8 +105,7 @@
data-offset-top="80"> data-offset-top="80">
<ul class="sidebar-messages"> <ul class="sidebar-messages">
</ul> </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> </div>
{{/zone}} {{/zone}}
{{#zone "bottomJs"}} {{#zone "bottomJs"}}

1
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
Unescape View File

@ -25,6 +25,7 @@
font-weight: 100; font-weight: 100;
} }
.wr-input-control .cus-col-25 { .wr-input-control .cus-col-25 {
float: left; float: left;
width: 25%; width: 25%;

8
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
Unescape View File

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

3
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/theme.json
Unescape View File

@ -1,4 +1,5 @@
{ {
"version": "1.0.0", "version": "1.0.0",
"extends": "uuf.unit.theme" "extends": "uuf.unit.theme",
"enabled": false
} }

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

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

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

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

8923
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/css/theme-wso2.css
View File

File diff suppressed because it is too large Load Diff

4
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
Unescape View File

@ -622,10 +622,6 @@ header .brand {
} }
} }
header .auth {
margin: 0 -15px;
}
header .dropdown { header .dropdown {
display: inline-block; display: inline-block;
color: @base-light-color; color: @base-light-color;

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

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

Write Preview
Loading…
Cancel
Save