Navbar revamp + Footer

pull/33/head
NGPixel 8 years ago
parent fc7e7d3d5a
commit 8c0ed4682c

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1,6 +1,7 @@
@import 'core-client/scss/core'; @import 'core-client/scss/core';
@import 'core-client/scss/components/alert'; @import 'core-client/scss/components/alert';
@import 'core-client/scss/components/button'; @import 'core-client/scss/components/button';
@import 'core-client/scss/components/footer';
@import 'core-client/scss/components/form'; @import 'core-client/scss/components/form';
@import 'core-client/scss/components/grid'; @import 'core-client/scss/components/grid';
@import 'core-client/scss/components/hero'; @import 'core-client/scss/components/hero';
@ -16,7 +17,6 @@
//@import './components/_editor'; //@import './components/_editor';
@import './layout/_header'; @import './layout/_header';
@import './layout/_footer';
//@import './layout/_content'; //@import './layout/_content';
//@import './pages/_account'; //@import './pages/_account';

@ -1,6 +0,0 @@
.footer {
background-color: mc('light-blue', '600');
color: #FFF;
text-align: center;
padding: 25px;
}

@ -11,11 +11,6 @@
z-index: 5; z-index: 5;
} }
h2.nav-item {
font-size: 150%;
color: mc('orange', '500');
}
#notifload { #notifload {
width: 42px; width: 42px;
display: flex; display: flex;
@ -26,7 +21,7 @@ h2.nav-item {
&::before { &::before {
content: " "; content: " ";
@include spinner(mc('orange', '500'),0.5s,24px); @include spinner(mc('indigo', '100'),0.5s,24px);
} }
&.active { &.active {

@ -6,6 +6,6 @@
"footer": { "footer": {
"poweredby": "Powered by", "poweredby": "Powered by",
"home": "Home", "home": "Home",
"admin": "Administration" "top": "Return to top"
} }
} }

@ -6,6 +6,6 @@
"footer": { "footer": {
"poweredby": "Propulsé par", "poweredby": "Propulsé par",
"home": "Accueil", "home": "Accueil",
"admin": "Administration" "top": "Retour en haut"
} }
} }

@ -1,10 +1,9 @@
footer.footer footer.footer
.container span
.content.has-text-centered = t('footer.poweredby') + ' '
p a(href='https://github.com/Requarks/wiki') Requarks Wiki
= t('footer.poweredby') + ' ' | .
a(href='https://github.com/Requarks/wiki') Requarks Wiki ul
p li: a(href='/')= t('footer.home')
a.icon(href='https://github.com/Requarks/wiki') li: a(href='#root')= t('footer.top')
i.fa.fa-github

@ -3,10 +3,12 @@
nav.nav.stickyscroll#header nav.nav.stickyscroll#header
.nav-left .nav-left
block rootNavLeft block rootNavLeft
a.nav-item(href='/') //a.nav-item(href='/')
img(src='/favicons/android-icon-96x96.png', alt='Wiki') img(src='/favicons/android-icon-96x96.png', alt='Wiki')
a.nav-item(href='/') a.nav-item(href='/')
h1= appconfig.title h1
i.icon-layers
= appconfig.title
.nav-center .nav-center
block rootNavCenter block rootNavCenter
.nav-item .nav-item
@ -21,7 +23,7 @@
i.nav-item#notifload i.nav-item#notifload
transition(name="searchresults-anim", enter-active-class="slideInDown", leave-active-class="fadeOutUp") transition(name="searchresults-anim", enter-active-class="slideInDown", leave-active-class="fadeOutUp")
.box.searchresults.animated(v-show='searchactive', v-cloak, style={'display':'none'}) .searchresults.animated(v-show='searchactive', v-cloak, style={'display':'none'})
.menu .menu
p.menu-label p.menu-label
| Search Results | Search Results

@ -5,8 +5,8 @@ block rootNavCenter
block rootNavRight block rootNavRight
i.nav-item#notifload i.nav-item#notifload
span.nav-item .nav-item
a.button.is-dark.is-outlined.btn-edit-discard(href='/') a.button.btn-edit-discard(href='/')
span.icon span.icon
i.fa.fa-home i.fa.fa-home
span Home span Home

@ -6,11 +6,11 @@ block rootNavCenter
block rootNavRight block rootNavRight
i.nav-item#notifload i.nav-item#notifload
span.nav-item span.nav-item
a.button.is-orange.is-outlined.btn-edit-discard a.button.is-outlined.btn-edit-discard
i.fa.fa-times i.icon-cross
span Discard span Discard
a.button.is-green.btn-edit-save a.button.btn-edit-save
i.fa.fa-check i.icon-check
span Save Changes span Save Changes
block content block content

@ -10,16 +10,18 @@ mixin tocMenu(ti)
block rootNavRight block rootNavRight
i.nav-item#notifload i.nav-item#notifload
a.nav-item.btn-move-prompt.is-hidden .nav-item
| Move a.button.is-outlined.btn-move-prompt.is-hidden
a.nav-item(href='/source/' + pageData.meta.path) i.icon-shuffle
| Source span Move
span.nav-item a.button.is-outlined(href='/source/' + pageData.meta.path)
a.button.is-orange.is-outlined(href='/edit/' + pageData.meta.path) i.icon-loader
i.fa.fa-edit span Source
a.button(href='/edit/' + pageData.meta.path)
i.icon-document-text
span Edit span Edit
a.button.is-light-blue.btn-create-prompt a.button.btn-create-prompt
i.fa.fa-plus i.icon-plus
span Create span Create
block content block content

Loading…
Cancel
Save