Skip to content

Commit

Permalink
Merge pull request #192 from jdm135/master
Browse files Browse the repository at this point in the history 
Update siteIcons and siteStyle.
  • Loading branch information
@DanielHindi
DanielHindi committed Feb 17, 2016
2 parents b47d276 + 6073d09 commit a138da0
Show file tree
Hide file tree
Showing 8 changed files with 79 additions and 77 deletions.
Binary file modified fonticons/icomoon.eot
View file
Binary file not shown.
1 change: 1 addition & 0 deletions fonticons/icomoon.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified fonticons/icomoon.ttf
View file
Binary file not shown.
Binary file modified fonticons/icomoon.woff
View file
Binary file not shown.
Binary file modified fonticons/icomoon.woff2
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion scripts/buildfire/components/carousel/carousel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ buildfire.components.carousel.view.prototype = {
var image = document.createElement("img");
image.src = buildfire.components.carousel._cropImage(item.iconUrl, { width: this.width, height: this.height });
// Add data-src attr for lazyLoad
//image.src('data-src', buildfire.components.carousel._cropImage(item.iconUrl, { width: this.width, height: this.height }));
//image.setAttribute('data-src', buildfire.components.carousel._cropImage(item.iconUrl, { width: this.width, height: this.height }));
//image.className = "owl-lazy";

//image.style.width = this.'cssWidth';
Expand Down
140 changes: 71 additions & 69 deletions styles/siteIcons.css
View file
Original file line number Diff line number Diff line change
@@ -1,172 +1,174 @@
@font-face {
font-family: 'icomoon';
src:url('../fonticons/icomoon.eot?gec1t1');
src:url('../fonticons/icomoon.eot?gec1t1#iefix') format('embedded-opentype'),
url('../fonticons/icomoon.woff2?gec1t1') format('woff2'),
url('../fonticons/icomoon.ttf?gec1t1') format('truetype'),
url('../fonticons/icomoon.woff?gec1t1') format('woff'),
url('../fonticons/icomoon.svg?gec1t1#icomoon') format('svg');
font-weight: normal;
font-style: normal;
font-family: 'icomoon';
src:url('../fonticons/icomoon.eot?a8x8t2');
src:url('../fonticons/icomoon.eot?a8x8t2#iefix') format('embedded-opentype'),
url('../fonticons/icomoon.woff2?a8x8t2') format('woff2'),
url('../fonticons/icomoon.ttf?a8x8t2') format('truetype'),
url('../fonticons/icomoon.woff?a8x8t2') format('woff'),
url('../fonticons/icomoon.svg?a8x8t2#icomoon') format('svg');
font-weight: normal;
font-style: normal;
}

[class^="icon-"], [class*=" icon-"] {
/* use !important to prevent issues with browser extensions that change fonts */
font-family: 'icomoon' !important;
speak: none;
font-style: normal;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
font-family: 'icomoon' !important;
speak: none;
font-style: normal;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;

/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}

.icon-home:before {
content: "\e600";
content: "\e600";
}
.icon-pencil3:before {
content: "\e618";
content: "\e618";
}
.icon-brush2:before {
content: "\e601";
content: "\e601";
}
.icon-aim:before {
content: "\e621";
content: "\e621";
}
.icon-cog:before {
content: "\e602";
content: "\e602";
}
.icon-hammer-wrench:before {
content: "\e603";
content: "\e603";
}
.icon-shovel:before {
content: "\e617";
content: "\e617";
}
.icon-heart:before {
content: "\e902";
content: "\e902";
}
.icon-files:before {
content: "\e604";
content: "\e604";
}
.icon-license2:before {
content: "\e909";
}
.icon-shuffle:before {
content: "\e61b";
content: "\e61b";
}
.icon-repeat-one:before {
content: "\e61c";
content: "\e61c";
}
.icon-repeat:before {
content: "\e61d";
content: "\e61d";
}
.icon-camera2:before {
content: "\e903";
content: "\e903";
}
.icon-profile:before {
content: "\e605";
content: "\e605";
}
.icon-users2:before {
content: "\e61a";
content: "\e61a";
}
.icon-store:before {
content: "\e901";
content: "\e901";
}
.icon-cart:before {
content: "\e615";
content: "\e615";
}
.icon-cart-plus:before {
content: "\e616";
content: "\e616";
}
.icon-tags:before {
content: "\e904";
content: "\e904";
}
.icon-map-marker:before {
content: "\e622";
content: "\e622";
}
.icon-location:before {
content: "\e623";
content: "\e623";
}
.icon-calendar-check:before {
content: "\e624";
content: "\e624";
}
.icon-laptop-phone:before {
content: "\e61f";
content: "\e61f";
}
.icon-window:before {
content: "\e606";
content: "\e606";
}
.icon-bubble:before {
content: "\e905";
content: "\e905";
}
.icon-bubble-question:before {
content: "\e607";
content: "\e607";
}
.icon-pie-chart:before {
content: "\e608";
content: "\e608";
}
.icon-puzzle:before {
content: "\e609";
content: "\e609";
}
.icon-bullhorn:before {
content: "\e60a";
content: "\e60a";
}
.icon-volume-high:before {
content: "\e61e";
content: "\e61e";
}
.icon-cli:before {
content: "\e619";
content: "\e619";
}
.icon-bug:before {
content: "\e626";
content: "\e626";
}
.icon-link2:before {
content: "\e60b";
content: "\e60b";
}
.icon-menu:before {
content: "\e60c";
content: "\e60c";
}
.icon-list:before {
content: "\e906";
content: "\e906";
}
.icon-check:before {
content: "\e60d";
content: "\e60d";
}
.icon-cross2:before {
content: "\e60e";
content: "\e60e";
}
.icon-plus:before {
content: "\e900";
content: "\e900";
}
.icon-chevron-down:before {
content: "\e60f";
content: "\e60f";
}
.icon-chevron-left:before {
content: "\e610";
content: "\e610";
}
.icon-chevron-right:before {
content: "\e625";
content: "\e625";
}
.icon-backward-circle:before {
content: "\e611";
content: "\e611";
}
.icon-play-circle:before {
content: "\e612";
content: "\e612";
}
.icon-pause-circle:before {
content: "\e613";
content: "\e613";
}
.icon-forward-circle:before {
content: "\e614";
content: "\e614";
}
.icon-check-square:before {
content: "\e801";
content: "\e801";
}
.icon-border-all1:before {
content: "\e907";
content: "\e907";
}
.icon-ellipsis:before {
content: "\e620";
}

content: "\e620";
}
13 changes: 6 additions & 7 deletions styles/siteStyle.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,9 @@ nav ul.menu li.datatracer .parent span.icon{
nav ul.menu li.help .parent span.icon{
top:21px;
}
nav ul.menu li.licenses .parent span.icon{
top:21px;
}
nav ul.menu li.selfprovisioning .parent span.icon{
font-size:18px;
top:19px;
Expand Down Expand Up @@ -464,8 +467,8 @@ html[browser="Firefox"] .draggable-list-view .d-item.square-icon .media-holder{
top:4px;
}
.draggable-list-view.carousel-items .d-item span.title{
width:62%;
max-width:62%;
width:60%;
max-width:60%;
margin-right:0;
}
.draggable-list-view .d-item .copy span.content{
Expand Down Expand Up @@ -1350,11 +1353,7 @@ html[buildfire='control'] body{

/* Phase 2 */

/* Hide Help and Publish Button on top of each page */
.header .pull-right .btn:first-child,
.header .pull-right .btn{
display:none;
}

/* Hide deep link url icons in list views */
.draggable-list-view .d-item .copy span.btn-link-icon{
display:none !important;
Expand Down

0 comments on commit a138da0

Please sign in to comment.