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

Merge pull request #369 from thusithak/master

Browse Source 
Platform configuration style defect fixes
revert-70aa11f8
Kamidu Sachith Punchihewa 8 years ago committed by GitHub
parent 2d7506d9b8 f664749c1f
commit c7bd0de033
3 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File

34
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.platform.configuration/configuration.hbs
Unescape View File

@ -35,16 +35,26 @@
<div class="row no-gutter"> <div class="row no-gutter">
<div class="wr-hidden-operations-nav col-lg-4"> <div class="wr-hidden-operations-nav col-lg-4">
<a id="generalConfigLink" href="javascript:void(0)" onclick="showAdvanceOperation('general', this)" class="selected"> <a id="generalConfigLink" href="javascript:void(0)" onclick="showAdvanceOperation('general', this)" class="selected">
<span class="wr-hidden-operations-icon fw-stack"> <span class="wr-hidden-operations-icon fw-stack">
<i class="fw fw-settings fw-stack-2x"></i> <i class="fw fw-settings fw-stack-2x"></i>
</span> <span class="fw-stack fw-move-right fw-move-bottom">
<i class="fw fw-circle fw-stack-2x fw-stroke fw-inverse"></i>
<i class="fw fw-circle fw-stack-2x"></i>
<i class="fw fw-mobile fw-stack-1x fw-inverse"></i>
</span>
</span>
General Configurations General Configurations
</a> </a>
{{#each deviceTypes}} {{#each deviceTypes}}
<a id="{{name}}ConfigLink" href="javascript:void(0)" onclick="showAdvanceOperation('{{name}}', this)"> <a id="{{name}}ConfigLink" href="javascript:void(0)" onclick="showAdvanceOperation('{{name}}', this)">
<span class="wr-hidden-operations-icon fw-stack"> <span class="wr-hidden-operations-icon fw-stack">
<i class="fw fw-settings fw-stack-2x"></i> <i class="fw fw-settings fw-stack-2x"></i>
</span> <span class="fw-stack fw-move-right fw-move-bottom">
<i class="fw fw-circle fw-stack-2x fw-stroke fw-inverse"></i>
<i class="fw fw-circle fw-stack-2x"></i>
<i class="fw fw-{{name}} fw-stack-1x fw-inverse"></i>
</span>
</span>
{{label}} Configurations {{label}} Configurations
</a> </a>
{{/each}} {{/each}}
@ -79,9 +89,7 @@
placeholder="[ Required Field ]"> placeholder="[ Required Field ]">
</div> </div>
<div class="wr-input-control wr-btn-grp"> <div class="wr-input-control wr-btn-grp">
<button id="save-general-btn" class="wr-btn"> <button id="save-general-btn" class="wr-btn">Save</button>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Save&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</button>
</div> </div>
</div> </div>
</div> </div>
@ -107,12 +115,8 @@
<b>"Exit"</b> to complete the process and go back to the dashboard. <b>"Exit"</b> to complete the process and go back to the dashboard.
<hr/> <hr/>
<button class="wr-btn" <button class="wr-btn"
onclick="window.location.href='{{@app.context}}/platform-configuration'">Go onclick="window.location.href='{{@app.context}}/platform-configuration'">Go back to configurations</button>
back <button class="wr-btn" onclick="window.location.href='{{@app.context}}'">Exit</button>
to
configurations
</button>
<button class="wr-btn" onclick="window.location.href='{{@app.context}}'">&nbsp;&nbsp;&nbsp;&nbsp;Exit&nbsp;&nbsp;&nbsp;&nbsp;</button>
</div> </div>
</div> </div>
<!-- /content --> <!-- /content -->

4
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

@ -16,10 +16,6 @@
* under the License. * under the License.
*/ */
.wr-content {
padding-left: 33px;
padding-right: 33px;
}
.wr-input-control .helper { .wr-input-control .helper {
font-weight: 100; font-weight: 100;

22
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

@ -167,7 +167,7 @@ pre {
position: absolute; position: absolute;
right: 0; right: 0;
height: 10000px; height: 10000px;
width: 60px; width: 20px;
} }
body.inverse .fade-edge:after { body.inverse .fade-edge:after {
@ -181,7 +181,7 @@ body.inverse .fade-edge:after {
position: absolute; position: absolute;
right: 0; right: 0;
height: 10000px; height: 10000px;
width: 60px; width: 20px;
} }
.visible-block { .visible-block {
@ -4552,6 +4552,15 @@ a.wr-side-panel-toggle-btn.selected {
background: #f4f4f4; background: #f4f4f4;
} }
.wr-advance-operations .wr-hidden-operations-nav a.selected span span > i{
color: #526A84;
}
.wr-advance-operations .wr-hidden-operations-nav a.selected span span > i.fw.fw-circle.fw-stack-2x{
color: #fff;
}
.wr-advance-operations .wr-hidden-operations-nav a.selected span span > i.fw.fw-circle.fw-stack-2x.fw-stroke.fw-inverse{
color: #526A84;
}
.wr-advance-operations .wr-hidden-operations-nav a.selected, .wr-hidden-operations .wr-hidden-operations-nav a.selected:hover { .wr-advance-operations .wr-hidden-operations-nav a.selected, .wr-hidden-operations .wr-hidden-operations-nav a.selected:hover {
color: #ffffff; color: #ffffff;
background: #526A84; background: #526A84;
@ -5515,7 +5524,7 @@ ul.listing li.grouped-input ul.grouped-child-input.disabled {
position: absolute; position: absolute;
right: 0; right: 0;
height: 10000px; height: 10000px;
width: 60px; width: 20px;
} }
body.inverse .fade-edge:after { body.inverse .fade-edge:after {
content: ""; content: "";
@ -5528,7 +5537,7 @@ body.inverse .fade-edge:after {
position: absolute; position: absolute;
right: 0; right: 0;
height: 10000px; height: 10000px;
width: 60px; width: 20px;
} }
/* ======================================================================== /* ========================================================================
@ -5752,7 +5761,7 @@ body.inverse .fade-edge:after {
position: absolute; position: absolute;
right: 0; right: 0;
height: 10000px; height: 10000px;
width: 60px; width: 20px;
} }
.table.table-selectable > tbody > tr:hover { .table.table-selectable > tbody > tr:hover {
cursor: pointer; cursor: pointer;
@ -6495,3 +6504,6 @@ select > option:hover {
/*background:url('http://cdn-sg1.pgimgs.com/images/pg/close-button.png') no-repeat center center;*/ /*background:url('http://cdn-sg1.pgimgs.com/images/pg/close-button.png') no-repeat center center;*/
} }
.label-bold{
font-weight:400;
}

Write Preview
Loading…
Cancel
Save