diff --git a/js/apps/system/aardvark/frontend/css/collectionsView.css b/js/apps/system/aardvark/frontend/css/collectionsView.css index 3f109864ba..6d761d8505 100644 --- a/js/apps/system/aardvark/frontend/css/collectionsView.css +++ b/js/apps/system/aardvark/frontend/css/collectionsView.css @@ -26,33 +26,6 @@ margin-bottom:0; } -.thumbnails { - margin-left:0px; - padding-left: 0px; - padding-right: 0px; - padding-bottom: 5px; - padding-top: 13px; -} - -.thumbnails li { - background-color: rgba(0, 0, 0, 0.05); - /* #f4f3f3; */ -} - -.thumbnails a.add { - padding:40px 0; - display:block; - font-weight: 400; - text-align:left; -} - -.thumbnails .icon { - padding-right:5px; - padding-left: 5px; - padding-top: 10px; - cursor: pointer; -} - .btn-group { border-radius: 2px 2px 2px 2px !important; } @@ -101,23 +74,6 @@ input.searchInput { border-radius: 0 !important; } -div.headerDropdown { - background-color: white; - position:relative; - display:none; - margin-left: 5px; - margin-right: 5px; - padding-bottom: 15px; - width: auto; -} - -div.headerDropdown > div.dropdownInner { - position: relative; - min-height: 125px; - width: auto; - box-shadow: 0 !important; -} - div.dropdownInner > .nav-header { font-size: 13px; font-weight: 400; @@ -226,11 +182,6 @@ div.dropdownInner ul li label { margin-bottom: 30px; } -#collectionsThumbnailsIn { - background-color: none; - margin-left: -7px; -} - #arangoCollectionsContainer { padding-bottom: 0 !important; } diff --git a/js/apps/system/aardvark/frontend/css/dashboardView.css b/js/apps/system/aardvark/frontend/css/dashboardView.css index a5ce2a705e..28bbbd63d9 100644 --- a/js/apps/system/aardvark/frontend/css/dashboardView.css +++ b/js/apps/system/aardvark/frontend/css/dashboardView.css @@ -71,7 +71,8 @@ width: 300px; } -.statSingleClient { +li.statSingleClient { + float: none !important; height: 400px; padding-bottom: 8px; width: auto !important; @@ -239,7 +240,6 @@ li:hover h6, li.hover h6 { /*Dashboard Checkbox*/ .dropdownOut input[type=checkbox].css-checkbox, -.headerDropdown input[type=checkbox].css-checkbox, #dashboardDropdownOut input[type=checkbox].css-checkbox, #transparentHeader input[type=checkbox].css-checkbox, #collectionsDropdown input[type=checkbox].css-checkbox { @@ -247,7 +247,6 @@ li:hover h6, li.hover h6 { } .dropdownOut input[type=checkbox].css-checkbox + label.css-label, -.headerDropdown input[type=checkbox].css-checkbox + label.css-label, #dashboardDropdownOut input[type=checkbox].css-checkbox + label.css-label, #transparentHeader input[type=checkbox].css-checkbox + label.css-label, #collectionsDropdown input[type=checkbox].css-checkbox + label.css-label { @@ -263,7 +262,6 @@ li:hover h6, li.hover h6 { } .dropdownOut input[type=checkbox].css-checkbox:checked + label.css-label, -.headerDropdown input[type=checkbox].css-checkbox:checked + label.css-label, #dashboardDropdownOut input[type=checkbox].css-checkbox:checked + label.css-label, #transparentHeader input[type=checkbox].css-checkbox:checked + label.css-label, #collectionsDropdown input[type=checkbox].css-checkbox:checked + label.css-label { diff --git a/js/apps/system/aardvark/frontend/css/documentView.css b/js/apps/system/aardvark/frontend/css/documentView.css index 922008eca5..e2d26d21ed 100644 --- a/js/apps/system/aardvark/frontend/css/documentView.css +++ b/js/apps/system/aardvark/frontend/css/documentView.css @@ -50,12 +50,6 @@ #tableDiv, #logContent, #documentsDiv, #sourceDiv, #graphManagementDiv { padding-top: 13px; - padding-right: 5px; - padding-left: 5px; -} - -#tableDiv, #logContent { - padding-bottom: 10px; } #logContent .tab-content { diff --git a/js/apps/system/aardvark/frontend/css/documentsView.css b/js/apps/system/aardvark/frontend/css/documentsView.css index 0f4916dd03..07c651e579 100644 --- a/js/apps/system/aardvark/frontend/css/documentsView.css +++ b/js/apps/system/aardvark/frontend/css/documentsView.css @@ -33,13 +33,10 @@ margin-top: -54px !important; } -#filterHeader, .arangoDropdownIn, #indexHeaderContent { +.arangoDropdownIn { margin-left: 5px; margin-right: 5px; background-color: white; -} - -#filterHeader, .arangoDropdownIn { padding-top: 10px; padding-left: 10px; padding-right: 10px; @@ -47,26 +44,13 @@ position:relative; } - #confirmDocImport { margin-right: 0px; margin-bottom: 11px; height: 30px; } -#filterHeader #sendFilter{ - margin-right: 0px; - margin-left: 0px; - background-color:#686766; - border-bottom: 1px solid #a0a0a0; - color:#FFF; - padding:0 20px; - position:relative; - float: right; -} -#filterHeader select { - width: 100px; -} + #documentsStatus { padding-top: 10px; float:left; @@ -301,12 +285,6 @@ cursor: pointer !important; } -#filterHeader button { - float: right; - margin-top: 1px; - margin-left: 10px !important; -} - #addFilterItem { margin-left: 5px; } @@ -315,15 +293,6 @@ margin-top: 0px !important; } -#filterHeader input, #filterHeader select, #filterHeader button { - -} - -#filterHeader select { - margin-left: 10px !important; - margin-right: 10px !important; -} - .readOnlyClass a { color: black !important; } diff --git a/js/apps/system/aardvark/frontend/css/dropdowns.css b/js/apps/system/aardvark/frontend/css/dropdowns.css index 49640515e1..e69de29bb2 100644 --- a/js/apps/system/aardvark/frontend/css/dropdowns.css +++ b/js/apps/system/aardvark/frontend/css/dropdowns.css @@ -1,16 +0,0 @@ -.dropdownImport { - margin-left: 5px; - margin-right: 5px; - background-color: white; - padding-top: 10px; - padding-left: 10px; - padding-right: 10px; - padding-bottom: 5px; - position:relative; -} - -.dropdownImport input { - line-height: 0px; - margin-top: 5px; - margin-bottom: -15px; -} diff --git a/js/apps/system/aardvark/frontend/css/general.css b/js/apps/system/aardvark/frontend/css/general.css index cd88642403..15b9a528fa 100644 --- a/js/apps/system/aardvark/frontend/css/general.css +++ b/js/apps/system/aardvark/frontend/css/general.css @@ -1,13 +1,3 @@ -/* Sets the default values shared for content views*/ -#content { - /*background-color: rgba(0, 0, 0, 0.0675);*/ - background-color: #D6D6D6; - min-height: 80px; - height: 100%; - width: 100%; - margin-left: 0; -} - div.content { padding-top: 13px; padding-left: 5px; diff --git a/js/apps/system/aardvark/frontend/css/graphlayout.css b/js/apps/system/aardvark/frontend/css/graphlayout.css index 0232f768f6..71f1ce9a29 100644 --- a/js/apps/system/aardvark/frontend/css/graphlayout.css +++ b/js/apps/system/aardvark/frontend/css/graphlayout.css @@ -38,7 +38,6 @@ img.searchSubmit { .toolbox { position: absolute; - left: 5px; margin-right: 5px; border-radius: 0px !important; -webkit-border-radius: 0px !important; diff --git a/js/apps/system/aardvark/frontend/css/headerBar.css b/js/apps/system/aardvark/frontend/css/headerBar.css index c4d18af83b..9a9cfe370a 100644 --- a/js/apps/system/aardvark/frontend/css/headerBar.css +++ b/js/apps/system/aardvark/frontend/css/headerBar.css @@ -1,9 +1,6 @@ /* The bar on top of each page */ div.headerBar { position: relative; - margin-top: 5px; - margin-left: 5px; - margin-right: 5px; margin-bottom: 5px; background-color: #686766; color: #FFFFFF; diff --git a/js/apps/system/aardvark/frontend/css/queryView.css b/js/apps/system/aardvark/frontend/css/queryView.css index 1938e7af7f..e3e755245a 100644 --- a/js/apps/system/aardvark/frontend/css/queryView.css +++ b/js/apps/system/aardvark/frontend/css/queryView.css @@ -51,15 +51,6 @@ margin-bottom: 5px; } -#queryDiv { - margin-top: 0px !important; - padding-top: 6px !important; - padding-left: 5px; - padding-right: 5px; - padding-bottom: 20px !important; - background-color: transparent; -} - #outputToolbar span, #editorToolbar span { position: relative; margin-right: 5px; diff --git a/js/apps/system/aardvark/frontend/css/shellView.css b/js/apps/system/aardvark/frontend/css/shellView.css index 155a8a1ee9..b2b8c4268a 100644 --- a/js/apps/system/aardvark/frontend/css/shellView.css +++ b/js/apps/system/aardvark/frontend/css/shellView.css @@ -6,13 +6,7 @@ } #shell_workspace { - width: auto; margin-top: 13px; - margin-left: 5px; - margin-right: 5px !important; - margin-bottom: -25px; - height: 400px; - background-color: black; } .vsplitbar { diff --git a/js/apps/system/aardvark/frontend/html/body.html.part b/js/apps/system/aardvark/frontend/html/body.html.part index 894c524818..7287516441 100644 --- a/js/apps/system/aardvark/frontend/html/body.html.part +++ b/js/apps/system/aardvark/frontend/html/body.html.part @@ -14,7 +14,7 @@
-
+
diff --git a/js/apps/system/aardvark/frontend/js/graphViewer/ui/graphViewerUI.js b/js/apps/system/aardvark/frontend/js/graphViewer/ui/graphViewerUI.js index 8332ce10ee..b5a51114a4 100644 --- a/js/apps/system/aardvark/frontend/js/graphViewer/ui/graphViewerUI.js +++ b/js/apps/system/aardvark/frontend/js/graphViewer/ui/graphViewerUI.js @@ -434,7 +434,7 @@ function GraphViewerUI(container, adapterConfig, optWidth, optHeight, viewerConf }; container.appendChild(menubar); container.appendChild(background); - background.className = "thumbnails gv_background "; + background.className = "contentDiv gv_background "; background.id = "background"; viewerConfig = viewerConfig || {}; diff --git a/js/apps/system/aardvark/frontend/js/templates/applicationsView.ejs b/js/apps/system/aardvark/frontend/js/templates/applicationsView.ejs index 84ee74d4ba..7b28ce1f7c 100644 --- a/js/apps/system/aardvark/frontend/js/templates/applicationsView.ejs +++ b/js/apps/system/aardvark/frontend/js/templates/applicationsView.ejs @@ -1,8 +1,6 @@ -
+
-
+
diff --git a/js/apps/system/aardvark/frontend/js/templates/dashboardView.ejs b/js/apps/system/aardvark/frontend/js/templates/dashboardView.ejs index c0938228cc..8347657e2e 100644 --- a/js/apps/system/aardvark/frontend/js/templates/dashboardView.ejs +++ b/js/apps/system/aardvark/frontend/js/templates/dashboardView.ejs @@ -45,7 +45,7 @@ -
    +
      • Statistics
        • diff --git a/js/apps/system/aardvark/frontend/js/templates/databaseView.ejs b/js/apps/system/aardvark/frontend/js/templates/databaseView.ejs index 48d0e2aabc..939e587f1f 100644 --- a/js/apps/system/aardvark/frontend/js/templates/databaseView.ejs +++ b/js/apps/system/aardvark/frontend/js/templates/databaseView.ejs @@ -4,7 +4,7 @@
-
+
diff --git a/js/apps/system/aardvark/frontend/js/templates/documentsView.ejs b/js/apps/system/aardvark/frontend/js/templates/documentsView.ejs index afcbbfd41d..40e2e6d5a3 100644 --- a/js/apps/system/aardvark/frontend/js/templates/documentsView.ejs +++ b/js/apps/system/aardvark/frontend/js/templates/documentsView.ejs @@ -37,9 +37,9 @@
-
diff --git a/js/apps/system/aardvark/frontend/js/templates/queryView.ejs b/js/apps/system/aardvark/frontend/js/templates/queryView.ejs index 367abbbab3..2698d37275 100644 --- a/js/apps/system/aardvark/frontend/js/templates/queryView.ejs +++ b/js/apps/system/aardvark/frontend/js/templates/queryView.ejs @@ -66,7 +66,7 @@ -
+
Submit: CTRL/CMD + Return ; Undo: CTRL/CMD + Z ; Redo: CTRL/CMD + SHIFT + Z ; diff --git a/js/apps/system/aardvark/frontend/js/templates/userManagementView.ejs b/js/apps/system/aardvark/frontend/js/templates/userManagementView.ejs index bea195dbea..b099c5c912 100644 --- a/js/apps/system/aardvark/frontend/js/templates/userManagementView.ejs +++ b/js/apps/system/aardvark/frontend/js/templates/userManagementView.ejs @@ -4,7 +4,7 @@
-
+
diff --git a/js/apps/system/aardvark/frontend/js/views/collectionsView.js b/js/apps/system/aardvark/frontend/js/views/collectionsView.js index 6bab51874c..b6db40ec84 100644 --- a/js/apps/system/aardvark/frontend/js/views/collectionsView.js +++ b/js/apps/system/aardvark/frontend/js/views/collectionsView.js @@ -5,7 +5,6 @@ "use strict"; window.CollectionsView = Backbone.View.extend({ el: '#content', - /*el2: '.thumbnails',*/ el2: '#collectionsThumbnailsIn', searchTimeout: null, diff --git a/js/apps/system/aardvark/frontend/js/views/documentsView.js b/js/apps/system/aardvark/frontend/js/views/documentsView.js index de02f162e1..a89973774d 100644 --- a/js/apps/system/aardvark/frontend/js/views/documentsView.js +++ b/js/apps/system/aardvark/frontend/js/views/documentsView.js @@ -290,7 +290,7 @@ $('#filterHeader').append('
'+ ''+ - ''+ ' '+ ' '+ ' '+ diff --git a/js/apps/system/aardvark/frontend/scss/_abstracts.scss b/js/apps/system/aardvark/frontend/scss/_abstracts.scss index 3df1088647..5bbc5b86df 100644 --- a/js/apps/system/aardvark/frontend/scss/_abstracts.scss +++ b/js/apps/system/aardvark/frontend/scss/_abstracts.scss @@ -6,6 +6,17 @@ float: right; } +%clear-float { + &:after { + clear: both; + content: "."; + display: block; + font-size: 0px; + height: 0px; + visibility: hidden; + } +} + %clickable { cursor: pointer; } diff --git a/js/apps/system/aardvark/frontend/scss/_contentTables.scss b/js/apps/system/aardvark/frontend/scss/_contentTables.scss index 32c589371c..4e8b268a73 100644 --- a/js/apps/system/aardvark/frontend/scss/_contentTables.scss +++ b/js/apps/system/aardvark/frontend/scss/_contentTables.scss @@ -1,8 +1,3 @@ -//#databaseDiv => .contentDiv -.contentDiv { - padding: 13px 5px 0px 5px; -} - //.databaseButtons => .contentButtons .contentButtons { clear:both; diff --git a/js/apps/system/aardvark/frontend/scss/_dropdowns.scss b/js/apps/system/aardvark/frontend/scss/_dropdowns.scss new file mode 100644 index 0000000000..d455cefd29 --- /dev/null +++ b/js/apps/system/aardvark/frontend/scss/_dropdowns.scss @@ -0,0 +1,64 @@ +div.headerDropdown { + background-color: $c_white; + position:relative; + display:none; + padding: 10px; + width: auto; + + & > div.dropdownInner { + position: relative; + min-height: 125px; + width: auto; + box-shadow: 0; + } + + &.headerDropdown input[type=checkbox].css-checkbox { + display:none; + + & + label.css-label { + @extend %clickable; + padding-left:20px; + margin-top: 0px; + height:15px; + display:inline-block; + background-repeat:no-repeat; + background-position: 0 0; + font-size:15px; + vertical-align:middle; + } + + &:checked + label.css-label { + background-position: 0 -15px; + } + } +} + +div.dropdownImport { + display:none; + background-color: $c_white; + padding-top: 10px; + padding-left: 10px; + padding-right: 10px; + padding-bottom: 5px; + position:relative; + + input { + line-height: 0px; + margin-top: 5px; + margin-bottom: -15px; + } +} + +select.filterSelect { + width: 100px; + margin-left: 10px; + margin-right: 10px; +} + +//TODO Le fix +#filterHeader button { + float: right; + margin-top: 1px; + margin-left: 10px !important; +} + diff --git a/js/apps/system/aardvark/frontend/scss/_headerBar.scss b/js/apps/system/aardvark/frontend/scss/_headerBar.scss index b6865ae975..916b12de2e 100644 --- a/js/apps/system/aardvark/frontend/scss/_headerBar.scss +++ b/js/apps/system/aardvark/frontend/scss/_headerBar.scss @@ -1,9 +1,6 @@ // The bar on top of each page div.headerBar { position: relative; - margin-top: 5px; - margin-left: 5px; - margin-right: 5px; margin-bottom: 5px; background-color: $c_bar_bg; color: $c_white; diff --git a/js/apps/system/aardvark/frontend/scss/_resizing.scss b/js/apps/system/aardvark/frontend/scss/_resizing.scss index 23bece44d3..d5c5fb13cd 100644 --- a/js/apps/system/aardvark/frontend/scss/_resizing.scss +++ b/js/apps/system/aardvark/frontend/scss/_resizing.scss @@ -1,14 +1,6 @@ div.resizecontainer { + @extend %clear-float; margin: 0px auto; - - &:after { - clear: both; - content: "."; - display: block; - font-size: 0px; - height: 0px; - visibility: hidden; - } } @media (max-width: 798px) { @@ -51,3 +43,59 @@ div.centralRow { bottom: 65px; } } + +div.centralContent { + padding: 5px; + width: 100%; + height: 100%; + background-color: $c_content_transp; + min-height: 80px; + float: left; +} + + +//#databaseDiv => .contentDiv +.contentDiv { + // margin-left:0px; + // margin-left: -20px; + // padding-bottom: 5px; + + padding: 13px 0px 0px 0px; + + list-style: none; + *zoom: 1; + li { + background-color: rgba(0, 0, 0, 0.05); + // #f4f3f3; + + // From Bootstrap thumbnails + float: left; + // margin-bottom: 20px; + // margin-left: 20px; + } + + a.add { + padding: 40px 0; + display: block; + font-weight: 400; + text-align: left; + } + + .icon { + @extend %clickable; + padding: { + right:5px; + left: 5px; + top: 10px; + } + } + + &:after { + clear: both; + } + &:after, &:before { + display: table; + line-height: 0; + content: ""; + } +} diff --git a/js/apps/system/aardvark/frontend/scss/_tiles.scss b/js/apps/system/aardvark/frontend/scss/_tiles.scss index 9ab4577a22..e80de1893f 100644 --- a/js/apps/system/aardvark/frontend/scss/_tiles.scss +++ b/js/apps/system/aardvark/frontend/scss/_tiles.scss @@ -1,8 +1,9 @@ -div#collectionsThumbnailsIn { - margin-left: 0px; +ul.tileList { + @extend %clear-float; + margin-left: -6px; + margin-right: -6px; } - li.tile { @extend %pull-left; position:relative; diff --git a/js/apps/system/aardvark/frontend/scss/generated.css b/js/apps/system/aardvark/frontend/scss/generated.css index 3123d9a036..c7569e7e9c 100644 --- a/js/apps/system/aardvark/frontend/scss/generated.css +++ b/js/apps/system/aardvark/frontend/scss/generated.css @@ -9,7 +9,15 @@ ul.link-dropdown-menu, ul.user-dropdown-menu, div.navlogo, ul.navlist li, div.fo div.navmenu, div.footer-right, li.tile div.iconSet span { float: right; } -li.tile div.iconSet span, .contentTables tr.contentRowInactive a { +div.resizecontainer:after, ul.tileList:after { + clear: both; + content: "."; + display: block; + font-size: 0px; + height: 0px; + visibility: hidden; } + +.contentDiv .icon, li.tile div.iconSet span, .contentTables tr.contentRowInactive a, div.headerDropdown.headerDropdown input[type=checkbox].css-checkbox + label.css-label { cursor: pointer; } nav.navbar, footer.footer { @@ -90,13 +98,6 @@ ul.link-dropdown-menu, ul.user-dropdown-menu { div.resizecontainer { margin: 0px auto; } - div.resizecontainer:after { - clear: both; - content: "."; - display: block; - font-size: 0px; - height: 0px; - visibility: hidden; } @media (max-width: 798px) { #arangoCollectionUl { @@ -154,6 +155,37 @@ div.centralRow { margin-top: 65px; margin-bottom: 65px; } +div.centralContent { + padding: 5px; + width: 100%; + height: 100%; + background-color: rgba(0, 0, 0, 0.0675); + min-height: 80px; + float: left; } + +.contentDiv { + padding: 13px 0px 0px 0px; + list-style: none; + *zoom: 1; } + .contentDiv li { + background-color: rgba(0, 0, 0, 0.05); + float: left; } + .contentDiv a.add { + padding: 40px 0; + display: block; + font-weight: 400; + text-align: left; } + .contentDiv .icon { + padding-right: 5px; + padding-left: 5px; + padding-top: 10px; } + .contentDiv:after { + clear: both; } + .contentDiv:after, .contentDiv:before { + display: table; + line-height: 0; + content: ""; } + nav.navbar { top: 0px; height: 34px; @@ -191,8 +223,9 @@ footer.footer { padding-bottom: 10px; margin-bottom: 0; } -div#collectionsThumbnailsIn { - margin-left: 0px; } +ul.tileList { + margin-left: -6px; + margin-right: -6px; } li.tile { position: relative; @@ -323,9 +356,6 @@ li.tile { color: white; margin-left: 5px; } -.contentDiv { - padding: 13px 5px 0px 5px; } - .contentButtons { clear: both; width: 100%; @@ -372,3 +402,51 @@ li.tile { .createModalDialog table { width: 100%; } + +div.headerDropdown { + background-color: white; + position: relative; + display: none; + padding: 10px; + width: auto; } + div.headerDropdown > div.dropdownInner { + position: relative; + min-height: 125px; + width: auto; + box-shadow: 0; } + div.headerDropdown.headerDropdown input[type=checkbox].css-checkbox { + display: none; } + div.headerDropdown.headerDropdown input[type=checkbox].css-checkbox + label.css-label { + padding-left: 20px; + margin-top: 0px; + height: 15px; + display: inline-block; + background-repeat: no-repeat; + background-position: 0 0; + font-size: 15px; + vertical-align: middle; } + div.headerDropdown.headerDropdown input[type=checkbox].css-checkbox:checked + label.css-label { + background-position: 0 -15px; } + +div.dropdownImport { + display: none; + background-color: white; + padding-top: 10px; + padding-left: 10px; + padding-right: 10px; + padding-bottom: 5px; + position: relative; } + div.dropdownImport input { + line-height: 0px; + margin-top: 5px; + margin-bottom: -15px; } + +select.filterSelect { + width: 100px; + margin-left: 10px; + margin-right: 10px; } + +#filterHeader button { + float: right; + margin-top: 1px; + margin-left: 10px !important; } diff --git a/js/apps/system/aardvark/frontend/scss/style.scss b/js/apps/system/aardvark/frontend/scss/style.scss index 6830132620..59026d88d9 100644 --- a/js/apps/system/aardvark/frontend/scss/style.scss +++ b/js/apps/system/aardvark/frontend/scss/style.scss @@ -22,3 +22,5 @@ @import "notification"; //contentTables @import "contentTables"; +// Dropdown menu +@import "dropdowns";