Skip to content

Commit

Permalink
add general navigation
Browse files Browse the repository at this point in the history 
- adds general navigation to non-exercise pages.
- updates the page links design in the exercise links.
  • Loading branch information
@SethClydesdale
SethClydesdale committed Oct 19, 2024
1 parent 110a6ee commit fe47152
Show file tree
Hide file tree
Showing 20 changed files with 222 additions and 155 deletions.
1 change: 1 addition & 0 deletions donate/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,6 @@ <h2 class="title center" id="donate">Donate</h2>
</footer>

<script src="../resources/javascript/all.min.js"></script>
<script src="../resources/javascript/genki.min.js"></script>
</body>
</html>
1 change: 1 addition & 0 deletions download/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,6 @@ <h3 id="help-and-bugs">Help and Bugs</h3>
</footer>

<script src="../resources/javascript/all.min.js"></script>
<script src="../resources/javascript/genki.min.js"></script>
</body>
</html>
1 change: 1 addition & 0 deletions help/broken-icons/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,6 @@ <h3 class="section-title" id="install-failed">Icons are Still Broken</h3>
</footer>

<script src="../../resources/javascript/all.min.js"></script>
<script src="../../resources/javascript/genki.min.js"></script>
</body>
</html>
1 change: 1 addition & 0 deletions help/dictionaries/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,6 @@ <h3 class="section-title" id="programs">Useful Programs</h3>
</footer>

<script src="../../resources/javascript/all.min.js"></script>
<script src="../../resources/javascript/genki.min.js"></script>
</body>
</html>
1 change: 1 addition & 0 deletions help/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,6 @@ <h3 class="sub-title" id="tobira-help-topics">Help Topics</h3>
</footer>

<script src="../resources/javascript/all.min.js"></script>
<script src="../resources/javascript/genki.min.js"></script>
</body>
</html>
1 change: 1 addition & 0 deletions help/japanese-guide/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,5 +132,6 @@ <h4 class="sub-title" id="other">Other Resources - <a href="https://github.com/s
</footer>

<script src="../../resources/javascript/all.min.js"></script>
<script src="../../resources/javascript/genki.min.js"></script>
</body>
</html>
1 change: 1 addition & 0 deletions help/missing-exercises/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,6 @@ <h2 class="title center" id="tobira-icon-help">About Missing Exercises</h2>
</footer>

<script src="../../resources/javascript/all.min.js"></script>
<script src="../../resources/javascript/genki.min.js"></script>
</body>
</html>
1 change: 1 addition & 0 deletions help/stuck-loading/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,6 @@ <h3 class="section-title" id="install-failed">My Settings are Still not Saving/E
</footer>

<script src="../../resources/javascript/all.min.js"></script>
<script src="../../resources/javascript/genki.min.js"></script>
</body>
</html>
1 change: 1 addition & 0 deletions help/study-guide/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,6 @@ <h3 class="section-title" id="study-routine">Study Routine</h3>
</footer>

<script src="../../resources/javascript/all.min.js"></script>
<script src="../../resources/javascript/genki.min.js"></script>
</body>
</html>
1 change: 1 addition & 0 deletions help/vocab-memorization/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,6 @@ <h2 class="title center" id="tobira-vocab-help">Vocab Memorization Tips</h2>
</footer>

<script src="../../resources/javascript/all.min.js"></script>
<script src="../../resources/javascript/genki.min.js"></script>
</body>
</html>
1 change: 1 addition & 0 deletions help/writing/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ <h4 class="sub-title" id="microsoft-kanji">Typing Kanji</h4>
</footer>

<script src="../../resources/javascript/all.min.js"></script>
<script src="../../resources/javascript/genki.min.js"></script>
<style>
#GenkiTestarea {
position:fixed;
Expand Down
3 changes: 2 additions & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ <h3><i class="fa">&#xf0a1;</i> News and Info</h3>

<div id="content">
<div id="lessons" class="content-block">
<h2 class="title center" id="edition-title">Tobira Exercises</h2>
<h2 class="title center" id="main-title">Tobira Exercises</h2>

<p>Welcome to Tobira Study Resources! The exercises provided here are for use with <a href="https://tobiraweb.9640.jp/">Tobira: Gateway to Advanced Japanese</a> textbooks and are meant to help you practice what you have learned in each lesson. Select a lesson from the quick navigation and then the exercise that you want to practice for that lesson to begin testing your knowledge. Happy studying!</p>

Expand Down Expand Up @@ -942,5 +942,6 @@ <h2 id="extras" class="lesson-title">巻末とツール</h2>

<script src="resources/javascript/homepage.min.js"></script>
<script src="resources/javascript/all.min.js"></script>
<script src="resources/javascript/genki.min.js"></script>
</body>
</html>
1 change: 1 addition & 0 deletions privacy/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,6 @@ <h2 class="section-title" id="privacy-contact">Contacting Us</h2>
</footer>

<script src="../resources/javascript/all.min.js"></script>
<script src="../resources/javascript/genki.min.js"></script>
</body>
</html>
1 change: 1 addition & 0 deletions report/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,5 +112,6 @@ <h2 class="section-title" id="report-other">General Feedback</h2>
</footer>

<script src="../resources/javascript/all.min.js"></script>
<script src="../resources/javascript/genki.min.js"></script>
</body>
</html>
20 changes: 19 additions & 1 deletion resources/css/stylesheet.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ h1:hover .anchor-icon, h2:hover .anchor-icon, h3:hover .anchor-icon, h4:hover .a
/* link list */
#page-links, #related-projects { margin:15px 0 0 0; }
#link-list { font-size:0; }
#link-list span { font-size:14px; }
#link-list span, #link-list a { font-size:14px; }

#link-list a {
color:#FFF;
Expand All @@ -464,6 +464,7 @@ h1:hover .anchor-icon, h2:hover .anchor-icon, h3:hover .anchor-icon, h4:hover .a
margin:10px 10px 0 0;
}

#link-home.button { border-bottom:2px solid #058; }
#link-grammar { background-color:#F93; border-bottom:2px solid #D71; }
#link-anki { background-color:#05C; border-bottom:2px solid #03A; }
#link-help { background-color:#39C; border-bottom:2px solid #17A; }
Expand Down Expand Up @@ -504,12 +505,29 @@ h1:hover .anchor-icon, h2:hover .anchor-icon, h3:hover .anchor-icon, h4:hover .a
}
#link-github i, #link-help i { font-size:18px; }

#exercise-list #page-links {
margin:0;
padding:0;
}

#exercise-list .indent-block { margin-left:10px; }

/* related projects */
#project-list img {
height:120px;
margin:10px 4px 0 0;
}

#related img {
height:120px;
margin:5px;
}

#related h3 {
margin-top:20px;
margin-bottom:5px;
}

/* quick navigation and quick search */
#quick-actions > div { margin:0; }
#quick-actions h2 {
Expand Down
2 changes: 1 addition & 1 deletion resources/css/stylesheet.min.css
View file

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions resources/javascript/exercises/tobira.js
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
window.GenkiExercises = [
// Page links
'../../../|Home',
'../../../help/|Help & FAQ',
'../../../report/|Bug Reports & Feedback',
'../../../download/|Download',
'../../../donate/|Donate',

// Lesson 1
'lesson-1/vocab-1|単語：読み物・その1|p.6',
'lesson-1/vocab-2|単語：読み物・その2|p.6-7',
Expand Down
2 changes: 1 addition & 1 deletion resources/javascript/exercises/tobira.min.js
View file

Large diffs are not rendered by default.

Loading

0 comments on commit fe47152

Please sign in to comment.