1
0
Fork 0

images, html

This commit is contained in:
hkernbach 2016-04-15 13:48:16 +02:00
parent 4fe311ba92
commit d6d741a27a
10 changed files with 23 additions and 3 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

View File

@ -3,7 +3,8 @@
<nav class="navbar"> <nav class="navbar">
<div class="primary"> <div class="primary">
<div class="navlogo"> <div class="navlogo">
<a class="logo" href="#"><img class="arangodbLogo" src="img/DEVLOGO.png"/></a> <a class="logo big" href="#"><img class="arangodbLogo" src="img/arangodb_logo_big.png"/></a>
<a class="logo small" href="#"><img class="arangodbLogo" src="img/arangodb_logo_small.png"/></a>
</div> </div>
<!-- <div id="progressPlaceholderIcon"></div> --> <!-- <div id="progressPlaceholderIcon"></div> -->
<div class="statmenu" id="statisticBar"> <div class="statmenu" id="statisticBar">

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View File

@ -1,6 +1,7 @@
<script id="collectionsItemView.ejs" type="text/template"> <script id="collectionsItemView.ejs" type="text/template">
<div class="paddingBox"> <div class="paddingBox">
<div class="borderBox"></div> <div class="borderBox"></div>
<!--
<div class="iconSet"> <div class="iconSet">
<span id="editCollection_<%=model.get('name')%>" class="icon_arangodb_settings2" alt="Edit collection properties" title="Edit collection properties"></span> <span id="editCollection_<%=model.get('name')%>" class="icon_arangodb_settings2" alt="Edit collection properties" title="Edit collection properties"></span>
<% if(model.get('status') === "loaded") { %> <% if(model.get('status') === "loaded") { %>
@ -9,7 +10,7 @@
<span class="icon_arangodb_info disabled" alt="disabled"></span> <span class="icon_arangodb_info disabled" alt="disabled"></span>
<%}%> <%}%>
</div> </div>
-->
<i class="collection-type-icon fa <%= model.get('picture') %>"></i> <i class="collection-type-icon fa <%= model.get('picture') %>"></i>
<!--<img src="<%= model.get('picture') %>" height="50" width="50" alt="" class="icon">--> <!--<img src="<%= model.get('picture') %>" height="50" width="50" alt="" class="icon">-->
<div class="tileBadge"> <div class="tileBadge">

View File

@ -27,7 +27,8 @@
var callback = function(error, lockedCollections) { var callback = function(error, lockedCollections) {
var self = this; var self = this;
if (error) { if (error) {
arangoHelper.arangoError("Collections", "Could not check locked collections"); //arangoHelper.arangoError("Collections", "Could not check locked collections");
console.log("Could not check locked collections");
} }
else { else {
this.collection.each(function(model) { this.collection.each(function(model) {

View File

@ -91,6 +91,10 @@ $navbar-size: 150px;
@extend %pull-left; @extend %pull-left;
height: 60px; height: 60px;
width: 100%; width: 100%;
.small {
display: none;
}
} }
.navmenu { .navmenu {

View File

@ -29,6 +29,19 @@
} }
// NAVIGATION LEFT // NAVIGATION LEFT
.navlogo {
.big {
display: none;
}
.small {
display: block;
height: auto;
width: 28px;
}
}
.navbar, .navbar,
.navmenu, .navmenu,
.primary, .primary,