Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

web ui

This commit is contained in:
Heiko Kernbach 2015-07-24 16:30:38 +02:00
parent 959040d3c5
commit b14bf85264
16 changed files with 47 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/apps/system/_admin/aardvark/APP/clusterFrontend/build/cluster.js
View File

@ -16613,7 +16613,7 @@ window.StatisticsCollection = Backbone.Collection.extend({
tempColor = "red"; tempColor = "red";
} }
else { else {
tempColor = "green"; tempColor = "#7da817";
p = "+"; p = "+";
} }
$("#" + a).html(self.history[self.server][a][0] + '<br/><span class="dashboard-figurePer" style="color: ' $("#" + a).html(self.history[self.server][a][0] + '<br/><span class="dashboard-figurePer" style="color: '

26
js/apps/system/_admin/aardvark/APP/clusterFrontend/build/style.css
View File

@ -1876,7 +1876,7 @@ a.inactive.coordinator, a.inactive.dbserver {
fill: #d3d3d3; } fill: #d3d3d3; }
ul.link-dropdown-menu, ul.user-dropdown-menu, ul.script-dropdown-menu, ul.gv-dropdown-menu { ul.link-dropdown-menu, ul.user-dropdown-menu, ul.script-dropdown-menu, ul.gv-dropdown-menu {
background-color: #e4ecd9; background-color: #F5F8F0;
border-color: #666; border-color: #666;
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
@ -1915,7 +1915,8 @@ ul.link-dropdown-menu, ul.user-dropdown-menu, ul.script-dropdown-menu, ul.gv-dro
background: #788f3d; } background: #788f3d; }
nav.navbar { nav.navbar {
height: 38px; padding-top: 6px;
height: 44px;
margin-bottom: 3px; margin-bottom: 3px;
top: 0; } top: 0; }
nav.navbar .arangodbLogo { nav.navbar .arangodbLogo {
@ -2400,7 +2401,7 @@ div .tile, div .bigtile {
box-shadow: none; box-shadow: none;
background-color: #fff; background-color: #fff;
border-radius: 3px; border-radius: 3px;
border: 1px solid rgba(243, 247, 237, 0.75); border: 1px solid rgba(104, 103, 102, 0.1);
font-size: 14px; font-size: 14px;
list-style: none; list-style: none;
margin-bottom: 13px; margin-bottom: 13px;
@ -4661,10 +4662,11 @@ input.search-input {
div.headerBar { div.headerBar {
background-color: #fff; background-color: #fff;
border-radius: 3px; border-radius: 3px;
border: 1px solid rgba(243, 247, 237, 0.75); border: 1px solid rgba(104, 103, 102, 0.1);
color: #fff; color: #fff;
font-size: 16px; font-size: 16px;
height: 36px; height: 36px;
margin-top: 6px;
margin-bottom: 5px; margin-bottom: 5px;
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
@ -4726,11 +4728,11 @@ div.headerBar > div.headerButtonBar {
border-radius: 0; border-radius: 0;
padding: 8px 0; } padding: 8px 0; }
.breadcrumb .disabledBread { .breadcrumb .disabledBread {
color: #c2c2c2; color: #666;
float: left; float: left;
padding-left: 5px; } padding-left: 5px; }
.breadcrumb .activeBread { .breadcrumb .activeBread {
color: #b9d375; color: #7da817;
float: left; float: left;
padding-left: 5px; } padding-left: 5px; }
@ -5100,7 +5102,7 @@ div .tile, div .bigtile {
box-shadow: none; box-shadow: none;
background-color: #fff; background-color: #fff;
border-radius: 3px; border-radius: 3px;
border: 1px solid rgba(243, 247, 237, 0.75); border: 1px solid rgba(104, 103, 102, 0.1);
font-size: 14px; font-size: 14px;
list-style: none; list-style: none;
margin-bottom: 13px; margin-bottom: 13px;
@ -5274,7 +5276,7 @@ div .bigtile {
.dashboard-large-chart { .dashboard-large-chart {
margin-right: 12px; margin-right: 12px;
border: 1px solid rgba(243, 247, 237, 0.75); border: 1px solid rgba(104, 103, 102, 0.1);
border-radius: 3px; } border-radius: 3px; }
.dashboard-large-chart .dashboard-large-chart-inner { .dashboard-large-chart .dashboard-large-chart-inner {
background-color: #fff; background-color: #fff;
@ -5287,7 +5289,7 @@ div .bigtile {
margin-bottom: 0; } margin-bottom: 0; }
.dashboard-small-chart { .dashboard-small-chart {
border: 1px solid rgba(243, 247, 237, 0.75); border: 1px solid rgba(104, 103, 102, 0.1);
border-radius: 3px; } border-radius: 3px; }
.dashboard-small-chart .dashboard-small-chart-inner { .dashboard-small-chart .dashboard-small-chart-inner {
background-color: #fff; background-color: #fff;
@ -5315,7 +5317,7 @@ div .bigtile {
.dashboard-medium-chart .dashboard-interior-chart { .dashboard-medium-chart .dashboard-interior-chart {
margin-bottom: 0; } margin-bottom: 0; }
.dashboard-medium-chart .dashboard-medium-chart-outer { .dashboard-medium-chart .dashboard-medium-chart-outer {
border: 1px solid rgba(243, 247, 237, 0.75); border: 1px solid rgba(104, 103, 102, 0.1);
border-radius: 3px; } border-radius: 3px; }
.dashboard-medium-chart .dashboard-medium-chart-menu { .dashboard-medium-chart .dashboard-medium-chart-menu {
-moz-border-radius: 2px; -moz-border-radius: 2px;
@ -5337,7 +5339,7 @@ div .bigtile {
stroke-width: 1.5px; } stroke-width: 1.5px; }
.dashboard-tendency-container { .dashboard-tendency-container {
border: 1px solid rgba(243, 247, 237, 0.75); border: 1px solid rgba(104, 103, 102, 0.1);
border-radius: 3px; } border-radius: 3px; }
.dashboard-tendency-container .dashboard-tendency-chart { .dashboard-tendency-container .dashboard-tendency-chart {
background-color: #fff; background-color: #fff;
@ -5361,7 +5363,7 @@ div .bigtile {
text-align: center; } text-align: center; }
.dashboard-bar-chart-container { .dashboard-bar-chart-container {
border: 1px solid rgba(243, 247, 237, 0.75); border: 1px solid rgba(125, 168, 23, 0.01);
border-radius: 3px; } border-radius: 3px; }
.dashboard-bar-chart-container .dashboard-bar-chart { .dashboard-bar-chart-container .dashboard-bar-chart {
background-color: #fff; background-color: #fff;

2
js/apps/system/_admin/aardvark/APP/frontend/js/templates/documentView.ejs
View File

@ -42,7 +42,7 @@
</div> </div>
<div id="tableDiv" class="innerContent"> <div id="tableDiv" class="innerContent document-content-div">
<div id="documentEditor" class="document-editor"></div> <div id="documentEditor" class="document-editor"></div>
<div class="bottomButtonBar"> <div class="bottomButtonBar">

2
js/apps/system/_admin/aardvark/APP/frontend/js/views/dashboardView.js
View File

@ -209,7 +209,7 @@
tempColor = "red"; tempColor = "red";
} }
else { else {
tempColor = "green"; tempColor = "#7da817";
p = "+"; p = "+";
} }
$("#" + a).html(self.history[self.server][a][0] + '<br/><span class="dashboard-figurePer" style="color: ' $("#" + a).html(self.history[self.server][a][0] + '<br/><span class="dashboard-figurePer" style="color: '

7
js/apps/system/_admin/aardvark/APP/frontend/js/views/documentsView.js
View File

@ -949,7 +949,12 @@
); );
total = $('#totalDocuments'); total = $('#totalDocuments');
} }
total.html(this.collection.getTotal() + " document(s)"); if (this.type === 'document') {
total.html(this.collection.getTotal() + " document(s)");
}
if (this.type === 'edge') {
total.html(this.collection.getTotal() + " edge(s)");
}
}, },
breadcrumb: function () { breadcrumb: function () {

2
js/apps/system/_admin/aardvark/APP/frontend/scss/_abstracts.scss
View File

@ -219,7 +219,7 @@
%dropdown-menu { %dropdown-menu {
@extend %pull-left; @extend %pull-left;
background-color: #e4ecd9; background-color: $c-lightgreen-transp-bg;
border: { border: {
color: $c-darker-grey; color: $c-darker-grey;
style: solid; style: solid;

2
js/apps/system/_admin/aardvark/APP/frontend/scss/_arangoTable.scss
View File

@ -18,7 +18,7 @@
} }
tr:nth-child(odd) { tr:nth-child(odd) {
background: $c-lightgreen-transp-bg; background: $c-table-odd-color;
} }
td { td {

4
js/apps/system/_admin/aardvark/APP/frontend/scss/_colors.scss
View File

@ -13,6 +13,8 @@ $c-lightgreen-2-transp-bg: #F5F8F0;
$c-positive: #8aa051; $c-positive: #8aa051;
$c-positive-hover: #788f3d; $c-positive-hover: #788f3d;
$c-table-odd-color: rgba(104, 103, 102, 0.05);
$c-negative: #da4f49; $c-negative: #da4f49;
$c-negative-hover: #be342e; $c-negative-hover: #be342e;
$c-negative-bg: desaturate(lighten($c-negative-hover, 40%), 50%); $c-negative-bg: desaturate(lighten($c-negative-hover, 40%), 50%);
@ -126,7 +128,7 @@ $c-api-docs-bg: #f4f3f3;
$c-api-docs-bg-input: #8f8d8c; $c-api-docs-bg-input: #8f8d8c;
$c-breadcrumb-bg: #f5f5f5; $c-breadcrumb-bg: #f5f5f5;
$c-breadcrumb-a-active-bread: rgba(185, 211, 117, 1); $c-breadcrumb-a-active-bread: #7da817;
$c-breadcrumb-a-active-bread-transp: rgba(185, 211, 117, 0.2); $c-breadcrumb-a-active-bread-transp: rgba(185, 211, 117, 0.2);
$c-logs-table-id-thead-bg: #f9f9f9; $c-logs-table-id-thead-bg: #f9f9f9;

4
js/apps/system/_admin/aardvark/APP/frontend/scss/_dataTables.scss
View File

@ -67,7 +67,7 @@ table.arangoDataTable tr.even {
.api-container #resources > li.resource:nth-child(odd), .api-container #resources > li.resource:nth-child(odd),
table.arangoDataTable tr.odd { table.arangoDataTable tr.odd {
background-color: $c-breadcrumb-a-active-bread-transp; background-color: $c-table-odd-color;
} }
// TODO Hard cleanup // TODO Hard cleanup
@ -114,7 +114,7 @@ table.arangoDataTable tr.odd {
color: $c-darker-grey; color: $c-darker-grey;
font-weight: 100; font-weight: 100;
float: left; float: left;
margin-top: -56px !important; margin-top: -37px !important;
padding-left: 10px; padding-left: 10px;
} }

4
js/apps/system/_admin/aardvark/APP/frontend/scss/_documentView.scss
View File

@ -3,6 +3,10 @@
min-height: 0; min-height: 0;
} }
.document-content-div {
margin-top: 10px;
}
.document-info { .document-info {
background-color: #fff; background-color: #fff;

2
js/apps/system/_admin/aardvark/APP/frontend/scss/_general.scss
View File

@ -13,7 +13,7 @@
min-height: 200px; min-height: 200px;
background-color: $c-white; background-color: $c-white;
border-radius: 3px; border-radius: 3px;
border: 1px solid rgba(243,247,237,0.75); border: 1px solid rgba(104, 103, 102, 0.10);
padding-top: 13px; padding-top: 13px;
} }

5
js/apps/system/_admin/aardvark/APP/frontend/scss/_headerBar.scss
View File

@ -74,10 +74,11 @@ input.search-input {
div.headerBar { div.headerBar {
background-color: $c-white; background-color: $c-white;
border-radius: 3px; border-radius: 3px;
border: 1px solid rgba(243,247,237,0.75); border: 1px solid rgba(104, 103, 102, 0.10);
color: $c-white; color: $c-white;
font-size: 16px; font-size: 16px;
height: 36px; height: 36px;
margin-top: 6px;
margin-bottom: 5px; margin-bottom: 5px;
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
@ -172,7 +173,7 @@ div.headerBar > div.headerButtonBar {
// Disabled breadcrumb // Disabled breadcrumb
.disabledBread { .disabledBread {
color: $c-c2grey; color: $c-darker-grey;
float: left; float: left;
padding-left: 5px; padding-left: 5px;
} }

3
js/apps/system/_admin/aardvark/APP/frontend/scss/_navbar.scss
View File

@ -15,7 +15,8 @@
nav.navbar { nav.navbar {
@extend %fixedbar; @extend %fixedbar;
height: 38px; padding-top: 6px;
height: 44px;
margin-bottom: 3px; margin-bottom: 3px;
top: 0; top: 0;

10
js/apps/system/_admin/aardvark/APP/frontend/scss/_newDashboard.scss
View File

@ -42,7 +42,7 @@
.dashboard-large-chart { .dashboard-large-chart {
@extend %dashboard-chart-basic; @extend %dashboard-chart-basic;
margin-right: 12px; margin-right: 12px;
border: 1px solid rgba(243,247,237,0.75); border: 1px solid rgba(104, 103, 102, 0.10);
border-radius: 3px; border-radius: 3px;
.dashboard-large-chart-inner { .dashboard-large-chart-inner {
@ -65,7 +65,7 @@
.dashboard-small-chart { .dashboard-small-chart {
@extend %dashboard-chart-basic; @extend %dashboard-chart-basic;
border: 1px solid rgba(243,247,237,0.75); border: 1px solid rgba(104, 103, 102, 0.10);
border-radius: 3px; border-radius: 3px;
.dashboard-small-chart-inner { .dashboard-small-chart-inner {
@ -114,7 +114,7 @@
} }
.dashboard-medium-chart-outer { .dashboard-medium-chart-outer {
border: 1px solid rgba(243,247,237,0.75); border: 1px solid rgba(104, 103, 102, 0.10);
border-radius: 3px; border-radius: 3px;
} }
@ -151,7 +151,7 @@
.dashboard-tendency-container { .dashboard-tendency-container {
@extend %dashboard-chart-box; @extend %dashboard-chart-box;
@extend %dashboard-chart-basic; @extend %dashboard-chart-basic;
border: 1px solid rgba(243,247,237,0.75); border: 1px solid rgba(104, 103, 102, 0.10);
border-radius: 3px; border-radius: 3px;
.dashboard-tendency-chart { .dashboard-tendency-chart {
@ -193,7 +193,7 @@
.dashboard-bar-chart-container { .dashboard-bar-chart-container {
@extend %dashboard-chart-box; @extend %dashboard-chart-box;
@extend %dashboard-chart-basic; @extend %dashboard-chart-basic;
border: 1px solid rgba(243,247,237,0.75); border: 1px solid rgba(125, 168, 23, 0.01);
border-radius: 3px; border-radius: 3px;
.dashboard-bar-chart { .dashboard-bar-chart {

1
js/apps/system/_admin/aardvark/APP/frontend/scss/_pagination.scss
View File

@ -7,6 +7,7 @@
.pagination-line { .pagination-line {
margin: 20px 0; margin: 20px 0;
margin-bottom: 0;
padding-top: 12px; padding-top: 12px;
text-align: center; text-align: center;
margin-top: 0; margin-top: 0;

2
js/apps/system/_admin/aardvark/APP/frontend/scss/_tiles.scss
View File

@ -16,7 +16,7 @@ $iconsize: 50px;
background-color: $c-white; background-color: $c-white;
border-radius: 3px; border-radius: 3px;
border: 1px solid rgba(243,247,237,0.75); border: 1px solid rgba(104, 103, 102, 0.1);
font-size: 14px; font-size: 14px;
list-style: none; list-style: none;
margin: { margin: {