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

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2015-08-25 16:09:26 +02:00
parent 18f231f666 9ed2e4b3b1
commit 1e1196c55e
17 changed files with 144 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/apps/system/_admin/aardvark/APP/clusterFrontend/build/style-minified.css
View File

File diff suppressed because one or more lines are too long

BIN
js/apps/system/_admin/aardvark/APP/clusterFrontend/build/style-minified.css.gz
View File

Binary file not shown.

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

@ -1870,6 +1870,23 @@ a.inactive.coordinator, a.inactive.dbserver {
a.inactive.coordinator:hover, a.inactive.dbserver:hover, a.inactive.coordinator:focus, a.inactive.dbserver:focus {
fill: #d3d3d3; }
input.search-input, .modal-body .select2-choices input, .modal-body input, .modal-body select, .modal-body textarea {
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
background-color: #fff !important;
border: 1px solid rgba(140, 138, 137, 0.25);
box-shadow: none;
outline: none;
outline-color: transparent;
outline-style: none; }
input.search-input:focus, .modal-body input:focus, .modal-body select:focus, .modal-body textarea:focus {
border-color: #999;
box-shadow: none;
outline: none;
outline-color: transparent;
outline-style: none; }
.link-dropdown-menu, .user-dropdown-menu, .script-dropdown-menu, .gv-dropdown-menu {
background-color: #f5f8f0;
border-color: #666;
@ -2462,6 +2479,10 @@ a.button-gui {
margin-right: -6px; }
.tileList legend {
padding-left: 5px; }
.tileList .tile:first-child a {
opacity: .5; }
.tileList .tile:first-child a:hover {
opacity: 1; }
div .tile, div .bigtile {
-webkit-box-shadow: none;
@ -2504,9 +2525,13 @@ div .tile, div .bigtile {
margin-top: 12pt; }
div .tile .collection-type-icon:hover, div .bigtile .collection-type-icon:hover {
cursor: pointer; }
div .tile img.icon, div .bigtile img.icon {
height: 50px;
width: 50px; }
div .tile img, div .bigtile img {
position: relative; }
div .tile img.icon, div .bigtile img.icon {
height: 50px;
width: 50px; }
div .tile img:hover, div .bigtile img:hover {
cursor: pointer; }
div .tile a span.add-Icon, div .bigtile a span.add-Icon {
font-size: 22px;
margin-left: 22px;
@ -2575,7 +2600,7 @@ div .tile, div .bigtile {
top: 5px; }
div .tile .iconSet span, div .bigtile .iconSet span {
border-radius: 3px;
color: #000;
color: #666;
font-size: 18px;
padding-bottom: 2px;
padding-left: 3px;
@ -4716,35 +4741,20 @@ span.gv_caret {
margin-top: 2px !important; }
input.search-input {
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
background-color: #fff !important;
border: 1px solid rgba(140, 138, 137, 0.25);
box-shadow: none;
height: 14px;
line-height: 18px;
margin-right: -1px;
margin-top: 6px;
outline: none;
outline-color: transparent;
outline-style: none;
width: 120px; }
input.search-input:focus {
border-color: #999;
box-shadow: none;
outline: none;
outline-color: transparent;
outline-style: none; }
.search-field {
margin-left: 10px; }
.search-field .fa-search {
color: #c2c2c2;
font-size: 13pt;
font-size: 12pt;
opacity: .5;
position: absolute;
right: 7px;
right: 9px;
top: 9px; }
.search-field .fa-search:hover {
cursor: pointer;
@ -4898,17 +4908,14 @@ div.headerBar {
color: #736b68;
font-family: 'Open Sans', sans-serif !important;
font-size: 14px;
font-weight: 300; }
font-weight: 300;
max-height: 410px; }
.modal-body .select2-choices {
background-image: none !important;
border: 1px solid #999;
border-radius: 3px;
-webkit-box-shadow: none;
box-shadow: none; }
.modal-body .select2-choices input {
-webkit-box-shadow: none;
box-shadow: none;
outline: transparent !important; }
.modal-body .select2-choices input:active {
-webkit-box-shadow: none;
box-shadow: none;
@ -4930,8 +4937,6 @@ div.headerBar {
.modal-body .nav-tabs {
margin-top: 15px; }
.modal-body input, .modal-body select, .modal-body textarea {
border-radius: 3px;
box-shadow: none;
margin-top: 10px; }
.modal-body input[type='checkbox'] {
margin-bottom: 10px; }
@ -5248,6 +5253,10 @@ a.dbserver.double {
margin-right: -6px; }
.tileList legend {
padding-left: 5px; }
.tileList .tile:first-child a {
opacity: .5; }
.tileList .tile:first-child a:hover {
opacity: 1; }
div .tile, div .bigtile {
-webkit-box-shadow: none;
@ -5290,9 +5299,13 @@ div .tile, div .bigtile {
margin-top: 12pt; }
div .tile .collection-type-icon:hover, div .bigtile .collection-type-icon:hover {
cursor: pointer; }
div .tile img.icon, div .bigtile img.icon {
height: 50px;
width: 50px; }
div .tile img, div .bigtile img {
position: relative; }
div .tile img.icon, div .bigtile img.icon {
height: 50px;
width: 50px; }
div .tile img:hover, div .bigtile img:hover {
cursor: pointer; }
div .tile a span.add-Icon, div .bigtile a span.add-Icon {
font-size: 22px;
margin-left: 22px;
@ -5361,7 +5374,7 @@ div .tile, div .bigtile {
top: 5px; }
div .tile .iconSet span, div .bigtile .iconSet span {
border-radius: 3px;
color: #000;
color: #666;
font-size: 18px;
padding-bottom: 2px;
padding-left: 3px;
@ -5587,7 +5600,7 @@ div .bigtile {
margin: 0 12px; }
.headerBar.dashboard-headerbar {
margin: 15px 0 10px; }
margin: 20px 0; }
.modal-chart-detail .modal-dashboard-legend .dashboard-legend-inner {
padding-left: 20px; }

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

Binary file not shown.

9
js/apps/system/_admin/aardvark/APP/frontend/js/templates/arangoTable.ejs
View File

@ -1,6 +1,6 @@
<script id="arangoTable.ejs" type="text/template">
<table class="arango-table" id="<%=content.id%>">
<% console.log(content) %>
<thead>
<tr>
<% var hcounter = 0; %>
@ -9,7 +9,6 @@
<% hcounter++; });%>
</tr>
</thead>
<tbody>
<% _.each(content.rows, function(k) { var counter=0;%>
<tr>
@ -18,6 +17,12 @@
<% counter++;});%>
</tr>
<%});%>
<% if (content.rows.length === 0) { %>
<tr>
<td>No content.</td><td></td><td></td>
</tr>
<% }; %>
</tbody>
</table>
</script>

4
js/apps/system/_admin/aardvark/APP/frontend/js/templates/loginView.ejs
View File

@ -1,9 +1,7 @@
<script id="loginView.ejs" type="text/template">
<div class="loginFixedWindow">
<img id="loginLogo" src="img/logo_arangodb_transp.png"/>
<div id="loginWindow" class="login-window">
<div id="loginSpace" class="login-space"/>
<img id="loginLogo" src="img/logo_arangodb_transp.png"/>
<div id="loginSpace" class="login-space"/>
<p class="wrong-credentials" style="display:none" >Wrong credentials!</p>
<form id="loginForm">
<input class="login-input" placeholder="Username" id="loginUsername" type="text" name="username"><i class="fa fa-user"></i>

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

@ -216,6 +216,24 @@
}
}
%inputs {
@include border-radius(3px);
background-color: $c-white !important;
border: 1px solid $c-content-border;
box-shadow: none;
outline: none;
outline-color: $c-transp;
outline-style: none;
&:focus {
border-color: $c-dark-grey;
box-shadow: none;
outline: none;
outline-color: $c-transp;
outline-style: none;
}
}
%dropdown-menu {
@extend %pull-left;

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

@ -102,3 +102,7 @@
.form-actions:after {
clear: both;
}
.swagger-section #swagger-ui-container {
margin: .3em 1em !important;
}

19
js/apps/system/_admin/aardvark/APP/frontend/scss/_applicationDetailView.scss
View File

@ -9,6 +9,7 @@
position: relative;
div.header-icon-container {
border-radius: 3px;
height: 160px;
left: 0;
margin: 0 0 4px;
@ -16,11 +17,13 @@
width: 160px;
img.icon {
background-color: $c-white;
border: 1px solid $c-content-border;
border-radius: 3px;
height: auto;
max-height: 160px;
max-width: 160px;
padding: 5px;
width: auto;
}
@ -35,7 +38,7 @@
input.delete,
input.upgrade,
input.switch-mode {
margin-top: (160px - 4 * 30px) / 3;
margin-top: (170px - 4 * 30px) / 3;
}
input {
@ -49,6 +52,7 @@
input {
margin-left: 0;
margin-top: -4px;
}
.header_line {
@ -57,14 +61,19 @@
padding-right: 5px;
}
.license {
margin-left: 20px;
}
.license,
.version {
@include border-radius(3px);
background-color: $c-white;
border: 1px solid $c-editor-toolbar;
border: 1px solid $c-content-border;
color: $c-editor-toolbar;
font-size: .6em;
font-weight: 400;
padding: 0 8px 2px;
position: relative;
top: -2px;
@ -102,6 +111,7 @@
border-radius: 3px;
height: 600px;
width: 100%;
}
}
@ -118,7 +128,10 @@
border-radius: 3px;
clear: right;
float: left;
width: 198px;
margin-top: 12px;
position: relative;
right: -10px;
width: 188px;
dl {
margin-top: 0;

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

@ -9,6 +9,7 @@
border-top-right-radius: 3px;
color: $c-white;
float: right;
font-weight: 100;
height: 27px;
margin-right: 5px;
width: 82px;

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

@ -103,9 +103,6 @@ $c-state-warning: #070;
$c-state-critical: #700;
$c-icon-grey: #686766;
$c-login-window-bg: #f4f4f4;
$c-login-window-border: #868686;
$c-toolbar-bg: #f0f0f0;
$c-editor-toolbar: #a0a0a0;

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

@ -1,37 +1,22 @@
input.search-input {
@include border-radius(3px);
background-color: $c-white !important;
border: 1px solid $c-content-border;
box-shadow: none;
@extend %inputs;
height: 14px;
line-height: 18px;
margin-right: -1px;
margin-top: 6px;
outline: none;
outline-color: $c-transp;
outline-style: none;
width: 120px;
&:focus {
border-color: $c-dark-grey;
box-shadow: none;
outline: none;
outline-color: $c-transp;
outline-style: none;
}
}
.search-field {
@extend %pull-right;
margin-left: 10px;
.fa-search {
color: $c-c2grey;
font-size: 13pt;
font-size: 12pt;
opacity: .5;
position: absolute;
right: 7px;
right: 9px;
top: 9px;
&:hover {

45
js/apps/system/_admin/aardvark/APP/frontend/scss/_login.scss
View File

@ -1,29 +1,32 @@
.loginFixedWindow {
background: $c-login-bg;
background: $c-lightgreen-2-bg;
height: 100%;
left: 0;
position: fixed;
top: 0;
width: 100%;
z-index: 9999;
img {
height: 40px;
margin: 10px;
}
}
.login-window {
background-color: $c-white;
border-radius: 5px;
height: 280px;
border: 1px solid $c-content-border;
border-radius: 3px;
height: auto;
left: 50%;
margin-left: -220px !important;
margin-top: -150px;
padding-left: 10px;
padding-right: 10px;
padding: 10px;
position: absolute;
top: 50%;
width: 400px;
img {
margin-left: 12px;
}
.fa {
color: rgba(0, 0, 0, .4);
float: right;
@ -38,16 +41,18 @@
text-align: center;
}
.login-space {
height: 50px;
}
.login-input {
@extend %inputs;
width: 387px;
}
.form-error {
border: 1px solid $c-negative !important;
}
}
.login-space {
height: 50px;
}
.login-input {
width: 387px;
}
.form-error {
border: 1px solid $c-negative !important;
}

8
js/apps/system/_admin/aardvark/APP/frontend/scss/_modals.scss
View File

@ -40,6 +40,7 @@
font-family: 'Open Sans', sans-serif !important;
font-size: 14px;
font-weight: 300;
max-height: 410px;
.select2-choices {
background-image: none !important;
@ -49,9 +50,7 @@
box-shadow: none;
input {
-webkit-box-shadow: none;
box-shadow: none;
outline: transparent !important;
@extend %inputs;
}
input:active {
@ -91,8 +90,7 @@
input,
select,
textarea {
border-radius: 3px;
box-shadow: none;
@extend %inputs;
margin-top: 10px;
}

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

@ -261,7 +261,7 @@
}
.headerBar.dashboard-headerbar {
margin: 15px 0 10px;
margin: 20px 0;
}
.modal-chart-detail {

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

@ -303,6 +303,7 @@ toolbar {
.arango-tab a {
border-bottom-color: $c-tab-bottom-border;
font-weight: 100;
}
.arango-tab .active {

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

@ -6,6 +6,16 @@
legend {
padding-left: 5px;
}
.tile:first-child {
a {
opacity: .5;
&:hover {
opacity: 1;
}
}
}
}
$iconsize: 50px;
@ -68,10 +78,16 @@ $iconsize: 50px;
}
img {
position: relative;
&.icon {
height: $iconsize;
width: $iconsize;
}
&:hover {
cursor: pointer;
}
}
a {
@ -179,7 +195,7 @@ $iconsize: 50px;
@extend %clickable;
@extend %pull-right;
border-radius: 3px;
color: $c-black;
color: $c-darker-grey;
font-size: 18px;
padding-bottom: 2px;
padding-left: 3px;