Fix some layout weirdness introduced in #1314. Also, change "(out of sync)" to only red, instead of red and bold, which a bit more subtle for a warning.
Restore overview page (put transactions back within frame) #1346
pull laanwj wants to merge 1 commits into bitcoin:master from laanwj:2012_05_overviewpage_restore changing 2 files +185 −149-
laanwj commented at 9:30 PM on May 17, 2012: member
-
Diapolo commented at 9:37 PM on May 17, 2012: none
Sorry to have introduced that one ...
-
laanwj commented at 9:57 PM on May 17, 2012: member
Ok, removed the font tag completely.
I've also made it so that the (out of sync) label appears directly after Wallet and Recent transactions, and is not aligned to the middle.
-
Diapolo commented at 10:03 PM on May 17, 2012: none
I can't verify that change by just looking at the diff, which hits me hard, but ACK to the intention :D.
-
laanwj commented at 10:11 PM on May 17, 2012: member
Why not simply try it out?
$ git add remote wumpus https://github.com/laanwj/bitcoin.git $ git fetch wumpus $ git checkout wumpus/2012_05_overviewpage_restore $ (build...) -
Diapolo commented at 10:15 PM on May 17, 2012: none
I guess you will LOL, when I tell you how I test commits. Merged ones to master go into Bitcoin, I fetch them via git fetch upstream, rebase and then open a file-compare-tool and add every changed line into my test-build and compile it. Now next problem was I did never use other remotes, just the bitcoin one, but I will try your commands tomorrow :), it's late.
-
laanwj commented at 10:30 PM on May 17, 2012: member
Hehe, that does sounds quite inefficient indeed.
The simplest way to do it is to
git clone https://github.com/laanwj/bitcoin.gitinto a new directory then check out the branchgit checkout 2012_05_overviewpage_restore. Then build from there.Remotes are essentially the same, but allow for tracking multiple remote repositories from one local git repository. This can be useful, for example, when you want to create a local branch from the remote branch and continue working on it. Or to do diffs between a branch of your own and the remote one. (However, it also means that you have to first commit your current work to a branch, or stash, before you can check out the other remote branch)
Learning to use git effectively can be a bit of a challenge in the beginning, but it does pay off.
-
Diapolo commented at 10:36 PM on May 17, 2012: none
Thanks for this Git lesson :). I'm already advancing, my first pulls were done via merges and I created so much mess, Con (developer of CGMINER) still hates me for them I guess ^^.
Would a
git clone https://github.com/laanwj/bitcoin.git bitcoin_wumpuswork, so that I can use bitcoin_wumpus as directory? Do I need to fork your repo via the Github website first? Btw. which tag are you using to display the commands, seems its not the HTML-pre. -
laanwj commented at 10:40 PM on May 17, 2012: member
Yes, that's would work well. You don't have to do anything on the github website. You can make as many local clones and forks as you want, that's the advantage of a distributed VCS.
I use `` (backticks) for the commands.
-
Diapolo commented at 10:44 PM on May 17, 2012: none
Thank you once more! -
Diapolo commented at 7:57 AM on May 18, 2012: none
I need your help GIT-wise, sorry to OT this discussion :). I did:
git clone git://github.com/laanwj/bitcoin.git -b master bitcoin_wumpuscd bitcoin_wumpusgit remote add upstream git://github.com/laanwj/bitcoin.git -m mastergit fetch upstream -pgit checkout 2012_05_overviewpageWhich leads me to a
error: pathspec '2012_05_overviewpage' did not match any file(s) known to git. I tried the https version, which led me to the same error. This steps were the same I did some time ago for the official bitcoin Git. Any ideas? -
laanwj commented at 7:58 AM on May 18, 2012: member
git checkout upstream/2012_05_overviewpage
edit:
git branch -ato get a list of all branches -
Diapolo commented at 8:10 AM on May 18, 2012: none
Ahhh okay currently I only checkout local branches and this is a remote one ...
-
Diapolo commented at 8:20 AM on May 18, 2012: none
I guess I should have added
_restore, now it worked :). Checked out the changes and they work and look good, so ACK! -
320fe1015a
Restore overviewpage (put transactions back within frame)
- Also, change "(out of sync)" to only red, instead of red and bold, which a bit more subtle - Move label stylesheets to xml
-
laanwj commented at 8:35 AM on May 18, 2012: member
Moved the color:red stylesheets to the XML file.
- laanwj referenced this in commit 4a9130aca2 on May 18, 2012
- laanwj merged this on May 18, 2012
- laanwj closed this on May 18, 2012
- coblee referenced this in commit f9c1a5e98c on Jul 17, 2012
- laanwj deleted the branch on Apr 9, 2014
- suprnurd referenced this in commit 57fd9e9e2a on Dec 5, 2017
- lateminer referenced this in commit 59672c4af0 on Jan 22, 2019
- lateminer referenced this in commit 7fb724ffe4 on May 6, 2020
- DrahtBot locked this on Sep 8, 2021