Rebrand icons (#242)

downloads/download-dev-bins.sh

@@ -12,11 +12,11 @@ if [ -z "$RENAME" ]; then
 fi
 
 if [ "$OS" == "Linux" ]; then
-    ASSET_URL="https://builds.lokinet.dev/loki-project/loki-core/loki-dev-linux-LATEST.tar.xz"
+    ASSET_URL="https://oxen.rocks/loki-project/loki-core/loki-dev-linux-LATEST.tar.xz"
 elif [ "$OS" == "Windows" ]; then
-    ASSET_URL="https://builds.lokinet.dev/loki-project/loki-core/loki-dev-win-LATEST.zip"
+    ASSET_URL="https://oxen.rocks/loki-project/loki-core/loki-dev-win-LATEST.zip"
 elif [ "$OS" == "macOS" ]; then
-    ASSET_URL="https://builds.lokinet.dev/loki-project/loki-core/loki-dev-macos-LATEST.tar.xz"
+    ASSET_URL="https://oxen.rocks/loki-project/loki-core/loki-dev-macos-LATEST.tar.xz"
 else
     echo "OS must be Linux, Windows or macOS"
     exit 1

src/components/menus/mainmenu.vue

@@ -58,12 +58,13 @@
               >Discord</a
             >
             -
-            <a
+            <!-- readded once oxen subreddit is known -->
+            <!-- <a
               href="#"
               @click="openExternal('https://www.reddit.com/r/LokiProject/')"
               >Reddit</a
             >
-            -
+            - -->
             <a
               href="#"
               @click="

src/css/app.styl

@@ -368,14 +368,13 @@ footer,
     background: white;
     color: $oxen-navy !important;
 
+    * {
+        color: $oxen-navy;
+    }
+
     .q-list-separator > .q-item-division + .q-item-division, .q-item-division + .q-separator {
         border-top: 1px solid #333;
     }
-
-    // .q-item:hover {
-    //     background: $oxen-teal;
-    //     color: white;
-    // }
 }
 
 .menu-list {

src/pages/wallet-select/import-old-gui.vue

@@ -2,13 +2,20 @@
   <q-page>
     <div class="q-mx-md import-old-gui">
       <q-list link dark no-border class="wallet-list">
-        <q-item v-for="state in directory_state" :key="state.directory" :class="{ selected: state.selected }">
+        <q-item
+          v-for="state in directory_state"
+          :key="state.directory"
+          :class="{ selected: state.selected }"
+        >
           <q-item-section>
             <div class="row items-center">
               <q-item-label class="items-center">
                 <q-checkbox v-model="state.selected" dark color="dark" />
               </q-item-label>
-              <q-item-label class="wallet-name" @click.native="state.selected = !state.selected">
+              <q-item-label
+                class="wallet-name"
+                @click.native="state.selected = !state.selected"
+              >
                 {{ state.directory }}
               </q-item-label>
             </div>
@@ -19,7 +26,7 @@
               v-model="state.type"
               hide-underline
               dark
-              class="q-ma-none full-width"
+              class="q-ma-none full-width nettype-select"
               :options="selectOptions"
               emit-value
               map-options
@@ -93,7 +100,9 @@ export default {
               this.$q.notify({
                 type: "negative",
                 timeout: 3000,
-                message: this.$t("notification.errors.failedWalletImport") + `: ${wallet}`
+                message:
+                  this.$t("notification.errors.failedWalletImport") +
+                  `: ${wallet}`
               });
             });
           }
@@ -109,7 +118,9 @@ export default {
   methods: {
     populate_state() {
       // Keep any directories that intersect
-      const new_state = this.directory_state.filter(state => this.directories.includes(state.directory));
+      const new_state = this.directory_state.filter(state =>
+        this.directories.includes(state.directory)
+      );
 
       // Add in new directories
       this.directories

src/pages/wallet-select/import.vue

@@ -37,7 +37,7 @@
           @change="setWalletPath"
         />
         <q-btn
-          color="secondary"
+          color="primary"
           :label="$t('buttons.selectWalletFile')"
           :text-color="theme == 'dark' ? 'white' : 'dark'"
           @click="selectFile"

src/pages/wallet-select/index.vue

@@ -208,7 +208,8 @@ export default {
               flat: true,
               label: this.$t("dialog.buttons.cancel")
             },
-            color: "#1F1C47"
+            color: "#1F1C47",
+            persistent: true
           })
           .onOk(password => {
             this.$q.loading.show({