TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes active menu selection on demo 

Fixes https://github.com/octobercms/october/issues/65
This commit is contained in:
Sam Georges 2014-05-16 10:32:04 +10:00
parent b3d1da8524
commit f30eefd04a
4 changed files with 939 additions and 1142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2051
themes/demo/assets/css/theme.css
View File

File diff suppressed because it is too large Load Diff

10
themes/demo/assets/less/theme/fonts.less
View File

@ -46,4 +46,14 @@
url('../fonts/lato-light-webfont.ttf') format('truetype');
font-weight: 300;
font-style: normal;
}
//
// Chrome exhibits strange behavior when custom fonts are used
// on select inputs. This fixes the garbled text.
//
@media screen and (-webkit-min-device-pixel-ratio:0) {
select {
font-family: sans-serif;
}
}

8
themes/demo/layouts/default.htm
View File

@ -31,9 +31,9 @@ description = "Default layout"
</div>
<div class="collapse navbar-collapse navbar-main-collapse">
<ul class="nav navbar-nav">
<li class="{% if page.url == '/' %}active{% endif %}"><a href="{{ 'home'|page }}">Basic concepts</a></li>
<li class="{% if page.url == '/ajax' %}active{% endif %}"><a href="{{ 'ajax'|page }}">AJAX framework</a></li>
<li class="{% if page.url == '/plugins' %}active{% endif %}"><a href="{{ 'plugins'|page }}">Plugin components</a></li>
<li class="{% if this.page.id == 'home' %}active{% endif %}"><a href="{{ 'home'|page }}">Basic concepts</a></li>
<li class="{% if this.page.id == 'ajax' %}active{% endif %}"><a href="{{ 'ajax'|page }}">AJAX framework</a></li>
<li class="{% if this.page.id == 'plugins' %}active{% endif %}"><a href="{{ 'plugins'|page }}">Plugin components</a></li>
</ul>
</div>
</div>
@ -53,7 +53,7 @@ description = "Default layout"
<!-- Scripts -->
<script src="{{ [
'assets/javascript/jquery.js',
'assets/javascript/jquery.js',
'assets/javascript/app.js'
]|theme }}"></script>
{% framework extras %}

12
themes/demo/partials/calcresult.htm
View File

@ -1,9 +1,9 @@
{% if result %}
<span class="lead">
The result is <span class="label label-success">{{ result }}</span>
</span>
<span class="lead">
The result is <span class="label label-success">{{ result }}</span>
</span>
{% else %}
<span class="text-muted">
Click the <em>Calculate</em> button to find the answer.
</span>
<span class="text-muted">
Click the <em>Calculate</em> button to find the answer.
</span>
{% endif %}