github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

Misc. html/css tweaks, bumped version.

pull/2/head
Kevan Ahlquist 2014-12-01 00:13:53 -06:00
parent 012c8ed145
commit 57d8ae3e01
6 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/app.js
View File

@ -14,5 +14,5 @@ angular.module('dockerui', ['ngRoute', 'dockerui.services', 'dockerui.filters',
// You need to set this to the api endpoint without the port i.e. http://192.168.1.9 // You need to set this to the api endpoint without the port i.e. http://192.168.1.9
.constant('DOCKER_ENDPOINT', '/dockerapi') .constant('DOCKER_ENDPOINT', '/dockerapi')
.constant('DOCKER_PORT', '') // Docker port, leave as an empty string if no port is requred. If you have a port, prefix it with a ':' i.e. :4243 .constant('DOCKER_PORT', '') // Docker port, leave as an empty string if no port is requred. If you have a port, prefix it with a ':' i.e. :4243
.constant('UI_VERSION', 'v0.4') .constant('UI_VERSION', 'v0.5')
.constant('DOCKER_API_VERSION', 'v1.8'); .constant('DOCKER_API_VERSION', 'v1.15');

6
app/components/footer/statusbar.html
View File

@ -1,3 +1,3 @@
<div class="footer center well"> <footer class="center well">
<p><small>Docker API Version: <strong>{{ apiVersion }}</strong> UI Version: <strong>{{ uiVersion }}</strong> <a style="float:right" href="https://github.com/crosbymichael/dockerui">dockerui</a></small></p> <p><small>Docker API Version: <strong>{{ apiVersion }}</strong> UI Version: <strong>{{ uiVersion }}</strong> <a class="pull-right" href="https://github.com/crosbymichael/dockerui">dockerui</a></small></p>
</div> </footer>

18
app/components/masthead/masthead.html
View File

@ -1,15 +1,9 @@
<div class="masthead"> <div class="masthead">
<h3 class="text-muted">DockerUI</h3> <h3 class="text-muted">DockerUI</h3>
<div class="navbar"> <ul class="nav well">
<div class="navbar-inner"> <li><a href="#">Dashboard</a></li>
<div class="container"> <li><a href="#/containers/">Containers</a></li>
<ul class="nav"> <li><a href="#/images/">Images</a></li>
<li><a href="#">Dashboard</a></li> <li><a href="#/settings/">Settings</a></li>
<li><a href="#/containers/">Containers</a></li> </ul>
<li><a href="#/images/">Images</a></li>
<li><a href="#/settings/">Settings</a></li>
</ul>
</div>
</div>
</div>
</div> </div>

2
app/components/settings/settings.html
View File

@ -1,5 +1,5 @@
<div class="detail"> <div class="detail">
<h3>Docker Information</h3> <h2>Docker Information</h2>
<div> <div>
<p class="lead"> <p class="lead">
<strong>Endpoint: </strong>{{ endpoint }}<br /> <strong>Endpoint: </strong>{{ endpoint }}<br />

25
assets/css/app.css
View File

@ -1,6 +1,5 @@
body { body {
padding-top: 20px; padding-top: 20px;
padding-bottom: 60px;
} }
.container > hr { .container > hr {
@ -35,33 +34,33 @@ body {
margin-top: 28px; margin-top: 28px;
} }
.navbar .navbar-inner { .masthead .nav {
padding: 0;
}
.navbar .nav {
margin: 0; margin: 0;
width: 100%; width: 100%;
} }
.navbar .nav li { .masthead .nav.well {
padding: 0;
}
.masthead .nav li {
display: table-cell; display: table-cell;
width: 1%; width: 1%;
float: none; float: none;
} }
.navbar .nav li a { .masthead .nav li a {
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
border-left: 1px solid rgba(255,255,255,.75); border-left: 1px solid rgba(255,255,255,.75);
border-right: 1px solid rgba(0,0,0,.1); border-right: 1px solid rgba(0,0,0,.1);
} }
.navbar .nav li:first-child a { .masthead .nav li:first-child a {
border-left: 0; border-left: 0;
border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px;
} }
.navbar .nav li:last-child a { .masthead .nav li:last-child a {
border-right: 0; border-right: 0;
border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0;
} }
@ -76,7 +75,7 @@ body {
} }
.center { .center {
width: 80%; width: 100%;
margin: 0 auto; margin: 0 auto;
} }
@ -93,8 +92,8 @@ body {
height: 50px; height: 50px;
} }
.footer { .well {
max-height:6px; padding: 10px 15px 0 15px;
} }
#response { #response {

2
index.html
View File

@ -58,7 +58,7 @@
<body> <body>
<div class="container-fluid"> <div class="container">
<div ng-include="template" ng-controller="MastheadController"></div> <div ng-include="template" ng-controller="MastheadController"></div>
<div id="view" ng-view></div> <div id="view" ng-view></div>