summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias <mathias-github@users.noreply.github.com>2016-03-27 20:32:27 +0200
committerMathias <mathias-github@users.noreply.github.com>2016-03-28 18:42:14 +0200
commit83c4cba1fdcc4433a3af2686d8a57c4603eb6ea7 (patch)
tree0b575346bf161b7ac55abd592fd3da85d0e5bef1
parentMerge pull request #3099 from LogicParrot/passive (diff)
downloadcuberite-83c4cba1fdcc4433a3af2686d8a57c4603eb6ea7.tar
cuberite-83c4cba1fdcc4433a3af2686d8a57c4603eb6ea7.tar.gz
cuberite-83c4cba1fdcc4433a3af2686d8a57c4603eb6ea7.tar.bz2
cuberite-83c4cba1fdcc4433a3af2686d8a57c4603eb6ea7.tar.lz
cuberite-83c4cba1fdcc4433a3af2686d8a57c4603eb6ea7.tar.xz
cuberite-83c4cba1fdcc4433a3af2686d8a57c4603eb6ea7.tar.zst
cuberite-83c4cba1fdcc4433a3af2686d8a57c4603eb6ea7.zip
-rw-r--r--Server/webadmin/files/favicon.icobin32038 -> 15086 bytes
-rw-r--r--Server/webadmin/files/login.css3
-rw-r--r--Server/webadmin/files/logo_login.pngbin18057 -> 2550 bytes
-rw-r--r--Server/webadmin/files/style.css3
-rw-r--r--src/Resources/icon.icobin353118 -> 101726 bytes
-rw-r--r--src/Resources/icon_128.pngbin26758 -> 1550 bytes
-rw-r--r--src/Resources/icon_16.pngbin0 -> 352 bytes
-rw-r--r--src/Resources/icon_256.pngbin66137 -> 2562 bytes
-rw-r--r--src/Resources/icon_32.pngbin0 -> 595 bytes
-rw-r--r--src/Resources/icon_48.pngbin0 -> 811 bytes
10 files changed, 2 insertions, 4 deletions
diff --git a/Server/webadmin/files/favicon.ico b/Server/webadmin/files/favicon.ico
index ea4bde926..2cb6a255b 100644
--- a/Server/webadmin/files/favicon.ico
+++ b/Server/webadmin/files/favicon.ico
Binary files differ
diff --git a/Server/webadmin/files/login.css b/Server/webadmin/files/login.css
index ad94e5810..840125a34 100644
--- a/Server/webadmin/files/login.css
+++ b/Server/webadmin/files/login.css
@@ -37,8 +37,7 @@ h1 {
.row1 {
border-bottom: 1px solid #000;
- height: 100px;
- max-height: 100px;
+ padding: 13px 0 13px 0;
}
.row2 {
diff --git a/Server/webadmin/files/logo_login.png b/Server/webadmin/files/logo_login.png
index d2155f928..2b06cba75 100644
--- a/Server/webadmin/files/logo_login.png
+++ b/Server/webadmin/files/logo_login.png
Binary files differ
diff --git a/Server/webadmin/files/style.css b/Server/webadmin/files/style.css
index 8cb803a05..db111fe1b 100644
--- a/Server/webadmin/files/style.css
+++ b/Server/webadmin/files/style.css
@@ -41,9 +41,8 @@ h1 {
.row1 {
border-bottom: 1px #000 solid;
- height: 100px;
- max-height: 100px;
background: #fff url(header.png) repeat-x top left;
+ padding: 13px 0 13px 0;
}
.row2 {
diff --git a/src/Resources/icon.ico b/src/Resources/icon.ico
index 4024523a1..4d01896d7 100644
--- a/src/Resources/icon.ico
+++ b/src/Resources/icon.ico
Binary files differ
diff --git a/src/Resources/icon_128.png b/src/Resources/icon_128.png
index 87d939a04..3641f66af 100644
--- a/src/Resources/icon_128.png
+++ b/src/Resources/icon_128.png
Binary files differ
diff --git a/src/Resources/icon_16.png b/src/Resources/icon_16.png
new file mode 100644
index 000000000..9b3e7d5dd
--- /dev/null
+++ b/src/Resources/icon_16.png
Binary files differ
diff --git a/src/Resources/icon_256.png b/src/Resources/icon_256.png
index 9a77a490f..928605045 100644
--- a/src/Resources/icon_256.png
+++ b/src/Resources/icon_256.png
Binary files differ
diff --git a/src/Resources/icon_32.png b/src/Resources/icon_32.png
new file mode 100644
index 000000000..b0bf87eca
--- /dev/null
+++ b/src/Resources/icon_32.png
Binary files differ
diff --git a/src/Resources/icon_48.png b/src/Resources/icon_48.png
new file mode 100644
index 000000000..9e790ebd1
--- /dev/null
+++ b/src/Resources/icon_48.png
Binary files differ