Merge branch 'various-css-fixes' into shigusegubu
* various-css-fixes: fix play-on-hover gifs issues fix preview spinner Refactor desktop navbar into a component, change layout to grid for better compatibility with search field and simpler CSS
This commit is contained in:
commit
dcc01511a8
2 changed files with 75 additions and 68 deletions
|
@ -1,15 +1,20 @@
|
||||||
@import '../../_variables.scss';
|
@import '../../_variables.scss';
|
||||||
|
|
||||||
.DesktopNav {
|
.DesktopNav {
|
||||||
display: grid;
|
|
||||||
height: 50px;
|
height: 50px;
|
||||||
|
width: 100%;
|
||||||
|
position: fixed;
|
||||||
|
|
||||||
|
.inner-nav {
|
||||||
|
display: grid;
|
||||||
grid-template-rows: 50px;
|
grid-template-rows: 50px;
|
||||||
grid-template-columns: 2fr auto 2fr;
|
grid-template-columns: 2fr auto 2fr;
|
||||||
grid-template-areas: "sitename logo actions";
|
grid-template-areas: "sitename logo actions";
|
||||||
width: 100%;
|
|
||||||
position: fixed;
|
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 0 1.2em;
|
padding: 0 1.2em;
|
||||||
|
margin: auto;
|
||||||
|
max-width: 980px;
|
||||||
|
}
|
||||||
|
|
||||||
&.-logoLeft {
|
&.-logoLeft {
|
||||||
grid-template-columns: auto 2fr 2fr;
|
grid-template-columns: auto 2fr 2fr;
|
||||||
|
@ -17,7 +22,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
button {
|
button {
|
||||||
&, i[class*=icon-], svg {
|
&, svg {
|
||||||
color: $fallback--text;
|
color: $fallback--text;
|
||||||
color: var(--btnTopBarText, $fallback--text);
|
color: var(--btnTopBarText, $fallback--text);
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
:class="{ '-logoLeft': logoLeft }"
|
:class="{ '-logoLeft': logoLeft }"
|
||||||
@click="scrollToTop()"
|
@click="scrollToTop()"
|
||||||
>
|
>
|
||||||
|
<div class="inner-nav">
|
||||||
<div class="item sitename">
|
<div class="item sitename">
|
||||||
<router-link
|
<router-link
|
||||||
v-if="!hideSitename"
|
v-if="!hideSitename"
|
||||||
|
@ -70,6 +71,7 @@
|
||||||
:title="$t('login.logout')"
|
:title="$t('login.logout')"
|
||||||
/></a>
|
/></a>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
</template>
|
</template>
|
||||||
<script src="./desktop_nav.js"></script>
|
<script src="./desktop_nav.js"></script>
|
||||||
|
|
Loading…
Add table
Reference in a new issue