Merge branch 'master' into 'master'

removing font-wso2 and adding font-entgra

See merge request entgra/carbon-device-mgt!221
merge-requests/225/head
Dharmakeerthi Lasantha 5 years ago
commit b61f763f82

@ -2401,7 +2401,7 @@ a.list-group-item:hover {
}
.tree-view li > .icon {
font-family: "font-wso2";
font-family: "font-entgra";
font-style: normal;
background: #2c313b;
color: #ffffff;
@ -2686,7 +2686,7 @@ a.list-group-item:hover {
text-align: center;
background: #2c313b;
color: #fff;
font-family: font-wso2;
font-family: font-entgra;
}
.checkbox > input[type=checkbox]:not(:checked) + .helper:after {
@ -4433,7 +4433,7 @@ a.wr-side-panel-toggle-btn.selected {
text-align: center;
background: #008cc4;
color: #fff;
font-family: font-wso2;
font-family: font-entgra;
}
.wr-input-control.checkbox input[type="checkbox"]:not(:checked) + .helper:after {
@ -6624,7 +6624,7 @@ ul.tiles .icon {
}
.tree-view li > .icon {
font-family: 'font-wso2';
font-family: 'font-entgra';
font-style: normal;
background: #2c313b;
color: #ffffff;

@ -8053,7 +8053,7 @@ a.list-group-item:hover {
}
.tree-view li > .icon {
font-family: "font-wso2";
font-family: "font-entgra";
font-style: normal;
background: #008cc4;
color: #ffffff;
@ -8295,7 +8295,7 @@ a.list-group-item:hover {
text-align: center;
background: #004675;
color: #fff;
font-family: font-wso2;
font-family: font-entgra;
}
.checkbox > input[type=checkbox]:not(:checked) + .helper:after {
display: none;

@ -1,5 +1,5 @@
/*!
~ Copyright (c) WSO2 Inc. (http://wso2.com) All Rights Reserved.
~ Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
@ -16,20 +16,20 @@
@font-face {
font-family:"font-wso2";
src:local("font-wso2"), url("../fonts/font-wso2.eot?6563fa91278f239ef8c827d90a165223");
src:local("font-wso2"),
url("../fonts/font-wso2.eot?#iefix") format("embedded-opentype"),
url("../fonts/font-wso2.woff2?6563fa91278f239ef8c827d90a165223") format("woff2"),
url("../fonts/font-wso2.woff?6563fa91278f239ef8c827d90a165223") format("woff"),
url("../fonts/font-wso2.ttf?6563fa91278f239ef8c827d90a165223") format("truetype"),
url("../fonts/font-wso2.svg?6563fa91278f239ef8c827d90a165223#font-wso2") format("svg");
font-family:"font-entgra";
src:local("font-entgra"), url("../fonts/font-entgra.eot?3990d6a2bf7b820a842f9dc0774c990e");
src:local("font-entgra"),
url("../fonts/font-entgra.eot?3990d6a2bf7b820a842f9dc0774c990e#iefix") format("embedded-opentype"),
url("../fonts/font-entgra.woff2?3990d6a2bf7b820a842f9dc0774c990e") format("woff2"),
url("../fonts/font-entgra.woff?3990d6a2bf7b820a842f9dc0774c990e") format("woff"),
url("../fonts/font-entgra.ttf?3990d6a2bf7b820a842f9dc0774c990e") format("truetype"),
url("../fonts/font-entgra.svg?3990d6a2bf7b820a842f9dc0774c990e#font-entgra") format("svg");
font-weight:normal;
font-style:normal;
}
.fw, [class^="fw-"], [class*=" fw-"] {
font: normal normal normal 14px/1 font-wso2;
font: normal normal normal 14px/1 font-entgra;
display: inline-block;
font-weight: normal;
font-style: normal;
@ -304,10 +304,18 @@
content:"\e6cf";
}
.fw-activesync:before {
content:"\e745";
}
.fw-add:before {
content:"\e615";
}
.fw-aggregate:before {
content:"\e742";
}
.fw-airplay:before {
content:"\e600";
}
@ -348,7 +356,7 @@
content:"\e602";
}
.fw-ios:before {
.fw-apple:before {
content:"\e604";
}
@ -380,6 +388,10 @@
content:"\e60a";
}
.fw-bean:before {
content:"\e743";
}
.fw-blank-document:before {
content:"\e60c";
}
@ -416,6 +428,10 @@
content:"\e612";
}
.fw-call-mediator:before {
content:"\e736";
}
.fw-camera:before {
content:"\e613";
}
@ -480,7 +496,7 @@
content:"\e653";
}
.fw-configarations:before {
.fw-configurations:before {
content:"\e609";
}
@ -500,6 +516,10 @@
content:"\e620";
}
.fw-continue:before {
content:"\e73e";
}
.fw-contract:before {
content:"\e614";
}
@ -516,6 +536,10 @@
content:"\e622";
}
.fw-data-mapper:before {
content:"\e735";
}
.fw-database:before {
content:"\e623";
}
@ -628,6 +652,10 @@
content:"\e628";
}
.fw-dollar:before {
content:"\e741";
}
.fw-down-arrow:before {
content:"\e689";
}
@ -672,6 +700,10 @@
content:"\e6e3";
}
.fw-event-simulator:before {
content:"\e744";
}
.fw-expand:before {
content:"\e61c";
}
@ -716,6 +748,10 @@
content:"\e62e";
}
.fw-foreach:before {
content:"\e73ab";
}
.fw-fork-join:before {
content:"\e720";
}
@ -764,6 +800,10 @@
content:"\e6da";
}
.fw-google-glass:before {
content:"\e732";
}
.fw-google-plus:before {
content:"\e6d9";
}
@ -800,6 +840,10 @@
content:"\e639";
}
.fw-header:before {
content:"\e734";
}
.fw-heart:before {
content:"\e6c3";
}
@ -832,6 +876,10 @@
content:"\e63c";
}
.fw-in-sequence:before {
content:"\e739";
}
.fw-incoming-call:before {
content:"\e63d";
}
@ -844,6 +892,10 @@
content:"\e6db";
}
.fw-integration:before {
content:"\e73f";
}
.fw-invitation:before {
content:"\e63f";
}
@ -896,6 +948,10 @@
content:"\e647";
}
.fw-kiosk:before {
content:"\e746";
}
.fw-laptop:before {
content:"\e648";
}
@ -960,6 +1016,10 @@
content:"\e64e";
}
.fw-log:before {
content:"\e738";
}
.fw-logical:before {
content:"\e702";
}
@ -976,6 +1036,10 @@
content:"\e650";
}
.fw-mapping:before {
content:"\e73c";
}
.fw-menu:before {
content:"\e651";
}
@ -1004,6 +1068,10 @@
content:"\e655";
}
.fw-namespace:before {
content:"\e740";
}
.fw-nodejs:before {
content:"\e656";
}
@ -1016,6 +1084,10 @@
content:"\e6ac";
}
.fw-out-sequence:before {
content:"\e73a";
}
.fw-own:before {
content:"\e6c8";
}
@ -1032,6 +1104,10 @@
content:"\e658";
}
.fw-payload-factory:before {
content:"\e733";
}
.fw-pdf:before {
content:"\e659";
}
@ -1060,6 +1136,10 @@
content:"\e70d";
}
.fw-property:before {
content:"\e737";
}
.fw-prototype:before {
content:"\e6cc";
}
@ -1088,6 +1168,10 @@
content:"\e65d";
}
.fw-reduce:before {
content:"\e73d";
}
.fw-refresh:before {
content:"\e692";
}

@ -21,7 +21,7 @@
@font-face {.font( 'Roboto'; 300; 'normal'; 'Roboto Light'; 'Roboto-Light-webfont'; '../fonts' )}
@font-default: 'Roboto Light', Arial, Helvetica, sans-serif;
@font-icons: 'font-wso2';
@font-icons: 'font-entgra';
@font-default-weight: 300;
@border-radius-default: 0;
@box-shadow-default: none;

@ -23,7 +23,7 @@
<!-- Font Awesome CSS -->
{{~css "lib/font-awesome_4.3.0/css/font-awesome.min.css" combine=false}}
<!-- Font WSO2 CSS -->
{{~css "lib/font-wso2-1.3.0/css/font-wso2.css" combine=false}}
{{~css "lib/font-entgra-1.4.0/css/font-entgra.css" combine=false}}
<!-- Theme LESS -->
{{~css "less/theme.less" combine=false}}
{{~css "css/theme-wso2.css" combine=false}}

Loading…
Cancel
Save