Merge branch 'wallet' of github.com:ethereum/mist into wallet

ethereum · Mar 4, 2016 · 4912a04 · 4912a04
2 parents 0c276ff + c295091
commit 4912a04
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/interface/client/styles/splashScreen.import.less b/interface/client/styles/splashScreen.import.less
@@ -21,7 +21,7 @@
     -webkit-app-region: drag;
 
     &.wallet {
-        background-image: url('/images/bg-homestead.jpg?8');
+        background-image: url('/images/bg-homestead.jpg');
 
         h1 {
             color: #fff;

diff --git a/interface/client/templates/popupWindows/onboardingScreen.html b/interface/client/templates/popupWindows/onboardingScreen.html
@@ -74,7 +74,7 @@ <h6 class="address"> {{TemplateVar.get "newAccount"}} </h6>
                 <h1> {{i18n "mist.popupWindows.onboarding.learnIt"}} </h1>
                 <div class="col col-6 col-left">
                     {{{i18n "mist.popupWindows.onboarding.tutorial1Description"}}}
-                    <p><a href="https://blog.ethereum.org/2015/12/03/how-to-build-your-own-cryptocurrency/" class="button" target="_blank">{{i18n "mist.popupWindows.onboarding.buttons.learnReceipt"}}</a></p>
+                    <p><a href="https://www.ethereum.org/token" class="button" target="_blank">{{i18n "mist.popupWindows.onboarding.buttons.learnReceipt"}}</a></p>
                 </div>
                 <div class="col col-6 tutorial-token"></div>
                 <div class="col col-12 footer-buttons">
@@ -100,7 +100,7 @@ <h1> {{i18n "mist.popupWindows.onboarding.learnIt"}} </h1>
                 <h1> {{i18n "mist.popupWindows.onboarding.learnIt"}} </h1>
                 <div class="col col-6 col-left">
                     {{{i18n "mist.popupWindows.onboarding.tutorial3Description"}}}
-                    <p><a href="https://blog.ethereum.org/2015/12/04/ethereum-in-practice-part-2-how-to-build-a-better-democracy-in-under-a-100-lines-of-code/" class="button" target="_blank">{{i18n "mist.popupWindows.onboarding.buttons.learnReceipt"}}</a></p>
+                    <p><a href="https://www.ethereum.org/dao" class="button" target="_blank">{{i18n "mist.popupWindows.onboarding.buttons.learnReceipt"}}</a></p>
                 </div>
                 <div class="col col-6 tutorial-dao"></div>
                 <div class="col col-12 footer-buttons">

diff --git a/interface/public/images/bg-homestead.jpg b/interface/public/images/bg-homestead.jpg