projects
/
www.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix modes on files (why were these all executable?)
[www.git]
/
style.css
diff --git
a/style.css
b/style.css
old mode 100755
(executable)
new mode 100644
(file)
index
e67da8a
..
dffaa43
--- a/
style.css
+++ b/
style.css
@@
-121,7
+121,7
@@
strong
#navigation
{
background-color: #181818;
#navigation
{
background-color: #181818;
- border: 3px solid #
404040
;
+ border: 3px solid #
606018
;
color: #d0d060;
padding: 0.3em;
position: absolute;
color: #d0d060;
padding: 0.3em;
position: absolute;
@@
-133,20
+133,12
@@
strong
#navigation a:link,#navigation a:visited
{
#navigation a:link,#navigation a:visited
{
-<<<<<<< HEAD
- color: #d0d060;
-=======
- color: #b0b0b0;
->>>>>>> 8e5d15f920de50d67239e70fc39673ba73bd549c
+ color: #d0d040;
}
#navigation a:active,#navigation a:hover
{
}
#navigation a:active,#navigation a:hover
{
-<<<<<<< HEAD
- color: #e0e065;
-=======
- color: #c0c0c0;
->>>>>>> 8e5d15f920de50d67239e70fc39673ba73bd549c
+ color: #e0e045;
}
#navigation ul
}
#navigation ul