diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css
index 8cedb6ddc..22588c49c 100644
--- a/modules/backend/assets/css/october.css
+++ b/modules/backend/assets/css/october.css
@@ -3483,8 +3483,8 @@ table {
* -------------------------- */
@font-face {
font-family: 'FontAwesome';
- src: url('../../../system/assets/vendor/font-autumn/font/Font-Autumn.eot?v=1.0.0');
- src: url('../../../system/assets/vendor/font-autumn/font/Font-Autumn.eot?#iefix&v=1.0.0') format('embedded-opentype'), url('../../../system/assets/vendor/font-autumn/font/Font-Autumn.woff?v=1.0.0') format('woff'), url('../../../system/assets/vendor/font-autumn/font/Font-Autumn.ttf?v=1.0.0') format('truetype'), url('../../../system/assets/vendor/font-autumn/font/Font-Autumn.svg#fontautumn?v=1.0.0') format('svg');
+ src: url('../../../system/assets/vendor/font-autumn/font/fontautumn-webfont.eot?v=1.0.0');
+ src: url('../../../system/assets/vendor/font-autumn/font/fontautumn-webfont.eot?#iefix&v=1.0.0') format('embedded-opentype'), url('../../../system/assets/vendor/font-autumn/font/fontautumn-webfont.woff?v=1.0.0') format('woff'), url('../../../system/assets/vendor/font-autumn/font/fontautumn-webfont.ttf?v=1.0.0') format('truetype'), url('../../../system/assets/vendor/font-autumn/font/fontautumn-webfont.svg#fontautumn?v=1.0.0') format('svg');
font-weight: normal;
font-style: normal;
}
@@ -4184,18 +4184,6 @@ a .icon-flip-vertical:before {
.icon-clipboard:before {
content: "\f0ea";
}
-.icon-clock-o:before {
- content: "\f017";
-}
-.icon-cloud:before {
- content: "\f0c2";
-}
-.icon-cloud-download:before {
- content: "\f0ed";
-}
-.icon-cloud-upload:before {
- content: "\f0ee";
-}
.icon-cny:before {
content: "\f157";
}
@@ -4238,7 +4226,7 @@ a .icon-flip-vertical:before {
.icon-compress:before {
content: "\f066";
}
-.icon-copy:before {
+.icon-files-o:before {
content: "\f0c5";
}
.icon-copyright:before {
@@ -4262,7 +4250,7 @@ a .icon-flip-vertical:before {
.icon-cubes:before {
content: "\f1b3";
}
-.icon-cut:before {
+.icon-scissors:before {
content: "\f0c4";
}
.icon-cutlery:before {
@@ -4292,9 +4280,6 @@ a .icon-flip-vertical:before {
.icon-dot-circle-o:before {
content: "\f192";
}
-.icon-download:before {
- content: "\f019";
-}
.icon-dribbble:before {
content: "\f17d";
}
@@ -4310,12 +4295,6 @@ a .icon-flip-vertical:before {
.icon-eject:before {
content: "\f052";
}
-.icon-ellipsis-h:before {
- content: "\f141";
-}
-.icon-ellipsis-v:before {
- content: "\f142";
-}
.icon-empire:before {
content: "\f1d1";
}
@@ -4358,12 +4337,6 @@ a .icon-flip-vertical:before {
.icon-external-link-square:before {
content: "\f14c";
}
-.icon-eye:before {
- content: "\f06e";
-}
-.icon-eye-slash:before {
- content: "\f070";
-}
.icon-eyedropper:before {
content: "\f1fb";
}
@@ -4598,9 +4571,6 @@ a .icon-flip-vertical:before {
.icon-heart-o:before {
content: "\f08a";
}
-.icon-history:before {
- content: "\f1da";
-}
.icon-hospital-o:before {
content: "\f0f8";
}
@@ -4820,7 +4790,7 @@ a .icon-flip-vertical:before {
.icon-paragraph:before {
content: "\f1dd";
}
-.icon-paste:before {
+.icon-clipboard:before {
content: "\f0ea";
}
.icon-pause:before {
@@ -4874,15 +4844,9 @@ a .icon-flip-vertical:before {
.icon-plug:before {
content: "\f1e6";
}
-.icon-power-off:before {
- content: "\f011";
-}
.icon-print:before {
content: "\f02f";
}
-.icon-puzzle-piece:before {
- content: "\f12e";
-}
.icon-qq:before {
content: "\f1d6";
}
@@ -4982,9 +4946,6 @@ a .icon-flip-vertical:before {
.icon-scissors:before {
content: "\f0c4";
}
-.icon-search:before {
- content: "\f002";
-}
.icon-search-minus:before {
content: "\f010";
}
@@ -5312,9 +5273,6 @@ a .icon-flip-vertical:before {
.icon-unsorted:before {
content: "\f0dc";
}
-.icon-upload:before {
- content: "\f093";
-}
.icon-usd:before {
content: "\f155";
}
@@ -5555,6 +5513,150 @@ a .icon-flip-vertical:before {
.icon-pencil:before {
content: "\e634";
}
+.icon-attachment:before {
+ content: "\e635";
+}
+.icon-cloud:before {
+ content: "\e636";
+}
+.icon-cloud-circle:before {
+ content: "\e637";
+}
+.icon-cloud-done:before {
+ content: "\e638";
+}
+.icon-cloud-download:before {
+ content: "\e639";
+}
+.icon-cloud-off:before {
+ content: "\e63a";
+}
+.icon-cloud-queue:before {
+ content: "\e63b";
+}
+.icon-cloud-upload:before {
+ content: "\e63c";
+}
+.icon-download:before {
+ content: "\e63d";
+}
+.icon-upload:before {
+ content: "\e63e";
+}
+.icon-more-horiz:before {
+ content: "\e63f";
+}
+.icon-more-vert:before {
+ content: "\e640";
+}
+.icon-power:before {
+ content: "\e641";
+}
+.icon-power-settings:before {
+ content: "\e642";
+}
+.icon-extension:before {
+ content: "\e643";
+}
+.icon-pages:before {
+ content: "\e644";
+}
+.icon-web:before {
+ content: "\e645";
+}
+.icon-slideshow:before {
+ content: "\e646";
+}
+.icon-style:before {
+ content: "\e647";
+}
+.icon-visibility:before {
+ content: "\e648";
+}
+.icon-visibility-off:before {
+ content: "\e649";
+}
+.icon-copy:before {
+ content: "\e64a";
+}
+.icon-cut:before {
+ content: "\e64b";
+}
+.icon-paste:before {
+ content: "\e64c";
+}
+.icon-page-search:before {
+ content: "\e64d";
+}
+.icon-page-add:before {
+ content: "\e64e";
+}
+.icon-page:before {
+ content: "\e64f";
+}
+.icon-view-agenda:before {
+ content: "\e650";
+}
+.icon-view-array:before {
+ content: "\e651";
+}
+.icon-view-carousel:before {
+ content: "\e652";
+}
+.icon-view-column:before {
+ content: "\e653";
+}
+.icon-view-day:before {
+ content: "\e654";
+}
+.icon-view-headline:before {
+ content: "\e655";
+}
+.icon-view-list:before {
+ content: "\e656";
+}
+.icon-view-module:before {
+ content: "\e657";
+}
+.icon-view-quilt:before {
+ content: "\e658";
+}
+.icon-view-stream:before {
+ content: "\e659";
+}
+.icon-view-week:before {
+ content: "\e65a";
+}
+.icon-history:before {
+ content: "\e65b";
+}
+.icon-clock:before {
+ content: "\e65c";
+}
+.icon-search:before {
+ content: "\e65d";
+}
+.icon-exit-app:before {
+ content: "\e65e";
+}
+.icon-open-browser:before {
+ content: "\e65f";
+}
+.icon-open-new:before {
+ content: "\e660";
+}
+.icon-page-content:before {
+ content: "\e661";
+}
+.icon-search-box:before {
+ content: "\e662";
+}
+.icon-layers:before {
+ content: "\e663";
+}
+.icon-layers-clear:before {
+ content: "\e664";
+}
.icon-plus-square-o:before {
content: "\f196";
}
@@ -5564,6 +5666,9 @@ a .icon-flip-vertical:before {
.icon-minus-square:before {
content: "\f146";
}
+.icon-puzzle-piece:before {
+ content: "\f12e";
+}
.icon-paint-brush:before {
content: "\e602";
}
@@ -5612,6 +5717,45 @@ a .icon-flip-vertical:before {
.icon-minus-circle:before {
content: "\e62a";
}
+.icon-ellipsis-h:before {
+ content: "\e63f";
+}
+.icon-ellipsis-v:before {
+ content: "\e640";
+}
+.icon-power-off:before {
+ content: "\e641";
+}
+.icon-eye:before {
+ content: "\e648";
+}
+.icon-eye-slash:before {
+ content: "\e649";
+}
+.icon-clock-o:before {
+ content: "\e65c";
+}
+.icon-cms-components:before {
+ content: "\e643";
+}
+.icon-cms:before {
+ content: "\e645";
+}
+.icon-cms-pages:before {
+ content: "\e64a";
+}
+.icon-cms-assets:before {
+ content: "\e616";
+}
+.icon-cms-layouts:before {
+ content: "\e658";
+}
+.icon-cms-partials:before {
+ content: "\e663";
+}
+.icon-cms-content:before {
+ content: "\f031";
+}
[class^="oc-icon-"]:before,
[class*=" oc-icon-"]:before {
display: inline-block;
@@ -5979,18 +6123,6 @@ a .icon-flip-vertical:before {
.oc-icon-clipboard:before {
content: "\f0ea";
}
-.oc-icon-clock-o:before {
- content: "\f017";
-}
-.oc-icon-cloud:before {
- content: "\f0c2";
-}
-.oc-icon-cloud-download:before {
- content: "\f0ed";
-}
-.oc-icon-cloud-upload:before {
- content: "\f0ee";
-}
.oc-icon-cny:before {
content: "\f157";
}
@@ -6033,7 +6165,7 @@ a .icon-flip-vertical:before {
.oc-icon-compress:before {
content: "\f066";
}
-.oc-icon-copy:before {
+.oc-icon-files-o:before {
content: "\f0c5";
}
.oc-icon-copyright:before {
@@ -6057,7 +6189,7 @@ a .icon-flip-vertical:before {
.oc-icon-cubes:before {
content: "\f1b3";
}
-.oc-icon-cut:before {
+.oc-icon-scissors:before {
content: "\f0c4";
}
.oc-icon-cutlery:before {
@@ -6087,9 +6219,6 @@ a .icon-flip-vertical:before {
.oc-icon-dot-circle-o:before {
content: "\f192";
}
-.oc-icon-download:before {
- content: "\f019";
-}
.oc-icon-dribbble:before {
content: "\f17d";
}
@@ -6105,12 +6234,6 @@ a .icon-flip-vertical:before {
.oc-icon-eject:before {
content: "\f052";
}
-.oc-icon-ellipsis-h:before {
- content: "\f141";
-}
-.oc-icon-ellipsis-v:before {
- content: "\f142";
-}
.oc-icon-empire:before {
content: "\f1d1";
}
@@ -6153,12 +6276,6 @@ a .icon-flip-vertical:before {
.oc-icon-external-link-square:before {
content: "\f14c";
}
-.oc-icon-eye:before {
- content: "\f06e";
-}
-.oc-icon-eye-slash:before {
- content: "\f070";
-}
.oc-icon-eyedropper:before {
content: "\f1fb";
}
@@ -6393,9 +6510,6 @@ a .icon-flip-vertical:before {
.oc-icon-heart-o:before {
content: "\f08a";
}
-.oc-icon-history:before {
- content: "\f1da";
-}
.oc-icon-hospital-o:before {
content: "\f0f8";
}
@@ -6615,7 +6729,7 @@ a .icon-flip-vertical:before {
.oc-icon-paragraph:before {
content: "\f1dd";
}
-.oc-icon-paste:before {
+.oc-icon-clipboard:before {
content: "\f0ea";
}
.oc-icon-pause:before {
@@ -6669,15 +6783,9 @@ a .icon-flip-vertical:before {
.oc-icon-plug:before {
content: "\f1e6";
}
-.oc-icon-power-off:before {
- content: "\f011";
-}
.oc-icon-print:before {
content: "\f02f";
}
-.oc-icon-puzzle-piece:before {
- content: "\f12e";
-}
.oc-icon-qq:before {
content: "\f1d6";
}
@@ -6777,9 +6885,6 @@ a .icon-flip-vertical:before {
.oc-icon-scissors:before {
content: "\f0c4";
}
-.oc-icon-search:before {
- content: "\f002";
-}
.oc-icon-search-minus:before {
content: "\f010";
}
@@ -7107,9 +7212,6 @@ a .icon-flip-vertical:before {
.oc-icon-unsorted:before {
content: "\f0dc";
}
-.oc-icon-upload:before {
- content: "\f093";
-}
.oc-icon-usd:before {
content: "\f155";
}
@@ -7350,6 +7452,150 @@ a .icon-flip-vertical:before {
.oc-icon-pencil:before {
content: "\e634";
}
+.oc-icon-attachment:before {
+ content: "\e635";
+}
+.oc-icon-cloud:before {
+ content: "\e636";
+}
+.oc-icon-cloud-circle:before {
+ content: "\e637";
+}
+.oc-icon-cloud-done:before {
+ content: "\e638";
+}
+.oc-icon-cloud-download:before {
+ content: "\e639";
+}
+.oc-icon-cloud-off:before {
+ content: "\e63a";
+}
+.oc-icon-cloud-queue:before {
+ content: "\e63b";
+}
+.oc-icon-cloud-upload:before {
+ content: "\e63c";
+}
+.oc-icon-download:before {
+ content: "\e63d";
+}
+.oc-icon-upload:before {
+ content: "\e63e";
+}
+.oc-icon-more-horiz:before {
+ content: "\e63f";
+}
+.oc-icon-more-vert:before {
+ content: "\e640";
+}
+.oc-icon-power:before {
+ content: "\e641";
+}
+.oc-icon-power-settings:before {
+ content: "\e642";
+}
+.oc-icon-extension:before {
+ content: "\e643";
+}
+.oc-icon-pages:before {
+ content: "\e644";
+}
+.oc-icon-web:before {
+ content: "\e645";
+}
+.oc-icon-slideshow:before {
+ content: "\e646";
+}
+.oc-icon-style:before {
+ content: "\e647";
+}
+.oc-icon-visibility:before {
+ content: "\e648";
+}
+.oc-icon-visibility-off:before {
+ content: "\e649";
+}
+.oc-icon-copy:before {
+ content: "\e64a";
+}
+.oc-icon-cut:before {
+ content: "\e64b";
+}
+.oc-icon-paste:before {
+ content: "\e64c";
+}
+.oc-icon-page-search:before {
+ content: "\e64d";
+}
+.oc-icon-page-add:before {
+ content: "\e64e";
+}
+.oc-icon-page:before {
+ content: "\e64f";
+}
+.oc-icon-view-agenda:before {
+ content: "\e650";
+}
+.oc-icon-view-array:before {
+ content: "\e651";
+}
+.oc-icon-view-carousel:before {
+ content: "\e652";
+}
+.oc-icon-view-column:before {
+ content: "\e653";
+}
+.oc-icon-view-day:before {
+ content: "\e654";
+}
+.oc-icon-view-headline:before {
+ content: "\e655";
+}
+.oc-icon-view-list:before {
+ content: "\e656";
+}
+.oc-icon-view-module:before {
+ content: "\e657";
+}
+.oc-icon-view-quilt:before {
+ content: "\e658";
+}
+.oc-icon-view-stream:before {
+ content: "\e659";
+}
+.oc-icon-view-week:before {
+ content: "\e65a";
+}
+.oc-icon-history:before {
+ content: "\e65b";
+}
+.oc-icon-clock:before {
+ content: "\e65c";
+}
+.oc-icon-search:before {
+ content: "\e65d";
+}
+.oc-icon-exit-app:before {
+ content: "\e65e";
+}
+.oc-icon-open-browser:before {
+ content: "\e65f";
+}
+.oc-icon-open-new:before {
+ content: "\e660";
+}
+.oc-icon-page-content:before {
+ content: "\e661";
+}
+.oc-icon-search-box:before {
+ content: "\e662";
+}
+.oc-icon-layers:before {
+ content: "\e663";
+}
+.oc-icon-layers-clear:before {
+ content: "\e664";
+}
.oc-icon-plus-square-o:before {
content: "\f196";
}
@@ -7359,6 +7605,9 @@ a .icon-flip-vertical:before {
.oc-icon-minus-square:before {
content: "\f146";
}
+.oc-icon-puzzle-piece:before {
+ content: "\f12e";
+}
.oc-icon-paint-brush:before {
content: "\e602";
}
@@ -7407,6 +7656,45 @@ a .icon-flip-vertical:before {
.oc-icon-minus-circle:before {
content: "\e62a";
}
+.oc-icon-ellipsis-h:before {
+ content: "\e63f";
+}
+.oc-icon-ellipsis-v:before {
+ content: "\e640";
+}
+.oc-icon-power-off:before {
+ content: "\e641";
+}
+.oc-icon-eye:before {
+ content: "\e648";
+}
+.oc-icon-eye-slash:before {
+ content: "\e649";
+}
+.oc-icon-clock-o:before {
+ content: "\e65c";
+}
+.oc-icon-cms-components:before {
+ content: "\e643";
+}
+.oc-icon-cms:before {
+ content: "\e645";
+}
+.oc-icon-cms-pages:before {
+ content: "\e64a";
+}
+.oc-icon-cms-assets:before {
+ content: "\e616";
+}
+.oc-icon-cms-layouts:before {
+ content: "\e658";
+}
+.oc-icon-cms-partials:before {
+ content: "\e663";
+}
+.oc-icon-cms-content:before {
+ content: "\f031";
+}
[class^="flag-"],
[class*=" flag-"] {
background-image: url("../images/flag-icons-small.png");
@@ -8987,7 +9275,7 @@ body.drag .mainmenu-collapsed ul li:hover {
text-decoration: inherit;
-webkit-font-smoothing: antialiased;
*margin-right: .3em;
- content: "\f141";
+ content: "\e63f";
display: block;
position: absolute;
left: 50%;
@@ -9119,7 +9407,7 @@ body.mainmenu-open .mainmenu-collapsed ul {
text-decoration: inherit;
-webkit-font-smoothing: antialiased;
*margin-right: .3em;
- content: "\f141";
+ content: "\e63f";
display: block;
position: absolute;
left: 50%;
@@ -14314,7 +14602,7 @@ div.control-popover.control-inspector > div:after {
text-decoration: inherit;
-webkit-font-smoothing: antialiased;
*margin-right: .3em;
- content: "\f002";
+ content: "\e65d";
right: 8px;
top: 5px;
color: #95a5a6;
diff --git a/modules/backend/assets/less/core/icons.less b/modules/backend/assets/less/core/icons.less
index 41726e7b9..65e6e7c34 100644
--- a/modules/backend/assets/less/core/icons.less
+++ b/modules/backend/assets/less/core/icons.less
@@ -126,10 +126,6 @@
.oc-icon-circle-o-notch:before { content: @circle-o-notch; }
.oc-icon-circle-thin:before { content: @circle-thin; }
.oc-icon-clipboard:before { content: @clipboard; }
-.oc-icon-clock-o:before { content: @clock-o; }
-.oc-icon-cloud:before { content: @cloud; }
-.oc-icon-cloud-download:before { content: @cloud-download; }
-.oc-icon-cloud-upload:before { content: @cloud-upload; }
.oc-icon-cny:before { content: @cny; }
.oc-icon-code:before { content: @code; }
.oc-icon-code-fork:before { content: @code-fork; }
@@ -144,7 +140,7 @@
.oc-icon-comments-o:before { content: @comments-o; }
.oc-icon-compass:before { content: @compass; }
.oc-icon-compress:before { content: @compress; }
-.oc-icon-copy:before { content: @copy; }
+.oc-icon-files-o:before { content: @files-o; }
.oc-icon-copyright:before { content: @copyright; }
.oc-icon-credit-card:before { content: @credit-card; }
.oc-icon-crop:before { content: @crop; }
@@ -152,7 +148,7 @@
.oc-icon-css3:before { content: @css3; }
.oc-icon-cube:before { content: @cube; }
.oc-icon-cubes:before { content: @cubes; }
-.oc-icon-cut:before { content: @cut; }
+.oc-icon-scissors:before { content: @scissors; }
.oc-icon-cutlery:before { content: @cutlery; }
.oc-icon-database:before { content: @database; }
.oc-icon-dedent:before { content: @dedent; }
@@ -162,14 +158,11 @@
.oc-icon-digg:before { content: @digg; }
.oc-icon-dollar:before { content: @dollar; }
.oc-icon-dot-circle-o:before { content: @dot-circle-o; }
-.oc-icon-download:before { content: @download; }
.oc-icon-dribbble:before { content: @dribbble; }
.oc-icon-dropbox:before { content: @dropbox; }
.oc-icon-drupal:before { content: @drupal; }
.oc-icon-edit:before { content: @edit; }
.oc-icon-eject:before { content: @eject; }
-.oc-icon-ellipsis-h:before { content: @ellipsis-h; }
-.oc-icon-ellipsis-v:before { content: @ellipsis-v; }
.oc-icon-empire:before { content: @empire; }
.oc-icon-envelope:before { content: @envelope; }
.oc-icon-envelope-o:before { content: @envelope-o; }
@@ -184,8 +177,6 @@
.oc-icon-expand:before { content: @expand; }
.oc-icon-external-link:before { content: @external-link; }
.oc-icon-external-link-square:before { content: @external-link-square; }
-.oc-icon-eye:before { content: @eye; }
-.oc-icon-eye-slash:before { content: @eye-slash; }
.oc-icon-eyedropper:before { content: @eyedropper; }
.oc-icon-facebook:before { content: @facebook; }
.oc-icon-facebook-square:before { content: @facebook-square; }
@@ -264,7 +255,6 @@
.oc-icon-headphones:before { content: @headphones; }
.oc-icon-heart:before { content: @heart; }
.oc-icon-heart-o:before { content: @heart-o; }
-.oc-icon-history:before { content: @history; }
.oc-icon-hospital-o:before { content: @hospital-o; }
.oc-icon-html5:before { content: @html5; }
.oc-icon-ils:before { content: @ils; }
@@ -338,7 +328,7 @@
.oc-icon-paper-plane-o:before { content: @paper-plane-o; }
.oc-icon-paperclip:before { content: @paperclip; }
.oc-icon-paragraph:before { content: @paragraph; }
-.oc-icon-paste:before { content: @paste; }
+.oc-icon-clipboard:before { content: @clipboard; }
.oc-icon-pause:before { content: @pause; }
.oc-icon-paw:before { content: @paw; }
.oc-icon-paypal:before { content: @paypal; }
@@ -356,9 +346,7 @@
.oc-icon-play-circle:before { content: @play-circle; }
.oc-icon-play-circle-o:before { content: @play-circle-o; }
.oc-icon-plug:before { content: @plug; }
-.oc-icon-power-off:before { content: @power-off; }
.oc-icon-print:before { content: @print; }
-.oc-icon-puzzle-piece:before { content: @puzzle-piece; }
.oc-icon-qq:before { content: @qq; }
.oc-icon-qrcode:before { content: @qrcode; }
.oc-icon-question:before { content: @question; }
@@ -392,7 +380,6 @@
.oc-icon-rupee:before { content: @rupee; }
.oc-icon-save:before { content: @save; }
.oc-icon-scissors:before { content: @scissors; }
-.oc-icon-search:before { content: @search; }
.oc-icon-search-minus:before { content: @search-minus; }
.oc-icon-search-plus:before { content: @search-plus; }
.oc-icon-send:before { content: @send; }
@@ -502,7 +489,6 @@
.oc-icon-undo:before { content: @undo; }
.oc-icon-unlink:before { content: @unlink; }
.oc-icon-unsorted:before { content: @unsorted; }
-.oc-icon-upload:before { content: @upload; }
.oc-icon-usd:before { content: @usd; }
.oc-icon-video-camera:before { content: @video-camera; }
.oc-icon-vimeo-square:before { content: @vimeo-square; }
@@ -583,9 +569,58 @@
.oc-icon-cog-box:before { content: @cog-box; }
.oc-icon-tune:before { content: @tune; }
.oc-icon-pencil:before { content: @pencil; }
+.oc-icon-attachment:before { content: @attachment; }
+.oc-icon-cloud:before { content: @cloud; }
+.oc-icon-cloud-circle:before { content: @cloud-circle; }
+.oc-icon-cloud-done:before { content: @cloud-done; }
+.oc-icon-cloud-download:before { content: @cloud-download; }
+.oc-icon-cloud-off:before { content: @cloud-off; }
+.oc-icon-cloud-queue:before { content: @cloud-queue; }
+.oc-icon-cloud-upload:before { content: @cloud-upload; }
+.oc-icon-download:before { content: @download; }
+.oc-icon-upload:before { content: @upload; }
+.oc-icon-more-horiz:before { content: @more-horiz; }
+.oc-icon-more-vert:before { content: @more-vert; }
+.oc-icon-power:before { content: @power; }
+.oc-icon-power-settings:before { content: @power-settings; }
+.oc-icon-extension:before { content: @extension; }
+.oc-icon-pages:before { content: @pages; }
+.oc-icon-web:before { content: @web; }
+.oc-icon-slideshow:before { content: @slideshow; }
+.oc-icon-style:before { content: @style; }
+.oc-icon-visibility:before { content: @visibility; }
+.oc-icon-visibility-off:before { content: @visibility-off; }
+.oc-icon-copy:before { content: @copy; }
+.oc-icon-cut:before { content: @cut; }
+.oc-icon-paste:before { content: @paste; }
+.oc-icon-page-search:before { content: @page-search; }
+.oc-icon-page-add:before { content: @page-add; }
+.oc-icon-page:before { content: @page; }
+.oc-icon-view-agenda:before { content: @view-agenda; }
+.oc-icon-view-array:before { content: @view-array; }
+.oc-icon-view-carousel:before { content: @view-carousel; }
+.oc-icon-view-column:before { content: @view-column; }
+.oc-icon-view-day:before { content: @view-day; }
+.oc-icon-view-headline:before { content: @view-headline; }
+.oc-icon-view-list:before { content: @view-list; }
+.oc-icon-view-module:before { content: @view-module; }
+.oc-icon-view-quilt:before { content: @view-quilt; }
+.oc-icon-view-stream:before { content: @view-stream; }
+.oc-icon-view-week:before { content: @view-week; }
+.oc-icon-history:before { content: @history; }
+.oc-icon-clock:before { content: @clock; }
+.oc-icon-search:before { content: @search; }
+.oc-icon-exit-app:before { content: @exit-app; }
+.oc-icon-open-browser:before { content: @open-browser; }
+.oc-icon-open-new:before { content: @open-new; }
+.oc-icon-page-content:before { content: @page-content; }
+.oc-icon-search-box:before { content: @search-box; }
+.oc-icon-layers:before { content: @layers; }
+.oc-icon-layers-clear:before { content: @layers-clear; }
.oc-icon-plus-square-o:before { content: @plus-square-o; }
.oc-icon-minus-square-o:before { content: @minus-square-o; }
.oc-icon-minus-square:before { content: @minus-square; }
+.oc-icon-puzzle-piece:before { content: @puzzle-piece; }
.oc-icon-paint-brush:before { content: @paint-brush; }
.oc-icon-institution:before { content: @institution; }
.oc-icon-university:before { content: @university; }
@@ -601,4 +636,17 @@
.oc-icon-times-circle:before { content: @times-circle; }
.oc-icon-times-circle-o:before { content: @times-circle-o; }
.oc-icon-minus:before { content: @minus; }
-.oc-icon-minus-circle:before { content: @minus-circle; }
\ No newline at end of file
+.oc-icon-minus-circle:before { content: @minus-circle; }
+.oc-icon-ellipsis-h:before { content: @ellipsis-h; }
+.oc-icon-ellipsis-v:before { content: @ellipsis-v; }
+.oc-icon-power-off:before { content: @power-off; }
+.oc-icon-eye:before { content: @eye; }
+.oc-icon-eye-slash:before { content: @eye-slash; }
+.oc-icon-clock-o:before { content: @clock-o; }
+.oc-icon-cms-components:before { content: @cms-components; }
+.oc-icon-cms:before { content: @cms; }
+.oc-icon-cms-pages:before { content: @cms-pages; }
+.oc-icon-cms-assets:before { content: @cms-assets; }
+.oc-icon-cms-layouts:before { content: @cms-layouts; }
+.oc-icon-cms-partials:before { content: @cms-partials; }
+.oc-icon-cms-content:before { content: @cms-content; }
\ No newline at end of file
diff --git a/modules/backend/layouts/_mainmenu.htm b/modules/backend/layouts/_mainmenu.htm
index 61e18be3f..0459bcad3 100644
--- a/modules/backend/layouts/_mainmenu.htm
+++ b/modules/backend/layouts/_mainmenu.htm
@@ -34,7 +34,7 @@
data-toggle="tooltip"
data-placement="bottom"
title="">
-
+
diff --git a/modules/cms/ServiceProvider.php b/modules/cms/ServiceProvider.php
index 3c156c53c..d6a6a278d 100644
--- a/modules/cms/ServiceProvider.php
+++ b/modules/cms/ServiceProvider.php
@@ -29,7 +29,7 @@ class ServiceProvider extends ModuleServiceProvider
$manager->registerMenuItems('October.Cms', [
'cms' => [
'label' => 'cms::lang.cms.menu_label',
- 'icon' => 'icon-magic',
+ 'icon' => 'icon-cms',
'url' => Backend::url('cms'),
'permissions' => ['cms.*'],
'order' => 10,
@@ -37,42 +37,42 @@ class ServiceProvider extends ModuleServiceProvider
'sideMenu' => [
'pages' => [
'label' => 'cms::lang.page.menu_label',
- 'icon' => 'icon-copy',
+ 'icon' => 'icon-cms-pages',
'url' => 'javascript:;',
'attributes' => ['data-menu-item'=>'pages'],
'permissions' => ['cms.manage_pages']
],
'partials' => [
'label' => 'cms::lang.partial.menu_label',
- 'icon' => 'icon-tags',
+ 'icon' => 'icon-cms-partials',
'url' => 'javascript:;',
'attributes' => ['data-menu-item'=>'partials'],
'permissions' => ['cms.manage_partials']
],
'layouts' => [
'label' => 'cms::lang.layout.menu_label',
- 'icon' => 'icon-th-large',
+ 'icon' => 'icon-cms-layouts',
'url' => 'javascript:;',
'attributes' => ['data-menu-item'=>'layouts'],
'permissions' => ['cms.manage_layouts']
],
'content' => [
'label' => 'cms::lang.content.menu_label',
- 'icon' => 'icon-file-text-o',
+ 'icon' => 'icon-cms-content',
'url' => 'javascript:;',
'attributes' => ['data-menu-item'=>'content'],
'permissions' => ['cms.manage_content']
],
'assets' => [
'label' => 'cms::lang.asset.menu_label',
- 'icon' => 'icon-picture-o',
+ 'icon' => 'icon-cms-assets',
'url' => 'javascript:;',
'attributes' => ['data-menu-item'=>'assets'],
'permissions' => ['cms.manage_assets']
],
'components' => [
'label' => 'cms::lang.component.menu_label',
- 'icon' => 'icon-puzzle-piece',
+ 'icon' => 'icon-cms-components',
'url' => 'javascript:;',
'attributes' => ['data-menu-item'=>'components'],
'permissions' => ['cms.manage_pages', 'cms:manage_layouts']
diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index e9ef7867a..1ef3a3ea7 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -178,7 +178,7 @@ class ServiceProvider extends ModuleServiceProvider
BackendMenu::registerCallback(function ($manager) {
$manager->registerMenuItems('October.System', [
'system' => [
- 'label' => 'system::lang.system.menu_label',
+ 'label' => 'system::lang.settings.menu_label',
'icon' => 'icon-tune',
'url' => Backend::url('system/settings'),
'permissions' => ['backend.manage_users', 'system.*'],
diff --git a/modules/system/assets/vendor/font-autumn/font/Font-Autumn.eot b/modules/system/assets/vendor/font-autumn/font/fontautumn-webfont.eot
similarity index 80%
rename from modules/system/assets/vendor/font-autumn/font/Font-Autumn.eot
rename to modules/system/assets/vendor/font-autumn/font/fontautumn-webfont.eot
index accc195b4..9a3286558 100644
Binary files a/modules/system/assets/vendor/font-autumn/font/Font-Autumn.eot and b/modules/system/assets/vendor/font-autumn/font/fontautumn-webfont.eot differ
diff --git a/modules/system/assets/vendor/font-autumn/font/Font-Autumn.svg b/modules/system/assets/vendor/font-autumn/font/fontautumn-webfont.svg
similarity index 89%
rename from modules/system/assets/vendor/font-autumn/font/Font-Autumn.svg
rename to modules/system/assets/vendor/font-autumn/font/fontautumn-webfont.svg
index b3f94bb8e..7ec2fec18 100644
--- a/modules/system/assets/vendor/font-autumn/font/Font-Autumn.svg
+++ b/modules/system/assets/vendor/font-autumn/font/fontautumn-webfont.svg
@@ -3,66 +3,113 @@