oreolek/salet
1
0
Fork 0
mirror of https://gitlab.com/Oreolek/salet.git synced 2024-07-04 07:45:03 +03:00
Code Issues Releases Wiki Activity

Styling upgrade, initialization fix

Browse source
This commit is contained in:
Alexander Yakovlev 2016-02-11 12:19:03 +07:00
parent 2b0f714ac0
commit 7e01af67d3
6 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
html/index.html
View file

@ -52,8 +52,9 @@
</div> </div>
<div id="tools_wrapper" class="row"> <div id="tools_wrapper" class="row">
<div class='ways'> <div class='ways'>
<h2>Other rooms</h2> <small class="text-muted" id="ways_hint">Click these links to explore other rooms</small>
<div id="ways"></div> <ul class="nav nav-pills" id="ways">
</ul>
</div> </div>
<div class="menu"> <div class="menu">
<ul class="nav nav-pills"> <ul class="nav nav-pills">

1
lib/salet.coffee
View file

@ -408,7 +408,6 @@ class Salet
else else
@progress.seed = new Date().toString() @progress.seed = new Date().toString()
character = new Character()
@rnd = new Random(@progress.seed) @rnd = new Random(@progress.seed)
@progress.sequence = [{link:@start, when:0}] @progress.sequence = [{link:@start, when:0}]

6
lib/view.coffee
View file

@ -266,14 +266,14 @@ class SaletView
if ways then for way in ways if ways then for way in ways
if salet.rooms[way]? if salet.rooms[way]?
title = salet.rooms[way].title.fcall(this, name) title = salet.rooms[way].title.fcall(this, name)
content += way_to(title, way) content += "<li class='nav-item'><a class='nav-link' href='#{way}'>#{title}</a></li>"
distances.push({ distances.push({
key: way key: way
distance: salet.rooms[way].distance distance: salet.rooms[way].distance
}) })
document.querySelector(".ways h2").style.display = "block" document.querySelector(".ways #ways_hint").style.display = "block"
else else
document.querySelector(".ways h2").style.display = "none" document.querySelector(".ways #ways_hint").style.display = "none"
document.getElementById("ways").innerHTML = content document.getElementById("ways").innerHTML = content
min = Infinity min = Infinity
min_key = [] min_key = []

9
sass/_mixins.scss
View file

@ -1,19 +1,18 @@
@mixin halfcolumn() { @mixin halfcolumn() {
@include make-col(); @include make-col();
@media (min-width: breakpoint-min(sm)) { @media (min-width: breakpoint-min(sm)) {
@include make-col-span(6); @include make-col(6);
} }
@media (max-width: breakpoint-max(xs)) { @media (max-width: breakpoint-max(xs)) {
@include make-col-span(12); @include make-col(12);
} }
} }
@mixin col($sm-width, $xs-width) { @mixin col($sm-width, $xs-width) {
@include make-col;
@media (min-width: breakpoint-min(sm)) { @media (min-width: breakpoint-min(sm)) {
@include make-col-span($sm-width); @include make-col($sm-width);
} }
@media (max-width: breakpoint-max(xs)) { @media (max-width: breakpoint-max(xs)) {
@include make-col-span($xs-width); @include make-col($xs-width);
} }
} }

2
sass/bootstrap

@ -1 +1 @@
Subproject commit 6384789f952c297356a94aded5900d199d09ae87 Subproject commit a1bf344c4f041ad88acaf5b2b3777c733d3afe40

10
sass/main.scss
View file

@ -151,22 +151,20 @@ body {
color: darken($body-color, 10%); color: darken($body-color, 10%);
font-size: smaller; font-size: smaller;
#footleft { #footleft {
@include make-col();
@media (min-width: breakpoint-min(sm)) { @media (min-width: breakpoint-min(sm)) {
@include make-col-span(10); @include make-col(10);
} }
@media (max-width: breakpoint-max(xs)) { @media (max-width: breakpoint-max(xs)) {
@include make-col-span(12); @include make-col(12);
} }
} }
#footright { #footright {
text-align: right; text-align: right;
@include make-col();
@media (min-width: breakpoint-min(sm)) { @media (min-width: breakpoint-min(sm)) {
@include make-col-span(2); @include make-col(2);
} }
@media (max-width: breakpoint-max(xs)) { @media (max-width: breakpoint-max(xs)) {
@include make-col-span(12); @include make-col(12);
margin-bottom: 1em; margin-bottom: 1em;
} }
} }