projects
/
www.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
8e5d15f
)
Merge branch 'master' of palpatine:/srv/git/www
author
Steven McDonald
<steven.mcdonald@libremail.me>
Mon, 7 Feb 2011 11:43:13 +0000
(22:43 +1100)
committer
Steven McDonald
<steven.mcdonald@libremail.me>
Mon, 7 Feb 2011 11:43:13 +0000
(22:43 +1100)
Conflicts:
style.css
style.css
patch
|
blob
|
history
diff --git
a/style.css
b/style.css
index b9c4c5d8745356a387dde9c96324f5352b584ced..e67da8af0a9d9a767b0ac17bee332d4d952b6791 100755
(executable)
--- a/
style.css
+++ b/
style.css
@@
-122,7
+122,7
@@
strong
{
background-color: #181818;
border: 3px solid #404040;
- color: #
b0b0b
0;
+ color: #
d0d06
0;
padding: 0.3em;
position: absolute;
right: 20px;
@@
-133,12
+133,20
@@
strong
#navigation a:link,#navigation a:visited
{
+<<<<<<< HEAD
+ color: #d0d060;
+=======
color: #b0b0b0;
+>>>>>>> 8e5d15f920de50d67239e70fc39673ba73bd549c
}
#navigation a:active,#navigation a:hover
{
+<<<<<<< HEAD
+ color: #e0e065;
+=======
color: #c0c0c0;
+>>>>>>> 8e5d15f920de50d67239e70fc39673ba73bd549c
}
#navigation ul