diff --git a/README.md b/README.md index 6a6a41c22..cbb4781f8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -

@@ -11,10 +10,8 @@ [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YHXZJQNJQ36H6) **_Portainer_** is a lightweight management UI which allows you to **easily** manage your different Docker environments (Docker hosts or Swarm clusters). - -**_Portainer_** is meant to be as **simple** to deploy as it is to use. It consists of a single container that can run on any Docker engine (can be deployed as Linux container or a Windows native container). - -**_Portainer_** allows you to manage your Docker containers, images, volumes, networks and more ! It is compatible with the *standalone Docker* engine and with *Docker Swarm mode*. +**_Portainer_** is meant to be as **simple** to deploy as it is to use. It consists of a single container that can run on any Docker engine (can be deployed as Linux container or a Windows native container, supports other platforms too). +**_Portainer_** allows you to manage your all your Docker resources (containers, images, volumes, networks and more) ! It is compatible with the *standalone Docker* engine and with *Docker Swarm mode*. ## Demo diff --git a/app/docker/views/containers/edit/container.html b/app/docker/views/containers/edit/container.html index a251ae2d2..37003efad 100644 --- a/app/docker/views/containers/edit/container.html +++ b/app/docker/views/containers/edit/container.html @@ -177,7 +177,6 @@ -
diff --git a/app/docker/views/images/edit/image.html b/app/docker/views/images/edit/image.html index ac0a13239..c1196e493 100644 --- a/app/docker/views/images/edit/image.html +++ b/app/docker/views/images/edit/image.html @@ -1,4 +1,4 @@ - + Images > {{ image.Id }} @@ -180,8 +180,8 @@
-
+
diff --git a/assets/css/app.css b/assets/css/app.css index 4532ce454..e6f40c89e 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -11,31 +11,10 @@ html, body, #page-wrapper, #content-wrapper, .page-content, #view { white-space: normal !important; } -.messages { - max-height: 50px; - overflow-x: hidden; - overflow-y: scroll; -} - -.legend .title { - padding: 0 0.3em; - margin: 0.5em; - border-style: solid; - border-width: 0 0 0 1em; -} - -.logo { - display: inline; - max-width: 155px; - max-height: 55px; -} - -.containerNameInput { - width: 85%; - border:none; - background:none; - border-bottom: 1px solid black; -} +.logo { display: inline; max-width: 155px; max-height: 55px; } +.legend .title { padding: 0 0.3em; margin: 0.5em; border-style: solid; border-width: 0 0 0 1em; } +.messages { max-height: 50px; overflow-x: hidden; overflow-y: scroll; } +.containerNameInput { width: 85%; border:none; background:none; border-bottom: 1px solid black; } .containerNameInput:active, .containerNameInput:focus { outline:none; diff --git a/build/linux/Dockerfile b/build/linux/Dockerfile index e16144acc..dbaffed51 100644 --- a/build/linux/Dockerfile +++ b/build/linux/Dockerfile @@ -1,11 +1,7 @@ FROM portainer/base - COPY dist / - VOLUME /data - WORKDIR / - EXPOSE 9000 ENTRYPOINT ["/portainer"] diff --git a/index.html b/index.html index 704ec3d3e..bbebbd23f 100644 --- a/index.html +++ b/index.html @@ -1,22 +1,17 @@ - - + Portainer - - - - @@ -72,5 +67,5 @@
- - + +