Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Font Awesome 4 to 6 #551

Merged
merged 11 commits into from
May 11, 2022
Merged

Upgrade Font Awesome 4 to 6 #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bd3401f
Upgrade Font Awesome 4 to 6
bennothommo May 6, 2022
afb9ae8
Fix shimmed icons, remove some CSS variables, recompile
bennothommo May 6, 2022
ad47043
Remove extra license file
bennothommo May 7, 2022
1b3e01e
Merge branch 'wip/1.2' into wip/1.2-font-awesome-6
bennothommo May 11, 2022
47e01dc
Remove explicit links to icon LESS file.
bennothommo May 11, 2022
af9876b
Compile icon styling into separate CSS file
bennothommo May 11, 2022
8c9de1b
Load separate icon file in Backend pages
bennothommo May 11, 2022
1a6ab95
Move icons into root UI folder.
bennothommo May 11, 2022
2df04a7
Fix font location
bennothommo May 11, 2022
3e42463
Load a subset of icons for the exception / message views
bennothommo May 11, 2022
eb37a26
Add docs for icons
bennothommo May 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions modules/backend/assets/css/winter.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@ html.mobile .control-scrollbar{overflow:auto;-webkit-overflow-scrolling:touch}
.control-filelist ul li.group>h4 a:after,
.control-filelist ul li.group>div.group>h4 a:after{width:10px;height:10px;display:block;position:absolute;top:1px}
.control-filelist ul li.group>h4 a:after,
.control-filelist ul li.group>div.group>h4 a:after{left:33px;top:9px;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;content:"\f07b";color:#a1aab1;font-size:16px}
.control-filelist ul li.group>div.group>h4 a:after{left:33px;top:9px;font-family:"Font Awesome 6 Free";font-weight:900;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-style:normal;font-variant:normal;text-rendering:auto;content:"\f07b";color:#a1aab1;font-size:16px}
.control-filelist ul li.group>h4 a:before,
.control-filelist ul li.group>div.group>h4 a:before{left:20px;top:9px;color:#cfcfcf;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;content:"\f0da";-webkit-transform:rotate(90deg) translate(5px,0);-ms-transform:rotate(90deg) translate(5px,0);transform:rotate(90deg) translate(5px,0);-webkit-transition:all 0.1s ease;transition:all 0.1s ease}
.control-filelist ul li.group>div.group>h4 a:before{left:20px;top:9px;color:#cfcfcf;font-family:"Font Awesome 6 Free";font-weight:900;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-style:normal;font-variant:normal;text-rendering:auto;content:"\f0da";-webkit-transform:rotate(90deg) translate(5px,0);-ms-transform:rotate(90deg) translate(5px,0);transform:rotate(90deg) translate(5px,0);-webkit-transition:all 0.1s ease;transition:all 0.1s ease}
.control-filelist ul li.group>ul>li>a{padding-left:52px}
.control-filelist ul li.group>ul>li.group{padding-left:20px}
.control-filelist ul li.group>ul>li.group>ul>li>a{padding-left:324px;margin-left:-270px}
Expand Down Expand Up @@ -283,18 +283,18 @@ html.mobile .control-scrollbar{overflow:auto;-webkit-overflow-scrolling:touch}
.control-treelist>ol>li>div.record:before{display:none}
.control-treelist li{margin:0;padding:0}
.control-treelist li>div.record{margin:0;font-size:12px;margin-bottom:5px;position:relative;display:block}
.control-treelist li>div.record:before{color:#bdc3c7;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;content:"\f111";font-size:6px;position:absolute;left:-18px;top:11px}
.control-treelist li>div.record:before{color:#bdc3c7;font-family:"Font Awesome 6 Free";font-weight:900;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-style:normal;font-variant:normal;text-rendering:auto;content:"\f111";font-size:6px;position:absolute;left:-18px;top:11px}
.control-treelist li>div.record>a.move{display:inline-block;padding:7px 0 7px 10px;text-decoration:none;color:#bdc3c7}
.control-treelist li>div.record>a.move:hover{color:#4ea5e0}
.control-treelist li>div.record>a.move:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;content:"\f0c9"}
.control-treelist li>div.record>a.move:before{font-family:"Font Awesome 6 Free";font-weight:900;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-style:normal;font-variant:normal;text-rendering:auto;content:"\f0c9"}
.control-treelist li>div.record>span{color:#666;display:inline-block;padding:7px 15px 7px 5px}
.control-treelist li.dragged{position:absolute;z-index:2000;width:auto !important;height:auto !important}
.control-treelist li.dragged>div.record{opacity:0.5;filter:alpha(opacity=50);background:#4ea5e0 !important}
.control-treelist li.dragged>div.record>a.move:before,
.control-treelist li.dragged>div.record>span{color:white}
.control-treelist li.dragged>div.record:before{display:none}
.control-treelist li.placeholder{display:inline-block;position:relative;background:#4ea5e0 !important;height:25px;margin-bottom:5px}
.control-treelist li.placeholder:before{display:block;position:absolute;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;content:"\f053";color:#d35714;left:-10px;top:8px;z-index:2000}
.control-treelist li.placeholder:before{display:block;position:absolute;font-family:"Font Awesome 6 Free";font-weight:900;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-style:normal;font-variant:normal;text-rendering:auto;content:"\f053";color:#d35714;left:-10px;top:8px;z-index:2000}
.control-treeview{margin-bottom:40px}
.control-treeview ol{margin:0;padding:0;list-style:none;background:#fff}
.control-treeview ol>li{-webkit-transition:width 1s;transition:width 1s}
Expand All @@ -303,9 +303,9 @@ html.mobile .control-scrollbar{overflow:auto;-webkit-overflow-scrolling:touch}
.control-treeview ol>li>div:before{content:' ';background-image:url(../images/treeview-icons.png);background-position:0 -28px;background-repeat:no-repeat;background-size:42px auto;position:absolute;width:21px;height:22px;left:28px;top:15px}
.control-treeview ol>li>div span.comment{display:block;font-weight:400;color:#95a5a6;font-size:13px;margin-top:2px;overflow:hidden;text-overflow:ellipsis}
.control-treeview ol>li>div>span.expand{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0;display:none;position:absolute;width:20px;height:20px;top:19px;left:2px;cursor:pointer;color:#bdc3c7;-webkit-transition:transform 0.1s ease;transition:transform 0.1s ease}
.control-treeview ol>li>div>span.expand:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;content:"\f0da";line-height:100%;font-size:15px;position:relative;left:8px;top:2px}
.control-treeview ol>li>div>span.expand:before{font-family:"Font Awesome 6 Free";font-weight:900;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-style:normal;font-variant:normal;text-rendering:auto;content:"\f0da";line-height:100%;font-size:15px;position:relative;left:8px;top:2px}
.control-treeview ol>li>div>span.drag-handle{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0;-webkit-transition:opacity 0.4s;transition:opacity 0.4s;position:absolute;right:9px;bottom:0;width:18px;height:19px;cursor:move;color:#bdc3c7;opacity:0;filter:alpha(opacity=0)}
.control-treeview ol>li>div>span.drag-handle:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;content:"\f0c9";font-size:18px}
.control-treeview ol>li>div>span.drag-handle:before{font-family:"Font Awesome 6 Free";font-weight:900;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-style:normal;font-variant:normal;text-rendering:auto;content:"\f0c9";font-size:18px}
.control-treeview ol>li>div span.borders{font-size:0}
.control-treeview ol>li>div>ul.submenu{position:absolute;left:20px;bottom:-36.9px;padding:0;list-style:none;z-index:200;height:37px;display:none;margin-left:15px;background:transparent url(../images/treeview-submenu-tabs.png) repeat-x left -39px}
.control-treeview ol>li>div>ul.submenu:before,
Expand Down Expand Up @@ -456,7 +456,7 @@ body.dragging .control-treeview.treeview-light ol.dragging ol>li>div{background-
.sidenav-tree ul.top-level>li[data-status=collapsed] ul{display:none}
.sidenav-tree ul.top-level>li>div.group{position:relative}
.sidenav-tree ul.top-level>li>div.group h3{background:rgba(0,0,0,0.15);color:#ecf0f1;text-transform:uppercase;font-size:15px;padding:15px 15px 15px 40px;margin:0;position:relative;cursor:pointer;font-weight:400}
.sidenav-tree ul.top-level>li>div.group h3:before{display:block;position:absolute;width:10px;height:10px;left:16px;top:15px;color:#cfcfcf;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;content:"\f105";-webkit-transform:rotate(90deg) translate(5px,-3px);-ms-transform:rotate(90deg) translate(5px,-3px);transform:rotate(90deg) translate(5px,-3px);-webkit-transition:all 0.1s ease;transition:all 0.1s ease;font-size:16px}
.sidenav-tree ul.top-level>li>div.group h3:before{display:block;position:absolute;width:10px;height:10px;left:16px;top:15px;color:#cfcfcf;font-family:"Font Awesome 6 Free";font-weight:900;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-style:normal;font-variant:normal;text-rendering:auto;content:"\f105";-webkit-transform:rotate(90deg) translate(5px,-3px);-ms-transform:rotate(90deg) translate(5px,-3px);transform:rotate(90deg) translate(5px,-3px);-webkit-transition:all 0.1s ease;transition:all 0.1s ease;font-size:16px}
.sidenav-tree ul.top-level>li>div.group:before,
.sidenav-tree ul.top-level>li>div.group:after{content:'';display:block;width:0;height:0;border-left:7.5px solid transparent;border-right:7.5px solid transparent;border-top:8px solid #34495e;border-bottom-width:0;position:absolute;left:15px;bottom:-8px;z-index:101}
.sidenav-tree ul.top-level>li>div.group:after{content:'';display:block;width:0;height:0;border-left:7.5px solid transparent;border-right:7.5px solid transparent;border-top:8px solid rgba(0,0,0,0.15);border-bottom-width:0}
Expand Down Expand Up @@ -502,7 +502,7 @@ div.panel>label{margin-bottom:5px}
div.panel .nav.selector-group{margin:0 -20px 20px -20px}
ul.tree-path{list-style:none;padding:0;margin-bottom:0}
ul.tree-path li{display:inline-block;margin-right:1px;font-size:13px}
ul.tree-path li:after{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;content:"\f105";display:inline-block;font-size:13px;margin-left:5px;position:relative;top:1px;color:#95a5a6}
ul.tree-path li:after{font-family:"Font Awesome 6 Free";font-weight:900;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-style:normal;font-variant:normal;text-rendering:auto;content:"\f105";display:inline-block;font-size:13px;margin-left:5px;position:relative;top:1px;color:#95a5a6}
ul.tree-path li:last-child a{cursor:default}
ul.tree-path li:last-child:after{display:none}
ul.tree-path li.go-up{font-size:12px;margin-right:7px}
Expand Down Expand Up @@ -787,7 +787,7 @@ nav#layout-mainmenu.navbar-mode-collapse .menu-toggle{display:inline-block;color
.mainmenu-collapsed>div ul li a i{line-height:1;font-size:30px;vertical-align:middle}
.mainmenu-collapsed>div ul li a img.svg-icon{height:30px;width:30px;position:relative;top:0}
.mainmenu-collapsed .scroll-marker{position:absolute;left:0;width:100%;height:10px;display:none}
.mainmenu-collapsed .scroll-marker:after{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;content:"\f141";display:block;position:absolute;left:50%;margin-left:-3px;top:0;height:9px;font-size:10px;color:rgba(255,255,255,0.6)}
.mainmenu-collapsed .scroll-marker:after{font-family:"Font Awesome 6 Free";font-weight:900;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-style:normal;font-variant:normal;text-rendering:auto;content:"\f141";display:block;position:absolute;left:50%;margin-left:-3px;top:0;height:9px;font-size:10px;color:rgba(255,255,255,0.6)}
.mainmenu-collapsed .scroll-marker.before{top:0}
.mainmenu-collapsed .scroll-marker.after{bottom:3px}
.mainmenu-collapsed .scroll-marker.after:after{top:2px}
Expand Down Expand Up @@ -951,7 +951,7 @@ body.breadcrumb-fancy .control-breadcrumb li:last-child:before,
.fancy-layout .control-tabs.master-tabs>div>div.tabs-container>ul.nav-tabs>li[data-modified] span.tab-close i,
.fancy-layout.control-tabs.master-tabs>div>div.tabs-container>ul.nav-tabs>li[data-modified] span.tab-close i{top:5px;font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}
.fancy-layout .control-tabs.master-tabs>div>div.tabs-container>ul.nav-tabs>li[data-modified] span.tab-close i:before,
.fancy-layout.control-tabs.master-tabs>div>div.tabs-container>ul.nav-tabs>li[data-modified] span.tab-close i:before{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;content:"\f111";font-size:9px}
.fancy-layout.control-tabs.master-tabs>div>div.tabs-container>ul.nav-tabs>li[data-modified] span.tab-close i:before{font-family:"Font Awesome 6 Free";font-weight:900;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;font-style:normal;font-variant:normal;text-rendering:auto;content:"\f111";font-size:9px}
.fancy-layout .control-tabs.master-tabs>div>div.tabs-container>ul.nav-tabs>li:first-child,
.fancy-layout.control-tabs.master-tabs>div>div.tabs-container>ul.nav-tabs>li:first-child{margin-left:0}
.fancy-layout .control-tabs.master-tabs[data-closable]>div>div.tabs-container>ul.nav-tabs>li a>span.title,
Expand Down
2 changes: 1 addition & 1 deletion modules/backend/formwidgets/fileupload/assets/css/fileupload.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions modules/backend/formwidgets/repeater/assets/css/repeater.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions modules/backend/layouts/_head.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
// Styles
$styles = [
Url::asset('modules/system/assets/ui/storm.css'),
Url::asset('modules/system/assets/ui/icons.css'),
Backend::skinAsset('assets/css/winter.css'),
];

Expand Down
1 change: 1 addition & 0 deletions modules/backend/layouts/auth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
$coreBuild = System\Models\Parameter::get('system::core.build', 1);
$styles = [
Url::asset('modules/system/assets/ui/storm.css'),
Url::asset('modules/system/assets/ui/icons.css'),
Backend::skinAsset('assets/css/winter.css'),
];
$scripts = [
Expand Down
Loading