Skip to content
This repository has been archived by the owner on Feb 23, 2021. It is now read-only.

[*] Use .icon-fw for menu icons. Resolves #120 #122

Merged
merged 2 commits into from
Feb 9, 2016
Merged

[*] Use .icon-fw for menu icons. Resolves #120 #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea69298
[*] MO: Move sass folder to views/
Feb 9, 2016
e8991c3
[*] FO: Use .icon-fw class for fixed width icons in menu
Feb 9, 2016
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
2 changes: 1 addition & 1 deletion modules/cttopmenu/config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Set this to the root of your project when deployed:
http_path = "/"
css_dir = "views/css"
sass_dir = "sass"
sass_dir = "views/sass"
images_dir = "img"
javascripts_dir = "views/js"
fonts_dir = "fonts"
Expand Down
4 changes: 0 additions & 4 deletions modules/cttopmenu/views/css/fo.css
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions modules/cttopmenu/views/css/fo.css.map
View file
Open in desktop

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

6 changes: 0 additions & 6 deletions modules/cttopmenu/sass/fo.scss → modules/cttopmenu/views/sass/fo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
margin-top: 15px;
}

.cttm-link {
.icon {
min-width: 1em ;
}
}

// @TODO Better solution
@media (min-width: 768px) {
#cttopmenu-navbar-collapse {
Expand Down
0 modules/cttopmenu/sass/vendor/_yamm.scss → ...es/cttopmenu/views/sass/vendor/_yamm.scss
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions modules/cttopmenu/views/templates/hook/cttopmenu.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<li class="cttm-item-{$menu_item.type|escape:'html':'UTF-8'}{if !empty($menu_item.class)} {$menu_item.class|escape:'html':'UTF-8'}{/if}">
<a id="cttm-item-{$menu_item.id|escape:'html':'UTF-8'}" href="{$menu_item.url|escape:'html':'UTF-8'}" class="cttm-link" title="{$menu_item.title|escape:'html':'UTF-8'}"{if $menu_item.no_follow} rel="nofollow"{/if}>
{if !empty($menu_item.icon)}<i class="icon icon-{$menu_item.icon|escape:'html':'UTF-8'}"></i>{/if}
{if !empty($menu_item.icon)}<i class="icon icon-fw icon-{$menu_item.icon|escape:'html':'UTF-8'}"></i>{/if}
{$menu_item.name|escape:'html':'UTF-8'}
</a>
</li>
Expand All @@ -33,7 +33,7 @@

<li class="dropdown yamm-fw cttm-item-{$menu_item.type|escape:'html':'UTF-8'}{if !empty($menu_item.class)} {$menu_item.class|escape:'html':'UTF-8'}{/if}">
<a id="cttm-item-{$menu_item.id|escape:'html':'UTF-8'}" href="{$menu_item.url|escape:'html':'UTF-8'}" data-toggle="dropdown" class="dropdown-toggle cttm-link" aria-expanded="false" title="{$menu_item.title|escape:'html':'UTF-8'}"{if $menu_item.no_follow} rel="nofollow"{/if}>
{if !empty($menu_item.icon)}<i class="icon icon-{$menu_item.icon|escape:'html':'UTF-8'}"></i>{/if}
{if !empty($menu_item.icon)}<i class="icon icon-fw icon-{$menu_item.icon|escape:'html':'UTF-8'}"></i>{/if}
{$menu_item.name|escape:'html':'UTF-8'}<b class="caret"></b>
</a>
<ul class="dropdown-menu">
Expand Down