Skip to content

Commit 7adefe5

Browse files
authored
Merge branch 'master' into master
2 parents 39977ff + 009c2b1 commit 7adefe5

File tree

5 files changed

+15
-8
lines changed

5 files changed

+15
-8
lines changed
16.4 KB
Loading

eventsapp/data/jsonfiles/community.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"name": "PyCon India",
55
"about": "PyCon India, the premier conference in India on using and developing the Python programming language is conducted annually by the Python developer community. It attracts the best Python programmers from across the country and abroad.",
6-
"photo": "https://in.pycon.org/2017/images/logo.png",
6+
"photo": "https://in.pycon.org/2018/img/banner-logo.png",
77
"social":{
88
"website": "https://in.pycon.org/2018/",
99
"twitter": "https://twitter.com/pyconindia",

eventsapp/data/jsonfiles/menuitems.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"0.0.1": [
3+
{
4+
"menu_item_text": "Home",
5+
"icon_source": "data/images/menu/home.png",
6+
"navigate_to": "WelcomeScreen"
7+
},
38
{
49
"menu_item_text": "Schedule",
510
"icon_source": "data/images/menu/calendar.png",

eventsapp/uix/screens/communityscreen.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,29 @@ class CommunityScreen(Screen):
2424
CardsContainer:
2525
size_hint_y: 1
2626
CardStackLayout:
27+
spacing: dp(9)
2728
AsyncImage
2829
id: logo
2930
size_hint_y: None
30-
height: self.parent.height/4
31-
source: 'data/images/logo.png'
31+
height: self.parent.height/3
32+
source: 'data/images/lg.png'
3233
Label:
3334
id: about
3435
text: ''
3536
size_hint_y: None
36-
height: self.parent.height/4
37+
height: self.parent.height/3
3738
text_size: self.size
3839
halign: 'center'
3940
valign: 'center'
40-
font_size: dp(20)
41+
font_size: dp(15)
4142
color: 0, 0, 0, 1
4243
BoxLayout:
4344
orientation: 'vertical'
44-
spacing: dp(20)
45+
spacing: dp(1)
4546
size_hint_y: None
46-
size: self.size[0], dp(150)
47+
size: self.size[0], dp(100)
4748
id: social_icons
48-
padding: dp(10), dp(15)
49+
padding: dp(20), dp(20)
4950
''')
5051

5152
def add_social_icons(self, instance, data):

eventsapp/uix/screens/navigationscreen.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
But6 | ---------------------- |
2323
| |
2424
| |
25+
But7 | |
2526
'''
2627

2728

0 commit comments

Comments
 (0)