Toggleable icon sets + logo text overlay fix #1334

This commit is contained in:
Andy Miller
2018-02-16 08:38:12 -07:00
parent 8795b73bc5
commit 2a528ac3bd
14 changed files with 2698 additions and 4 deletions

View File

@@ -1,3 +1,11 @@
# v1.7.0-rc.4
## mm/dd/2018
1. [](#improved)
* Added option to toggle between `line-awesome` and `font-awesome` icon sets [#1334](https://github.com/getgrav/grav-plugin-admin/issues/1334)
1. [](#bugfix)
* Fixed issue with custom logo text overlpapping the sidebar toggle [#1334](https://github.com/getgrav/grav-plugin-admin/issues/1334)
# v1.7.0-rc.3
## 02/15/2018

View File

@@ -29,6 +29,7 @@ frontend_pages_target: _blank
show_github_msg: true
pages_list_display_field: title
google_fonts: false
admin_icons: line-awesome
enable_auto_updates_check: true
notifications:
feed: true

View File

@@ -176,6 +176,15 @@ form:
type: bool
help: Use Google custom fonts. Disable this to use Helvetica. Useful when using Cyrillic and other languages with unsupported characters.
admin_icons:
type: select
size: medium
label: Icon Style
default: line-awesome
options:
line-awesome: Lighter Line Icons (LineAwesome)
font-awesome: Darker Solid Icons (FontAwesome)
show_beta_msg:
type: hidden

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

4
themes/grav/css/font-awesome.min.css vendored Normal file

File diff suppressed because one or more lines are too long

Binary file not shown.

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 434 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -282,7 +282,7 @@ $content-padding: 1.5rem;
}
h3 {
margin: 0;
margin: 0 15px 0 0;
@extend %vertical-align;
text-align: center;
font-size: 1.5rem;

View File

@@ -1,4 +1,5 @@
{% if uri.extension() == 'json' %}{% include 'default.json.twig' %}{% else %}
{% set icon_style = config.plugins.admin.admin_icons %}
<!DOCTYPE html>
<html lang="en">
<head>

View File

@@ -6,7 +6,7 @@
{% else %}
{% do assets.addCss(theme_url~'/css-compiled/simple-fonts.css') %}
{% endif %}
{% do assets.addCss(theme_url~'/css/line-awesome.min.css') %}
{% do assets.addCss(theme_url~'/css/'~icon_style~'.min.css') %}
{% do assets.addCss(theme_url~'/css/chartist.min.css') %}
{% do assets.addCss(theme_url~'/css/selectize.min.css') %}
{% do assets.addCss(theme_url~'/css/hint.base.min.css') %}