Browse Source

Navbar revamp + Footer

pull/33/head
NGPixel 8 years ago
parent
commit
8c0ed4682c
12 changed files with 35 additions and 43 deletions
  1. 2
      assets/css/app.css
  2. 2
      assets/css/login.css
  3. 2
      client/scss/app.scss
  4. 6
      client/scss/layout/_footer.scss
  5. 7
      client/scss/layout/_header.scss
  6. 2
      locales/en/common.json
  7. 2
      locales/fr/common.json
  8. 15
      views/common/footer.pug
  9. 8
      views/common/header.pug
  10. 4
      views/pages/admin/_layout.pug
  11. 8
      views/pages/edit.pug
  12. 20
      views/pages/view.pug

2
assets/css/app.css
File diff suppressed because it is too large
View File

2
assets/css/login.css
File diff suppressed because it is too large
View File

2
client/scss/app.scss

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

6
client/scss/layout/_footer.scss

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

7
client/scss/layout/_header.scss

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

2
locales/en/common.json

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

2
locales/fr/common.json

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

15
views/common/footer.pug

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

8
views/common/header.pug

@ -3,10 +3,12 @@
nav.nav.stickyscroll#header
.nav-left
block rootNavLeft
a.nav-item(href='/')
//a.nav-item(href='/')
img(src='/favicons/android-icon-96x96.png', alt='Wiki')
a.nav-item(href='/')
h1= appconfig.title
h1
i.icon-layers
= appconfig.title
.nav-center
block rootNavCenter
.nav-item
@ -21,7 +23,7 @@
i.nav-item#notifload
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
p.menu-label
| Search Results

4
views/pages/admin/_layout.pug

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

8
views/pages/edit.pug

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

20
views/pages/view.pug

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

Loading…
Cancel
Save