Merge pull request #8 from eosdac/dev

Updating Master from Dev

branding/css/extended.styl

@@ -1 +1,17 @@
 //use this file for your custom css
+
+.big_logo{
+  position:absolute;
+  width:100%;
+  height:100%;
+  background-image: url('../extensions/branding/images/logo/background-logo-alpha-white.svg');
+  background-repeat: no-repeat;
+
+}
+.bg-logo{
+  background-image: url('../extensions/branding/images/logo/background-logo-alpha-white.svg');
+  background-repeat: no-repeat;
+  background-size: 500px;
+  background-position: bottom -260px right -250px;
+
+}

components/partners.vue

@@ -10,7 +10,7 @@
     >
       <div class="row items-center">
         <img :style="style" :src="p.logo" />
-        <span>{{ p.name }}</span>
+        <div>{{ p.name }}</div>
       </div>
     </a>
   </div>

pages/home.vue

@@ -175,7 +175,7 @@
                 class="float-right"
                 color="bg2"
                 :label="$t('index.open_discord')"
-                @click.native="openURL($configFile.get('external').discordUrl)"
+                @click.native="openURL($configFile.get('external').discord)"
               />
             </div>
           </div>

statics/config/config.jungle.json

@@ -25,7 +25,6 @@
         },
         "custodian": {
             "name": "dacelections",
-            "memo": "dacelections",
             "enable_voting" : true
         },
         "bot":{

statics/config/config.mainnet.json

@@ -24,7 +24,6 @@
         },
         "custodian": {
             "name": "daccustodian",
-            "memo": "daccustodian",
             "enable_voting" : true
         },
         "bot":{

statics/config/credits.json

@@ -35,6 +35,12 @@
       "name": "Quasar Framework",
       "url": "https://quasar.dev/",
       "logo": "https://cdn.quasar.dev/logo/svg/quasar-logo.svg"
+    },
+    {
+      "name": "Decentium",
+      "url": "https://decentium.org/",
+      "logo": "https://avatars3.githubusercontent.com/u/49416696?s=100&v=4"
     }
   ]
-}
+}
+

statics/config/theme.json

@@ -1,10 +1,21 @@
 {
-    "is_dark": true,
-    "colors": {
-        "$primary" : "#4a1289",
-        "$bg1" : "#1e2128",
-        "$bg2" : "#272b35",
-        "$text1" : "hsla(0,0%,100%,0.9)",
-        "$text2" : "hsla(0,0%,100%,0.7)"
-    }
+  "is_dark": true,
+  "colors": {
+    "$primary": "#4a1289",
+    "$bg1": "#1e2128",
+    "$bg2": "#272b35",
+    "$text1": "#f5f5f5",
+    "$text2": "#c2c2c2",
+    "$info": "#31ccec",
+    "$positive": "#21ba45",
+    "$negative": "#db2828",
+    "$dark": "#272b36"
+  },
+  "images": {
+    "logo_url": "../extensions/branding/images/logo/logo-main.svg",
+    "logo_notext_url": "../extensions/branding/images/logo/logo-notext.svg",
+    "background_url": "",
+    "favicon_url": "https://members.eosdac.io/branding/images/icons/favicon-32x32.png",
+    "dac_currency_url": ""
+  }
 }