diff --git a/js/apps/aardvark/frontend/css/collectionView.css b/js/apps/aardvark/frontend/css/collectionView.css index f5f3cbe06b..e944cb1d91 100644 --- a/js/apps/aardvark/frontend/css/collectionView.css +++ b/js/apps/aardvark/frontend/css/collectionView.css @@ -52,8 +52,7 @@ } #change-collection .glyphicon-ban-circle:hover { - cursor: default; - float: right; + cursor: default !important; } #change-collection #collectionEditIndexTable { @@ -84,3 +83,11 @@ font-weight: 400; color: black; } + +#newIndexView select { + margin-left: -10px; +} + +#newIndexView input[type='checkbox'] { + margin-left: -20px; +} diff --git a/js/apps/aardvark/frontend/css/collectionsItemView.css b/js/apps/aardvark/frontend/css/collectionsItemView.css index 403c9c3d3c..3c527a907e 100644 --- a/js/apps/aardvark/frontend/css/collectionsItemView.css +++ b/js/apps/aardvark/frontend/css/collectionsItemView.css @@ -75,6 +75,10 @@ cursor: default !important; } +.span3 .badge-success { + font-weight: 300; +} + .badge, .label, .btn { text-shadow: none !important; } diff --git a/js/apps/aardvark/frontend/css/collectionsView.css b/js/apps/aardvark/frontend/css/collectionsView.css index c6ebca0541..0be3260f88 100644 --- a/js/apps/aardvark/frontend/css/collectionsView.css +++ b/js/apps/aardvark/frontend/css/collectionsView.css @@ -232,11 +232,13 @@ border-top: 0; #collectionsDropdown .nav-header, #dashboardDropdown .nav-header, #foxxDropdown .nav-header { font-size: 13px; + font-weight: 400; color: black; } #collectionsDropdown label, #dashboardDropdown label, #foxxDropdown label{ color: black; + font-weight: 300; } #collectionsDropdown ul, #dashboardDropdown ul, #foxxDropdown ul{ diff --git a/js/apps/aardvark/frontend/css/dashboardView.css b/js/apps/aardvark/frontend/css/dashboardView.css index efef246715..8603f25632 100644 --- a/js/apps/aardvark/frontend/css/dashboardView.css +++ b/js/apps/aardvark/frontend/css/dashboardView.css @@ -35,6 +35,7 @@ float:right; margin-top: 18px !important; margin-right: 10px !important; + z-index: 9999 !important; } .db-zoom, .db-minimize, .db-hide, .db-info, #detailReplicationMinimize{ @@ -73,6 +74,7 @@ .statSingleClient { height: 400px; + padding-bottom: 8px; width: auto !important; margin-top: 11px; margin-left: 5px !important; @@ -373,8 +375,11 @@ li:hover h6, li.hover h6 { background-color: #FFFFFF; } +#leftReplicationDiv, #rightReplicationDiv { + padding: 20px !important; +} + #leftReplicationDiv h4, #rightReplicationDiv h4 { - padding-left: 5px; } #leftReplicationDiv table, #rightReplicationDiv table { @@ -396,6 +401,10 @@ li:hover h6, li.hover h6 { padding-bottom: 3px; } +#leftReplicationDiv table tr:last-child, #rightReplicationDiv table tr:last-child { + border-bottom: 0; +} + #leftReplicationDiv tbody, #rightReplicationDiv tbody { background-color: #F9F9F9 !important; } @@ -512,7 +521,6 @@ li:hover h6, li.hover h6 { font-weight: 400; color: black; margin-top: 5px; - padding-left: 7px; font-size: 15px; } diff --git a/js/apps/aardvark/frontend/css/layout.css b/js/apps/aardvark/frontend/css/layout.css index a5534e1491..8f2b6013ec 100644 --- a/js/apps/aardvark/frontend/css/layout.css +++ b/js/apps/aardvark/frontend/css/layout.css @@ -285,3 +285,18 @@ button { .arangoicon:hover { cursor: pointer !important; } + +.accordion-group { + border: 0; +} + +.accordion-inner { + border-top: 0; +} + +.accordion-heading a { + border: 1px solid #cccccc; + color: black; + width: 397px !important; + font-weight: 400; +} diff --git a/js/apps/aardvark/frontend/css/modal.css b/js/apps/aardvark/frontend/css/modal.css index 138d84e96c..b468a64085 100644 --- a/js/apps/aardvark/frontend/css/modal.css +++ b/js/apps/aardvark/frontend/css/modal.css @@ -238,3 +238,13 @@ .modal-body input[type='checkbox'] { margin-bottom: 10px; } + +#add-collection .glyphicon-info-sign { + top: 2px !important; + position: relative; + margin-left: 20px !important; +} + +#add-collection .accordion { + margin-top: 10px; +} diff --git a/js/apps/aardvark/frontend/js/templates/newCollectionView.ejs b/js/apps/aardvark/frontend/js/templates/newCollectionView.ejs index 170981a041..8f91740bab 100644 --- a/js/apps/aardvark/frontend/js/templates/newCollectionView.ejs +++ b/js/apps/aardvark/frontend/js/templates/newCollectionView.ejs @@ -19,7 +19,7 @@ - + @@ -38,7 +38,7 @@ Journal size: - + Sync: @@ -48,7 +48,7 @@ - + diff --git a/js/apps/aardvark/frontend/js/views/collectionView.js b/js/apps/aardvark/frontend/js/views/collectionView.js index 191982b979..3a500ea10d 100644 --- a/js/apps/aardvark/frontend/js/views/collectionView.js +++ b/js/apps/aardvark/frontend/js/views/collectionView.js @@ -20,7 +20,7 @@ var collectionView = Backbone.View.extend({ this.fillModal(); $('.modalTooltips, .glyphicon-info-sign').tooltip({ - placement: "top" + placement: "left" }); $('#collectionTab a').click(function (e) {