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

Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding

This commit is contained in:
Max Neunhoeffer 2014-02-28 18:01:31 +01:00
parent b156e93293 bbc81f92a8
commit b3a7173808
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/apps/system/aardvark/frontend/js/templates/navigationView.ejs
View File

@ -6,8 +6,8 @@
<li class="applications-menu"> <li class="applications-menu">
<a id="applications" class="tab" href="#applications">Applications</a> <a id="applications" class="tab" href="#applications">Applications</a>
</li> </li>
<li class="navbar-spacer big"></li>
<li class="query-menu"><a id="query" class="tab" href="#query">AQL Editor</a></li> <li class="query-menu"><a id="query" class="tab" href="#query">AQL Editor</a></li>
<li class="navbar-spacer big"></li>
<li class="dropdown tools-menu" id="toolsDropdown"> <li class="dropdown tools-menu" id="toolsDropdown">
<a href="#" class="tab" id="tools">Tools <b class="caret"></b></a> <a href="#" class="tab" id="tools">Tools <b class="caret"></b></a>
<ul class="link-dropdown-menu" id="tools_dropdown"> <ul class="link-dropdown-menu" id="tools_dropdown">
@ -30,7 +30,6 @@
</li> </li>
</ul> </ul>
</li> </li>
<li class="navbar-spacer big"></li>
<li class="dropdown" id="linkDropdown"> <li class="dropdown" id="linkDropdown">
<a href="#" class="tab" id="links">Links <b class="caret"></b></a> <a href="#" class="tab" id="links">Links <b class="caret"></b></a>
<ul class="link-dropdown-menu" id="link_dropdown"> <ul class="link-dropdown-menu" id="link_dropdown">

8
js/apps/system/aardvark/frontend/scss/_abstracts.scss
View File

@ -138,7 +138,7 @@
z-index: 1000; z-index: 1000;
display: none; display: none;
padding: 5px 0px; padding: 5px 0px;
margin: 2px 0px 0px; margin: 5px 0px 0px;
list-style: none; list-style: none;
background-color: $c_white; background-color: $c_white;
border: { border: {
@ -146,7 +146,7 @@
color: $c_semi_transp; color: $c_semi_transp;
width: 1px; width: 1px;
} }
@include border-radius(6px); @include border-radius(3px);
li { li {
line-height: 20px; line-height: 20px;
@ -156,8 +156,8 @@
li.dropdown-header { li.dropdown-header {
font: { font: {
weight: bold; weight: 400;
size: 11px; size: 13px;
} }
color: $c_dark_grey; color: $c_dark_grey;
padding: 0px 20px; padding: 0px 20px;

12
js/apps/system/aardvark/frontend/scss/generated.css
View File

@ -81,22 +81,22 @@ ul.link-dropdown-menu, ul.user-dropdown-menu, ul.gv-dropdown-menu {
z-index: 1000; z-index: 1000;
display: none; display: none;
padding: 5px 0px; padding: 5px 0px;
margin: 2px 0px 0px; margin: 5px 0px 0px;
list-style: none; list-style: none;
background-color: white; background-color: white;
border-style: solid; border-style: solid;
border-color: rgba(0, 0, 0, 0.2); border-color: rgba(0, 0, 0, 0.2);
border-width: 1px; border-width: 1px;
-moz-border-radius: 6px; -moz-border-radius: 3px;
-webkit-border-radius: 6px; -webkit-border-radius: 3px;
border-radius: 6px; } border-radius: 3px; }
ul.link-dropdown-menu li, ul.user-dropdown-menu li, ul.gv-dropdown-menu li { ul.link-dropdown-menu li, ul.user-dropdown-menu li, ul.gv-dropdown-menu li {
line-height: 20px; line-height: 20px;
white-space: nowrap; white-space: nowrap;
width: 100%; } width: 100%; }
ul.link-dropdown-menu li.dropdown-header, ul.user-dropdown-menu li.dropdown-header, ul.gv-dropdown-menu li.dropdown-header { ul.link-dropdown-menu li.dropdown-header, ul.user-dropdown-menu li.dropdown-header, ul.gv-dropdown-menu li.dropdown-header {
font-weight: bold; font-weight: 400;
font-size: 11px; font-size: 13px;
color: #999999; color: #999999;
padding: 0px 20px; padding: 0px 20px;
text-transform: uppercase; } text-transform: uppercase; }