Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Illuna-Minetest
illuna-minetest.tk-old
Commits
0a1209f1
Commit
0a1209f1
authored
Dec 26, 2016
by
Milan
Browse files
drop navbar spacers, add a bit padding, add icons to links
parent
e278fe39
Changes
5
Hide whitespace changes
Inline
Side-by-side
Gemfile.lock
View file @
0a1209f1
...
...
@@ -202,6 +202,7 @@ DEPENDENCIES
byebug
coffee-rails (~> 4.2)
devise
font-awesome-rails
http_accept_language (~> 2.0.5)
jbuilder (~> 2.5)
jquery-rails
...
...
app/assets/stylesheets/header.scss
View file @
0a1209f1
...
...
@@ -23,11 +23,13 @@ header {
.navbar-default
.navbar-nav
>
.active
>
a
,
.navbar-default
.navbar-nav
>
.active
>
a
:focus
,
.navbar-default
.navbar-nav
>
.active
>
a
:hover
{
color
:
#6083C1
color
:
#6083C1
;
}
.navbar-default
.navbar-nav
>
li
>
a
{
color
:
#91B0E6
color
:
#91B0E6
;
padding-left
:
20px
;
padding-right
:
20px
;
}
.navbar-default
{
...
...
app/views/layouts/application.html.erb
View file @
0a1209f1
...
...
@@ -31,21 +31,16 @@
</button>
</div>
<div
id=
"navbar"
class=
"navbar-collapse collapse"
>
<ul
class=
"nav navbar-nav"
>
<li
class=
"navbar-brand"
>
<%=
link_to
image_tag
(
'branding/logos/header_logo.png'
),
"/"
%>
</li>
<li><a
id=
"nohover"
><b>
·
</b></a></li>
<li><a
href=
"//community.illuna-minetest.tk"
>
Community
</a></li>
<li><a
id=
"nohover"
><b>
·
</b></a></li>
<li
class=
"
<%=
is_active
(
'rules'
)
%>
"
>
<%=
link_to
t
(
'nav.rules'
),
"/rules"
%>
</li>
<li><a
id=
"nohover"
><b>
·
</b></a></li>
<li
class=
"
<%=
is_active
(
'map'
)
%>
"
>
<%=
link_to
"Map"
,
"/map"
%>
</li>
<li><a
id=
"nohover"
><b>
·
</b></a></li>
<li
class=
"
<%=
is_active
(
'stats'
)
%>
"
>
<%=
link_to
t
(
'nav.stats'
),
"/stats"
%>
</li>
<li><a
id=
"nohover"
><b>
·
</b></a></li>
<li
class=
"
<%=
is_active
(
'donate'
)
%>
"
>
<%=
link_to
t
(
'nav.donate'
),
"/donate"
,
:id
=>
"donate"
%>
</li>
<ul
class=
"nav navbar-nav"
>
<li
class=
"navbar-brand"
>
<%=
link_to
image_tag
(
'branding/logos/header_logo.png'
),
"/"
%>
</li>
<li><a
href=
"//community.illuna-minetest.tk"
><i
class=
"fa fa-users"
aria-hidden=
"true"
></i>
Community
</a></li>
<li
class=
"
<%=
is_active
(
'rules'
)
%>
"
>
<%=
link_to
t
(
'nav.rules_html'
),
"/rules"
%>
</li>
<li
class=
"
<%=
is_active
(
'map'
)
%>
"
>
<%=
link_to
t
(
'nav.map_html'
),
"/map"
%>
</li>
<li
class=
"
<%=
is_active
(
'stats'
)
%>
"
>
<%=
link_to
t
(
'nav.stats_html'
),
"/stats"
%>
</li>
<li
class=
"
<%=
is_active
(
'donate'
)
%>
"
>
<%=
link_to
t
(
'nav.donate_html'
),
"/donate"
,
:id
=>
"donate"
%>
</li>
</ul>
<ul
class=
"nav navbar-nav navbar-right"
>
<li
class=
"
<%=
is_active
(
'
contac
t'
)
%>
"
>
<
%=
link_to
"
Get in touch!
"
,
"/meet"
%
>
</li>
<li
class=
"
<%=
is_active
(
'
mee
t'
)
%>
"
><
a
href=
"/meet"
><i
class=
"fa fa-commenting"
aria-hidden=
"true"
></i>
Get in touch!
</a
></li>
</ul>
</div>
</div>
...
...
config/locales/de.yml
View file @
0a1209f1
...
...
@@ -4,9 +4,11 @@ de:
blog_headline
:
"
%d.%m.%Y"
nav
:
home
:
"
Home"
rules
:
"
Regeln"
stats
:
"
Statistiken"
donate
:
"
Unterstützen"
rules_html
:
"
<i
class='fa
fa-shield'
aria-hidden='true'></i>
Regeln"
map_html
:
"
<i
class='fa
fa-compass'
aria-hidden='true'></i>
Karte"
stats_html
:
"
<i
class='fa
fa-heartbeat'
aria-hidden='true'></i>
Statistiken"
donate_html
:
"
<i
class='fa
fa-heart'
aria-hidden='true'></i>
Unterstützen"
home
:
index
:
title
:
"
Home"
...
...
config/locales/en.yml
View file @
0a1209f1
...
...
@@ -4,9 +4,10 @@ en:
blog_headline
:
"
%d.%m.%Y"
nav
:
home
:
"
Home"
rules
:
"
Rules"
stats
:
"
Statistics"
donate
:
"
Donate"
rules_html
:
"
<i
class='fa
fa-shield'
aria-hidden='true'></i>
Rules"
map_html
:
"
<i
class='fa
fa-compass'
aria-hidden='true'></i>
Map"
stats_html
:
"
<i
class='fa
fa-heartbeat'
aria-hidden='true'></i>
Statistics"
donate_html
:
"
<i
class='fa
fa-heart'
aria-hidden='true'></i>
Donate"
home
:
index
:
title
:
"
Home"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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