Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
5004477b
Commit
5004477b
authored
Nov 05, 2016
by
Joost Rijneveld
Browse files
Merge branch 'fix/css-and-typo' into 'master'
Fix typo and menu focus state See merge request
!157
parents
ef557a61
2fc1882c
Changes
4
Hide whitespace changes
Inline
Side-by-side
website/members/locale/nl/LC_MESSAGES/django.po
View file @
5004477b
...
...
@@ -203,7 +203,7 @@ msgid "Preferred language"
msgstr "Voorkeurstaal"
#: models.py:259
msgid "Preferred language for e.g. news
letters"
msgid "Preferred language for e.g. newsletters"
msgstr "Voorkeurstaal voor b.v.b. nieuwsbrieven"
#: models.py:266
...
...
website/members/migrations/0012_auto_20161104_2119.py
0 → 100644
View file @
5004477b
# -*- coding: utf-8 -*-
# Generated by Django 1.10.2 on 2016-11-04 20:19
from
__future__
import
unicode_literals
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'members'
,
'0011_auto_20161030_1035'
),
]
operations
=
[
migrations
.
AlterField
(
model_name
=
'member'
,
name
=
'language'
,
field
=
models
.
CharField
(
choices
=
[(
'en'
,
'English'
),
(
'nl'
,
'Dutch'
)],
default
=
'nl'
,
help_text
=
'Preferred language for e.g. newsletters'
,
max_length
=
5
,
verbose_name
=
'Preferred language'
),
),
]
website/members/models.py
View file @
5004477b
...
...
@@ -256,7 +256,7 @@ class Member(models.Model):
language
=
models
.
CharField
(
verbose_name
=
_
(
'Preferred language'
),
help_text
=
_
(
'Preferred language for e.g. news
letters'
),
help_text
=
_
(
'Preferred language for e.g. newsletters'
),
max_length
=
5
,
choices
=
settings
.
LANGUAGES
,
default
=
'nl'
,
...
...
website/thaliawebsite/static/css/skin.scss
View file @
5004477b
...
...
@@ -100,6 +100,11 @@ body {
background-image
:
none
;
background-color
:
$primary-color
!
important
;
}
&
:focus
{
background-image
:
none
;
background-color
:
$dark-primary-color
!
important
;
}
}
}
}
...
...
Write
Preview
Supports
Markdown
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