diff options
| author | BlueRaja <BlueRaja.admin@gmail.com> | 2013-03-07 03:00:04 -0600 |
|---|---|---|
| committer | BlueRaja <BlueRaja.admin@gmail.com> | 2013-03-07 03:00:04 -0600 |
| commit | 534566ca37d8da800188b073652003671fc9671a (patch) | |
| tree | cd14d9353d19a365a80b519a21feeefe9152efcd /css | |
| parent | ef912adeeac6be3d623d602ce17f69b15ce65aa8 (diff) | |
| parent | ee270d30697914e322dd1256e2e3e0b60df0ced5 (diff) | |
| download | pathery-534566ca37d8da800188b073652003671fc9671a.tar.xz | |
Merge branch 'master' of git.raylu.net:pathery
Conflicts:
includes/db.inc.php
Diffstat (limited to 'css')
| -rw-r--r-- | css/chat.css | 8 | ||||
| -rw-r--r-- | css/mapeditor.css | 10 | ||||
| -rw-r--r-- | css/maps.css | 7 |
3 files changed, 23 insertions, 2 deletions
diff --git a/css/chat.css b/css/chat.css index 9608093..66cd086 100644 --- a/css/chat.css +++ b/css/chat.css @@ -3,7 +3,7 @@ font-family: 'Trebuchet MS1', 'Trebuchet MS', sans-serif; border: 1px solid gray; background-color:#999; - width: 700px; + width: 680px; margin: 7px; padding: 2px; border-radius: 10px; @@ -11,7 +11,11 @@ border-top-right-radius: 20px; } .chatButton { - margin: 4px; + margin: 0px; +} +.chatMute { + margin: 0px; + width: 15px; } #chatContainer { diff --git a/css/mapeditor.css b/css/mapeditor.css new file mode 100644 index 0000000..60a6e78 --- /dev/null +++ b/css/mapeditor.css @@ -0,0 +1,10 @@ + + + +.plusMinus { + float:left; + width:130px; + border:1px solid gray; + padding:2px; + margin:2px; +}
\ No newline at end of file diff --git a/css/maps.css b/css/maps.css index 604192c..86a2f76 100644 --- a/css/maps.css +++ b/css/maps.css @@ -188,6 +188,13 @@ background-image: url(../images/OverlayTileFaceted20.png);
}
+.tileDisplay div {
+ float:left;
+ border:1px solid blue;
+ margin:2px;
+ width:36px;
+ height:36px;
+}
/* grid stuff */
|