Skip to content

Commit

Permalink
Upgrade font awesome 4 => 5 (backend)
Browse files Browse the repository at this point in the history
* Add mc_product (backend)
* Add mc_news (backend)
* Update mc_pages
* Add pagination in news (frontend)
  • Loading branch information
gtraxx committed Sep 26, 2018
1 parent e029d3c commit 2a2754f
Show file tree
Hide file tree
Showing 112 changed files with 10,603 additions and 5,213 deletions.
5 changes: 1 addition & 4 deletions admin/template/css/desktop.min.css

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions admin/template/css/font-awesome/less/_animated.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Animated Icons
// --------------------------

.@{fa-css-prefix}-spin {
animation: fa-spin 2s infinite linear;
}

.@{fa-css-prefix}-pulse {
animation: fa-spin 1s infinite steps(8);
}

@keyframes fa-spin {
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,15 @@
// -------------------------

.@{fa-css-prefix}-border {
padding: .2em .25em .15em;
border: solid .08em @fa-border-color;
border-radius: .1em;
border: solid .08em @fa-border-color;
padding: .2em .25em .15em;
}

.@{fa-css-prefix}-pull-left { float: left; }
.@{fa-css-prefix}-pull-right { float: right; }

.@{fa-css-prefix} {
.@{fa-css-prefix}, .fas, .far, .fal, .fab {
&.@{fa-css-prefix}-pull-left { margin-right: .3em; }
&.@{fa-css-prefix}-pull-right { margin-left: .3em; }
}

/* Deprecated as of 4.4.0 */
.pull-right { float: right; }
.pull-left { float: left; }

.@{fa-css-prefix} {
&.pull-left { margin-right: .3em; }
&.pull-right { margin-left: .3em; }
}
12 changes: 12 additions & 0 deletions admin/template/css/font-awesome/less/_core.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// Base Class Definition
// -------------------------

.@{fa-css-prefix}, .fas, .far, .fal, .fab {
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
display: inline-block;
font-style: normal;
font-variant: normal;
text-rendering: auto;
line-height: 1;
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Fixed Width Icons
// -------------------------
.@{fa-css-prefix}-fw {
width: (18em / 14);
text-align: center;
width: (20em / 16);
}
1,194 changes: 1,194 additions & 0 deletions admin/template/css/font-awesome/less/_icons.less

Large diffs are not rendered by default.

27 changes: 27 additions & 0 deletions admin/template/css/font-awesome/less/_larger.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Icon Sizes
// -------------------------

.larger(@factor) when (@factor > 0) {
.larger((@factor - 1));

.@{fa-css-prefix}-@{factor}x {
font-size: (@factor * 1em);
}
}

/* makes the font 33% larger relative to the icon container */
.@{fa-css-prefix}-lg {
font-size: (4em / 3);
line-height: (3em / 4);
vertical-align: -.0667em;
}

.@{fa-css-prefix}-xs {
font-size: .75em;
}

.@{fa-css-prefix}-sm {
font-size: .875em;
}

.larger(10);
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@
// -------------------------

.@{fa-css-prefix}-ul {
padding-left: 0;
margin-left: @fa-li-width;
list-style-type: none;
margin-left: @fa-li-width * 5/4;
padding-left: 0;

> li { position: relative; }
}

.@{fa-css-prefix}-li {
position: absolute;
left: -@fa-li-width;
width: @fa-li-width;
top: (2em / 14);
position: absolute;
text-align: center;
&.@{fa-css-prefix}-lg {
left: (-@fa-li-width + (4em / 14));
}
width: @fa-li-width;
line-height: inherit;
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,24 @@
// --------------------------

.fa-icon() {
display: inline-block;
font: normal normal normal @fa-font-size-base/@fa-line-height-base FontAwesome; // shortening font declaration
font-size: inherit; // can't have font-size inherit on line above, so need to override
text-rendering: auto; // optimizelegibility throws things off #1094
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;

-webkit-font-smoothing: antialiased;
display: inline-block;
font-style: normal;
font-variant: normal;
font-weight: normal;
line-height: 1;
vertical-align: -.125em;
}

.fa-icon-rotate(@degrees, @rotation) {
-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=@{rotation})";
-webkit-transform: rotate(@degrees);
-ms-transform: rotate(@degrees);
transform: rotate(@degrees);
transform: rotate(@degrees);
}

.fa-icon-flip(@horiz, @vert, @rotation) {
-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=@{rotation}, mirror=1)";
-webkit-transform: scale(@horiz, @vert);
-ms-transform: scale(@horiz, @vert);
transform: scale(@horiz, @vert);
transform: scale(@horiz, @vert);
}


Expand All @@ -31,14 +28,14 @@
// See: http://a11yproject.com/posts/how-to-hide-content/

.sr-only() {
position: absolute;
width: 1px;
border: 0;
clip: rect(0,0,0,0);
height: 1px;
padding: 0;
margin: -1px;
overflow: hidden;
clip: rect(0,0,0,0);
border: 0;
padding: 0;
position: absolute;
width: 1px;
}

// Use in conjunction with .sr-only to only display content when it's focused.
Expand All @@ -50,11 +47,11 @@
.sr-only-focusable() {
&:active,
&:focus {
position: static;
width: auto;
clip: auto;
height: auto;
margin: 0;
overflow: visible;
clip: auto;
position: static;
width: auto;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,17 @@

.@{fa-css-prefix}-flip-horizontal { .fa-icon-flip(-1, 1, 0); }
.@{fa-css-prefix}-flip-vertical { .fa-icon-flip(1, -1, 2); }
.@{fa-css-prefix}-flip-horizontal.@{fa-css-prefix}-flip-vertical { .fa-icon-flip(-1, -1, 2); }

// Hook for IE8-9
// -------------------------

:root .@{fa-css-prefix}-rotate-90,
:root .@{fa-css-prefix}-rotate-180,
:root .@{fa-css-prefix}-rotate-270,
:root .@{fa-css-prefix}-flip-horizontal,
:root .@{fa-css-prefix}-flip-vertical {
filter: none;
:root {
.@{fa-css-prefix}-rotate-90,
.@{fa-css-prefix}-rotate-180,
.@{fa-css-prefix}-rotate-270,
.@{fa-css-prefix}-flip-horizontal,
.@{fa-css-prefix}-flip-vertical {
filter: none;
}
}
Loading

0 comments on commit 2a2754f

Please sign in to comment.