mirror of
https://gitlab.com/Oreolek/salet.git
synced 2024-07-02 06:45:06 +03:00
Styling upgrade, initialization fix
This commit is contained in:
parent
2b0f714ac0
commit
7e01af67d3
|
@ -52,8 +52,9 @@
|
|||
</div>
|
||||
<div id="tools_wrapper" class="row">
|
||||
<div class='ways'>
|
||||
<h2>Other rooms</h2>
|
||||
<div id="ways"></div>
|
||||
<small class="text-muted" id="ways_hint">Click these links to explore other rooms</small>
|
||||
<ul class="nav nav-pills" id="ways">
|
||||
</ul>
|
||||
</div>
|
||||
<div class="menu">
|
||||
<ul class="nav nav-pills">
|
||||
|
|
|
@ -408,7 +408,6 @@ class Salet
|
|||
else
|
||||
@progress.seed = new Date().toString()
|
||||
|
||||
character = new Character()
|
||||
@rnd = new Random(@progress.seed)
|
||||
@progress.sequence = [{link:@start, when:0}]
|
||||
|
||||
|
|
|
@ -266,14 +266,14 @@ class SaletView
|
|||
if ways then for way in ways
|
||||
if salet.rooms[way]?
|
||||
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({
|
||||
key: way
|
||||
distance: salet.rooms[way].distance
|
||||
})
|
||||
document.querySelector(".ways h2").style.display = "block"
|
||||
document.querySelector(".ways #ways_hint").style.display = "block"
|
||||
else
|
||||
document.querySelector(".ways h2").style.display = "none"
|
||||
document.querySelector(".ways #ways_hint").style.display = "none"
|
||||
document.getElementById("ways").innerHTML = content
|
||||
min = Infinity
|
||||
min_key = []
|
||||
|
|
|
@ -1,19 +1,18 @@
|
|||
@mixin halfcolumn() {
|
||||
@include make-col();
|
||||
@media (min-width: breakpoint-min(sm)) {
|
||||
@include make-col-span(6);
|
||||
@include make-col(6);
|
||||
}
|
||||
@media (max-width: breakpoint-max(xs)) {
|
||||
@include make-col-span(12);
|
||||
@include make-col(12);
|
||||
}
|
||||
}
|
||||
@mixin col($sm-width, $xs-width) {
|
||||
@include make-col;
|
||||
@media (min-width: breakpoint-min(sm)) {
|
||||
@include make-col-span($sm-width);
|
||||
@include make-col($sm-width);
|
||||
}
|
||||
@media (max-width: breakpoint-max(xs)) {
|
||||
@include make-col-span($xs-width);
|
||||
@include make-col($xs-width);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 6384789f952c297356a94aded5900d199d09ae87
|
||||
Subproject commit a1bf344c4f041ad88acaf5b2b3777c733d3afe40
|
|
@ -151,22 +151,20 @@ body {
|
|||
color: darken($body-color, 10%);
|
||||
font-size: smaller;
|
||||
#footleft {
|
||||
@include make-col();
|
||||
@media (min-width: breakpoint-min(sm)) {
|
||||
@include make-col-span(10);
|
||||
@include make-col(10);
|
||||
}
|
||||
@media (max-width: breakpoint-max(xs)) {
|
||||
@include make-col-span(12);
|
||||
@include make-col(12);
|
||||
}
|
||||
}
|
||||
#footright {
|
||||
text-align: right;
|
||||
@include make-col();
|
||||
@media (min-width: breakpoint-min(sm)) {
|
||||
@include make-col-span(2);
|
||||
@include make-col(2);
|
||||
}
|
||||
@media (max-width: breakpoint-max(xs)) {
|
||||
@include make-col-span(12);
|
||||
@include make-col(12);
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue