Merge branch 'master' into master

Author: akshayaurora

eventsapp/data/images/btn1.png

@@ -1,15 +1,16 @@
 {
   "0.0.1": [
+  	{
+	  "menu_item_text": "Home",
+	  "icon_source": "data/images/menu/home.png",
+	  "navigate_to": "WelcomeScreen"
+	},
 	{
 	  "menu_item_text": "Schedule",
 	  "icon_source": "data/images/menu/calendar.png",
 	  "navigate_to": "ScheduleScreen"
 	},
-	{
-	  "menu_item_text": "About",
-	  "icon_source": "data/images/menu/about.png",
-	  "navigate_to": "AboutScreen"
-	},
+	
 	{
 	  "menu_item_text": "Community",
 	  "icon_source": "data/images/menu/community.png",
@@ -35,15 +36,24 @@
 	  "icon_source": "data/images/menu/sponsor.png",
 	  "navigate_to": "SponsorScreen"
 	},
+	
 	{
 		"menu_item_text": "Contact Us",
 	  "icon_source": "data/images/menu/contactus.png",
 	  "navigate_to": "ContactUsScreen"
   },
+
   {
     "menu_item_text": "History",
 		"icon_source": "data/images/menu/history.png",
 		"navigate_to": "AboutPyConScreen"
+	},
+
+	{
+	  "menu_item_text": "About",
+	  "icon_source": "data/images/menu/about.png",
+	  "navigate_to": "AboutScreen"
 	}
+	
   ]
 }

eventsapp/data/images/menu/home.png

@@ -1,32 +1,25 @@
 {
   "0.0.1": [
     {
-      "name": "Visible Alpha",
-      "type": "Gold",
-      "website": "http://visiblealpha.com/",
-      "logo": "https://in.pycon.org/2018/images/sponsor/visiblealpha.png",
-      "about": "https://in.pycon.org/2018/"
-    },
-    {
-      "name": "ZeOmega",
-      "type": "Silver",
-      "website": "http://www.zeomega.com/",
-      "logo": "https://in.pycon.org/2018/images/sponsor/zeomega.png",
-      "about": "https://in.pycon.org/2018/"
+      "name": "AQR Capital Management",
+      "type": "Platinum",
+      "website": "https://www.aqr.com/",
+      "logo": "https://in.pycon.org/2018/img/sponsors/aqr.jpg",
+      "about": "https://www.aqr.com/About-Us/OurFirm"
     },
     {
-      "name": "Adobe",
-      "type": "Silver",
-      "website": "https://www.adobe.com/",
-      "logo": "https://in.pycon.org/2018/images/sponsor/adobe.jpg",
-      "about": "https://in.pycon.org/2018/"
+      "name": "D.E. Shaw india",
+      "type": "Platinum",
+      "website": "https://www.deshawindia.com/",
+      "logo": "https://in.pycon.org/2018/img/sponsors/DESCO_Logo_2c.jpg",
+      "about": "https://www.deshawindia.com/WhoWeAre.shtml"
     },
     {
-      "name": "Python Software Foundation",
-      "type": "Silver",
-      "website": "https://www.python.org/psf-landing/",
-      "logo": "https://in.pycon.org/2018/images/sponsor/psf.png",
-      "about": "https://in.pycon.org/2018/"
+      "name": "Pramati",
+      "type": "Gold",
+      "website": "https://www.pramati.com/",
+      "logo": "https://in.pycon.org/2018/img/sponsors/Pramati.png",
+      "about": "https://www.pramati.com/about-pramati/"
     }
   ]
 }

eventsapp/data/jsonfiles/menuitems.json

@@ -12,13 +12,14 @@
 
 class ThemeButton(Button):
 
-    background_normal = StringProperty('data/images/btn.png')
-    background_down = StringProperty('data/images/btn.png')
+    background_normal = StringProperty('data/images/btn1.png')
+    background_down = StringProperty('data/images/btn1.png')
 
     Builder.load_string('''
 <ThemeButton>:
     font_size: dp(12)
     border: 10, 10, 10, 10
+    color: 0, 0, 0, 1
     background_normal: root.background_normal
     background_down: root.background_down
     opacity: 1 if self.state == 'normal' else .9

eventsapp/data/jsonfiles/sponsors.json

@@ -51,7 +51,7 @@ def del_widget(self, widget):
     Builder.load_string('''
 <CardsContainer>:
     spacing: dp(10)
-    padding: dp(20), dp(40)
+    padding: dp(10), dp(10)
     canvas:
         Color:
             rgba: (1, 1, 1, 1)

eventsapp/uix/buttons/themebutton.py

@@ -77,7 +77,7 @@ def chunks(data, SIZE=10):
                 yield {k:data[k] for k in islice(it, SIZE)}
 
         if self.community_social != []:
-            for items in chunks(self.community_social, 1):
+            for items in chunks(self.community_social, 3):
                 bl = BoxLayout()
                 self.add_social_icons(bl, items)
                 social_icons.add_widget(bl)

eventsapp/uix/cards/cardscontainer.py

@@ -22,6 +22,7 @@
 But6    |       ----------------------     |
         |                                  |
         |                                  |
+But7    |                                  |
 '''
 
 
@@ -124,7 +125,7 @@ class NavigationScreen(Screen):
 
     Builder.load_string('''
 <NavButton>
-    padding: dp(10)
+    padding: dp(6)
     spacing: dp(10)
     on_release:
         app.navigation_screen.ids.drawer.toggle_state()

eventsapp/uix/screens/communityscreen.py

@@ -22,7 +22,7 @@ class DateTabbedPanelItem(TabbedPanelItem):
     background_down: 'data/images/Detail_bar.png'
     background_normal: 'data/images/Detail_bar.png'
     bold: True
-    font_size: dp(24)
+    font_size: dp(15)
     ''')
 
 
@@ -34,7 +34,7 @@ class DateTabbedPanel(TabbedPanel):
     do_default_tab: False
     tab_pos: "top_mid"
     tab_width: self.width/2
-    tab_height: dp(70)
+    tab_height: dp(40)
     spacing: dp(-5)
     canvas:
         Color:
@@ -58,7 +58,7 @@ class HallTabbedPanelItem(TabbedPanelItem):
     background_down: 'data/images/lower-detail-bar.png'
     background_normal: 'data/images/lower-detail-bar.png'
     bold: True
-    font_size: dp(24)
+    font_size: dp(14)
     ''')
 
 
@@ -68,6 +68,6 @@ class HallTabbedPanel(TabbedPanel):
     do_default_tab: False
     tab_pos: "bottom_mid"
     tab_width: self.width/3
-    tab_height: dp(60)
+    tab_height: dp(40)
 
     ''')