Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
8c0ed468
Commit
8c0ed468
authored
Nov 21, 2016
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Navbar revamp + Footer
parent
fc7e7d3d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
35 additions
and
43 deletions
+35
-43
app.css
assets/css/app.css
+0
-0
login.css
assets/css/login.css
+0
-0
app.scss
client/scss/app.scss
+1
-2
_footer.scss
client/scss/layout/_footer.scss
+0
-7
_header.scss
client/scss/layout/_header.scss
+1
-6
common.json
locales/en/common.json
+2
-1
common.json
locales/fr/common.json
+2
-1
footer.pug
views/common/footer.pug
+7
-8
header.pug
views/common/header.pug
+5
-3
_layout.pug
views/pages/admin/_layout.pug
+2
-2
edit.pug
views/pages/edit.pug
+4
-4
view.pug
views/pages/view.pug
+11
-9
No files found.
assets/css/app.css
View file @
8c0ed468
This source diff could not be displayed because it is too large. You can
view the blob
instead.
assets/css/login.css
View file @
8c0ed468
This diff is collapsed.
Click to expand it.
client/scss/app.scss
View file @
8c0ed468
@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';
\ No newline at end of file
client/scss/layout/_footer.scss
deleted
100644 → 0
View file @
fc7e7d3d
.footer
{
background-color
:
mc
(
'light-blue'
,
'600'
);
color
:
#FFF
;
text-align
:
center
;
padding
:
25px
;
}
\ No newline at end of file
client/scss/layout/_header.scss
View file @
8c0ed468
...
...
@@ -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'
,
'5
00'
)
,
0
.5s
,
24px
);
@include
spinner
(
mc
(
'
indigo'
,
'1
00'
)
,
0
.5s
,
24px
);
}
&
.active
{
...
...
locales/en/common.json
View file @
8c0ed468
...
...
@@ -6,6 +6,6 @@
"footer"
:
{
"poweredby"
:
"Powered by"
,
"home"
:
"Home"
,
"
admin"
:
"Administration
"
"
top"
:
"Return to top
"
}
}
\ No newline at end of file
locales/fr/common.json
View file @
8c0ed468
...
...
@@ -6,6 +6,6 @@
"footer"
:
{
"poweredby"
:
"Propulsé par"
,
"home"
:
"Accueil"
,
"
admin"
:
"Administration
"
"
top"
:
"Retour en haut
"
}
}
\ No newline at end of file
views/common/footer.pug
View file @
8c0ed468
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')
views/common/header.pug
View file @
8c0ed468
...
...
@@ -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
...
...
views/pages/admin/_layout.pug
View file @
8c0ed468
...
...
@@ -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
...
...
views/pages/edit.pug
View file @
8c0ed468
...
...
@@ -6,11 +6,11 @@ block rootNavCenter
block rootNavRight
i.nav-item#notifload
span.nav-item
a.button.is-o
range.is-o
utlined.btn-edit-discard
i.
fa.fa-time
s
a.button.is-outlined.btn-edit-discard
i.
icon-cros
s
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
...
...
views/pages/view.pug
View file @
8c0ed468
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment