Skip to content
This repository was archived by the owner on May 9, 2022. It is now read-only.

Commit feb8dc9

Browse files
authored
Merge pull request #836 from ucam-cl-dtg/feature/temporary-chemistry-book-navigation, see issue #837
Feature/temporary chemistry book navigation
2 parents 8437435 + f98239f commit feb8dc9

File tree

4 files changed

+24
-2
lines changed

4 files changed

+24
-2
lines changed

app/css/app.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/css/app.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/partials/header.html

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@
2121
</div>
2222
</div>
2323
<div class='padded-right-float text-right'>
24+
<a class='ru-desktop-nav-item' ui-sref='chemistry'>
25+
<div id="chemistry-tab-desktop" class='ru-desktop-nav-item-inner' ng-class="{active: $state.includes('chemistry')}">
26+
<span class="multiline">Isaac Chemistry</span>
27+
</div>
28+
</a>
2429
<a class='ru-desktop-nav-item' ui-sref='gameBoards({filter: true})'>
2530
<div id="questions-tab-desktop" class='ru-desktop-nav-item-inner' ng-class="{active: $state.includes('gameBoards') || $state.includes('question')}">
2631
<span>Questions</span>
@@ -78,6 +83,11 @@
7883
data-interchange="[/assets/isaac-logo.png, (small)], [/assets/isaac-logo@2x.png, (small_retina)]" src='/assets/isaac-logo.png'></a>
7984
<div ng-if="segueEnvironment=='DEV'" class="ru-mobile-logo-dev">Non-Prod x({{user.givenName}} {{user.familyName}})</div>
8085
<div class="ru-mobile-nav-container">
86+
<a class='ru-mobile-nav-item' ui-sref='chemistry'>
87+
<div ng-class="{'ru-mobile-nav-item-inner': true, active: $state.includes('chemistry')}">
88+
<span class="multiline">Isaac Chemistry</span>
89+
</div>
90+
</a>
8191
<a class='ru-mobile-nav-item' ui-sref='gameBoards'>
8292
<div ng-class="{'ru-mobile-nav-item-inner': true, active: $state.includes('gameBoards') || $state.includes('question')}">
8393
<span>Questions</span>

scss/_ru_header.scss

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,12 @@ $ru_nav_size : 7em;
6464
font-style: italic;
6565
font-weight: 300;
6666
color: #333333;
67+
68+
&.multiline {
69+
display: -ms-inline-flexbox;
70+
display: inline-flex;
71+
top: 2.5em;
72+
}
6773
}
6874
.ru-desktop-nav-item-inner:hover
6975
{
@@ -276,6 +282,12 @@ $ru_nav_size : 7em;
276282
position: relative;
277283
font-size: 1.0em;
278284
display: inline-block;
285+
286+
&.multiline {
287+
display: -ms-inline-flexbox;
288+
display: inline-flex;
289+
top: 2.5em;
290+
}
279291
}
280292

281293
.ru-search-bg {

0 commit comments

Comments
 (0)