Skip to content

Commit

Permalink
Minor fix
Browse files Browse the repository at this point in the history
  • Loading branch information
nearia committed Aug 11, 2017
1 parent 9c95b29 commit 9a8a69c
Show file tree
Hide file tree
Showing 9 changed files with 65 additions and 11 deletions.
2 changes: 1 addition & 1 deletion css/ckeditor.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion css/iabootstrap.css

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions currency-selector.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{if $core.config.currency_switch && count($core.currencies) > 1}
<ul class="nav-inventory pull-left" id="js-currencies-list">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
{$core.currency.title|escape} <span class="caret"></span>
</a>
<ul class="dropdown-menu">
{foreach $core.currencies as $code => $entry}
<li{if $core.currency.code == $code} class="active"{/if}><a href="#" title="{$entry.code}" data-code="{$entry.code}">{$entry.title|escape}</a></li>
{/foreach}
</ul>
</li>
</ul>
{/if}
Binary file modified docs/img/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/img/preview.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions install.xml
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,27 @@
]]>
</block>

<block name="action"
title="Call to action"
position="verytop"
header="1"
collapsible="0"
sticky="0"
pages="index"
status="active"
type="html">
<![CDATA[
<div class="row">
<div class="col-md-9">
<p>You can change this block in admin panel. Remember, if you change template, this block will be lost. We advise you to clone this block. You can change this block in admin panel. Remember, if you change template, this block will be lost. We advise you to clone this block.</p>
</div>
<div class="col-md-3 text-right">
<a href="#" class="btn btn-primary">Learn more</a>
</div>
</div>
]]>
</block>

<block name="top"
title="Top block position"
position="top"
Expand Down
2 changes: 1 addition & 1 deletion less/global.less
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ body {
}

.verytop {
background: #f2f2f2;
padding: @vertical-rhythm 0;
border-bottom: 1px solid @box-bg-color;
}

.content {
Expand Down
23 changes: 23 additions & 0 deletions less/inventory.less
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,29 @@
margin: 0 20px 0 0;
padding: 0;
list-style-type: none;
.dropdown-menu {
border-radius: 4px;
padding: 0;
overflow: hidden;
// >li {
// &:first-child:hover a {
// border-radius: 4px 4px 0 0;
// }
// &:last-child:hover a {
// border-radius: 0 0 4px 4px;
// }
// }
.active {
> a {
color: @dropdown-link-color;
background: darken(@dropdown-link-hover-bg, 5%);
&:hover,
&:focus {
background-color: darken(@dropdown-link-hover-bg, 5%);
}
}
}
}

> li {
float: left;
Expand Down
12 changes: 4 additions & 8 deletions less/navbar.less
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@
width: 100%;
background: fade(@brand-dark, 70%);
.box-shadow(0 1px 6px rgba(0,0,0,.18));
@media (max-width: @grid-float-breakpoint) {
background: fade(@brand-dark, 100%);
}

.navbar-social {
margin: 25px 0 25px 40px;
Expand Down Expand Up @@ -194,14 +197,7 @@
background: #ccc;
border-radius: 4px;
padding: 0;
>li {
&:first-child:hover a {
border-radius: 4px 4px 0 0;
}
&:last-child:hover a {
border-radius: 0 0 4px 4px;
}
}
overflow: hidden;
> li > a {
font-weight: 600;
}
Expand Down

0 comments on commit 9a8a69c

Please sign in to comment.