Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
ThaliApp
Commits
2f5f4407
Commit
2f5f4407
authored
Oct 17, 2018
by
Sébastiaan Versteeg
Browse files
Merge branch 'fix/text-cut-off-in-sidebar' into 'master'
Fixed text being cut off in the sidebar Closes #42 See merge request
!212
parents
d096ca82
485571fb
Changes
3
Hide whitespace changes
Inline
Side-by-side
__tests__/ui/components/navigator/__snapshots__/Sidebar.spec.js.snap
View file @
2f5f4407
...
...
@@ -192,7 +192,9 @@ exports[`Sidebar component renders correctly 1`] = `
style={
Array [
Object {
"backgroundColor": "transparent",
"color": "#313131",
"fontFamily": "System",
"fontSize": 14,
"fontWeight": "600",
},
Object {
...
...
@@ -281,7 +283,9 @@ exports[`Sidebar component renders correctly 1`] = `
style={
Array [
Object {
"backgroundColor": "transparent",
"color": "#313131",
"fontFamily": "System",
"fontSize": 14,
"fontWeight": "600",
},
Object {
...
...
@@ -370,7 +374,9 @@ exports[`Sidebar component renders correctly 1`] = `
style={
Array [
Object {
"backgroundColor": "transparent",
"color": "#313131",
"fontFamily": "System",
"fontSize": 14,
"fontWeight": "600",
},
Object {
...
...
@@ -459,7 +465,9 @@ exports[`Sidebar component renders correctly 1`] = `
style={
Array [
Object {
"backgroundColor": "transparent",
"color": "#313131",
"fontFamily": "System",
"fontSize": 14,
"fontWeight": "600",
},
Object {
...
...
@@ -551,7 +559,9 @@ exports[`Sidebar component renders correctly 1`] = `
style={
Array [
Object {
"backgroundColor": "transparent",
"color": "#313131",
"fontFamily": "System",
"fontSize": 14,
"fontWeight": "600",
},
Object {
...
...
app/ui/components/sidebar/Sidebar.js
View file @
2f5f4407
...
...
@@ -96,10 +96,16 @@ const Sidebar = (props) => {
?
Colors
.
magenta
:
Colors
.
textColour
}
size
=
{
24
}
iconStyle
=
{
styles
.
buttonIcon
}
style
=
{[
styles
.
button
Text
,
button
.
style
]}
style
=
{[
styles
.
button
,
button
.
style
]}
key
=
{
button
.
routeName
}
>
{
button
.
text
}
<
Text
style
=
{[
styles
.
buttonText
,
{
color
:
props
.
activeItemKey
===
button
.
routeName
?
Colors
.
magenta
:
Colors
.
textColour
,
}]}
>
{
button
.
text
}
<
/Text
>
<
/Icon.Button
>
))}
<
/View
>
...
...
app/ui/components/sidebar/style/Sidebar.js
View file @
2f5f4407
...
...
@@ -51,9 +51,21 @@ const styles = StyleSheet.create({
width
:
28
,
textAlign
:
'
center
'
,
},
button
Text
:
{
button
:
{
padding
:
16
,
},
buttonText
:
{
fontSize
:
14
,
color
:
Colors
.
textColour
,
android
:
{
fontFamily
:
'
sans-serif-medium
'
,
fontWeight
:
'
400
'
,
},
ios
:
{
fontFamily
:
'
System
'
,
fontWeight
:
'
600
'
,
},
},
});
export
default
styles
;
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