Merge with Matt's code

This commit is contained in:
chris2tof committed 2011-11-20 01:26:24 +08:00
1 parent 2754f49fe9
commit e99affbddd
81 files changed
+51 -1084

No files matched your search

Vendored Regular → Executable
View File
File mode changed.
@@ -1,21 +1,52 @@
.preview h2 {
font-size: large;
background-color: red;
}
.production h2 {
font-size: large;
background-color: green;
}
.widget_index {
width: 200px;
height: 120px;
border: solid;
/* module */
#module{
float: left;
width: 170px;
margin-left: 20px;
}
.widget_latest_post{
width: 200px;
height: 120px;
border: solid;
.production {
padding: 10px;
font-size: 12px;
border: 1px solid #e1e1e1;
margin-bottom: 10px;
background: #DDDAD0;
color: #484339;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
-moz-box-shadow: 0 0 5px #33322C;
-webkit-box-shadow: 0 0 5px #33322C;
box-shadow: 0 0 5px #33322C;
text-shadow: 0 1px 0 #fff;
line-height: 1.4;
font-family: Arial;
}
.production h2{
font-size: 18px;
margin-bottom: 10px;
text-shadow: 0 1px 0 #fff;
border-left: 4px solid #B6300C;
line-height: 20px;
padding-left: 5px;
}
.production table{
border: 1px solid #9b968c;
padding: 5px;
width: 145px;
}
.production th{
background: #d3cfc3;
font-weight: bold;
}
.production th, .production tr, .production td{
border: 1px solid #9b968c;
padding: 5px;
}
.production a{
color: #9a460e;
text-decoration: none;
}
.production a:hover{
text-decoration: underline;
>>>>>>> e4dc5bd10760d23b7696c1df132454db368a73cc
}
Vendored Regular → Executable
View File
File mode changed.
Vendored Regular → Executable
View File
File mode changed.