Skip to content

Commit 0ba3473

Browse files
committed
Update header links style for i18n
1 parent d931745 commit 0ba3473

File tree

6 files changed

+42
-42
lines changed

6 files changed

+42
-42
lines changed

Gemfile.lock

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
activesupport (4.2.5)
4+
activesupport (4.2.6)
55
i18n (~> 0.7)
66
json (~> 1.7, >= 1.7.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
10-
autoprefixer-rails (6.2.1)
10+
autoprefixer-rails (6.2.3)
1111
execjs
1212
json
1313
capybara (2.4.4)
@@ -38,7 +38,7 @@ GEM
3838
eventmachine (>= 0.12.9)
3939
http_parser.rb (~> 0.6.0)
4040
erubis (2.7.0)
41-
eventmachine (1.0.8)
41+
eventmachine (1.2.0.1)
4242
execjs (2.6.0)
4343
favicon_maker (1.3.1)
4444
docile (~> 1.1)
@@ -52,10 +52,10 @@ GEM
5252
http_parser.rb (0.6.0)
5353
i18n (0.7.0)
5454
json (1.8.3)
55-
kramdown (1.9.0)
56-
listen (3.0.5)
55+
kramdown (1.10.0)
56+
listen (3.0.6)
5757
rb-fsevent (>= 0.9.3)
58-
rb-inotify (>= 0.9)
58+
rb-inotify (>= 0.9.7)
5959
middleman (3.4.1)
6060
coffee-script (~> 2.2)
6161
compass (>= 1.0.0, < 2.0.0)
@@ -89,7 +89,7 @@ GEM
8989
middleman-favicon-maker (3.7)
9090
favicon_maker (~> 1.3)
9191
middleman-core (>= 3.0.0)
92-
middleman-livereload (3.4.5)
92+
middleman-livereload (3.4.6)
9393
em-websocket (~> 0.5.1)
9494
middleman-core (>= 3.3)
9595
rack-livereload (~> 0.3.15)
@@ -109,14 +109,14 @@ GEM
109109
sprockets-sass (~> 1.3.0)
110110
mime-types (3.0)
111111
mime-types-data (~> 3.2015)
112-
mime-types-data (3.2015.1120)
112+
mime-types-data (3.2016.0221)
113113
mini_portile2 (2.0.0)
114-
minitest (5.8.3)
114+
minitest (5.8.4)
115115
multi_json (1.11.2)
116116
net-sftp (2.1.2)
117117
net-ssh (>= 2.6.5)
118-
net-ssh (3.0.1)
119-
nokogiri (1.6.7.1)
118+
net-ssh (3.1.1)
119+
nokogiri (1.6.7.2)
120120
mini_portile2 (~> 2.0.0.rc2)
121121
padrino-helpers (0.12.5)
122122
i18n (~> 0.6, >= 0.6.7)
@@ -130,10 +130,10 @@ GEM
130130
rack
131131
rack-test (0.6.3)
132132
rack (>= 1.0)
133-
rb-fsevent (0.9.6)
134-
rb-inotify (0.9.5)
133+
rb-fsevent (0.9.7)
134+
rb-inotify (0.9.7)
135135
ffi (>= 0.5.0)
136-
sass (3.4.20)
136+
sass (3.4.22)
137137
slim (3.0.6)
138138
temple (~> 0.7.3)
139139
tilt (>= 1.3.3, < 2.1)

source/assets/stylesheets/modules/_header.scss

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
.m-header-langs {
2+
text-align: right;
3+
@include grid-row();
4+
5+
.lang {
6+
padding: rem-calc(5 20);
7+
text-transform: uppercase;
8+
font-weight: $font-weight-bold;
9+
}
10+
}
11+
112
.m-header {
213
padding: rem-calc(20 0);
314
margin-bottom: rem-calc(40);
@@ -19,23 +30,13 @@
1930
margin-bottom: 0;
2031
}
2132

22-
.langs {
23-
text-align: right;
24-
}
25-
26-
.lang {
27-
margin: 0 rem-calc(5);
28-
text-transform: uppercase;
29-
font-weight: $font-weight-bold;
30-
}
31-
3233
.logo {
3334
height: rem-calc(80);
3435
padding-right: rem-calc(20);
3536
}
3637

3738
.subscribe {
38-
margin-top: rem-calc(5);
39+
margin-top: rem-calc(20);
3940
}
4041

4142
span {

source/layouts/layout.html.slim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ html lang="#{I18n.locale}"
1313
main.row
1414
.medium-8.medium-centered.columns
1515
== yield
16+
= partial 'views/global/slack'
1617
= partial 'views/global/footer'
1718

1819
= javascript_include_tag 'application'

source/localizable/index.html.slim

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,3 @@ div class="m-section"
3131
p = t('home.events.call_to_event')
3232
.text-center
3333
= link_to t('home.events.suggest_one'), data.settings.social.meetup, class: 'button large'
34-
35-
div id="chat" class="m-section"
36-
h2 = t('home.chat.title')
37-
p = t('home.chat.description_html', mailto: mail_to(data.settings.social.email))
38-
.text-center
39-
= mail_to data.settings.social.email, t('home.chat.join'), subject: t('home.chat.invitation_request_mail'), class: 'button large'
Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1+
2+
.m-header-langs
3+
- langs.each do |lang|
4+
- if active_lang?(lang)
5+
span class="lang active"
6+
= lang
7+
- else
8+
= link_to lang, lang_path(lang), class: 'lang'
19
header.m-header
210
.row
3-
.medium-5.medium-push-1.small-6.columns
11+
.medium-5.medium-push-1.columns
412
h1
513
= link_to '/' do
614
= image_tag 'logos/ruby-nord-red.png', alt: t('header.logo.image_alt'), class: 'logo'
715
= t("#{current_page.data.i18n_scope}.title")
8-
.medium-5.small-6.columns
9-
div class='langs'
10-
- langs.each do |lang|
11-
- if active_lang?(lang)
12-
span class="lang active"
13-
= lang
14-
- else
15-
a href="#{lang_path(lang)}"
16-
span class="lang"
17-
= lang
16+
.medium-5.columns
1817
= link_to t('header.meetup.subscribe'), data.settings.social.meetup, class: 'subscribe button large right'
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
div id="chat" class="m-section"
2+
h2 = t('home.chat.title')
3+
p = t('home.chat.description_html', mailto: mail_to(data.settings.social.email))
4+
.text-center
5+
= mail_to data.settings.social.email, t('home.chat.join'), subject: t('home.chat.invitation_request_mail'), class: 'button large'

0 commit comments

Comments
 (0)