1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 20:35:25 +02:00

Merge branch 'dev'

Conflicts:
	js/controllers.js
This commit is contained in:
Michael Crosby 2013-06-23 09:34:19 -09:00
commit 5dc53c3abe
25 changed files with 883 additions and 242 deletions

View file

@ -89,10 +89,23 @@
}
.footer {
max-height:6px;
max-height:6px;
}
#response {
width: 80%;
margin: 0 auto;
}
#editor {
height: 300px;
width: 100%;
border: 1px solid #DDD;
margin-top: 5px;
}
.messages {
max-height: 50px;
overflow-y: scroll;
overflow-x: hidden;
}