diff --git a/js/apps/system/aardvark/frontend/css/collectionsView.css b/js/apps/system/aardvark/frontend/css/collectionsView.css index 2ab067d6ec..6f8c2d00f4 100644 --- a/js/apps/system/aardvark/frontend/css/collectionsView.css +++ b/js/apps/system/aardvark/frontend/css/collectionsView.css @@ -5,9 +5,6 @@ #addFilterItem, .removeFilterItem { cursor: pointer; } -#transparentHeader .btn-group { - margin-top: 6px !important; -} #newCollection { position: relative; @@ -95,39 +92,6 @@ cursor: pointer; } -#transparentHeader .breadcrumb { - padding-left: 5px !important; -} - -#transparentHeader { - width: auto; - margin-bottom: 0px !important; - padding-right: 10px; - position:relative; - font-size: 16px; -} - - -#transparentHeader i { - margin-top: 0px; - margin-right: 0px; - left: 10px; - position: absolute; -} - -#transparentHeader a.disabledBread { - color:#fff; -} - -#transparentHeader a { -} - -#transparentHeader .pagination { - position:absolute; - right:5px; - margin:4px 0; -} - .arangoHeaderA { width: 14px !important; height: 20px !important; @@ -140,58 +104,6 @@ font-size: 17px !important; } -#transparentHeader .btn-group { - margin-top:4px; -} - -/* option 1 - dropdown filter */ -#transparentHeader .dropdown-menu { - border-radius: 0px 0px 0px 0px; - margin-top: 6px; - margin-right: -20px; - background-color: rgba(0, 0, 0, 0.7); - /*background-color: #BFBDBC;*/ - border: solid 1px #686766; -} - -#transparentHeader .dropdown-menu .checkboxLabel { - color: white !important; -} - -#transparentHeader .dropdown-menu .divider { - background-color: #686755 !important; - border-bottom: 0 !important; - color: #686755 !important; -} - -/* option 2 */ -/* -#transparentHeader .dropdown-menu { -border-radius: 0 0 4px 4px !important; -margin-top: 6px !important; -margin-right: -3px !important; -background-color: #686766; -border-left: solid 1px #BFBDBC; -border-bottom: solid 1px #BFBDBC; -border-right: solid 1px #BFBDBC; -border-top: 0; -} - - #transparentHeader .dropdown-menu .checkboxLabel { - color: white !important; -} - - #transparentHeader .dropdown-menu .divider { - background-color: #BFBDBC !important; - border-bottom: 0 !important; - color: #686755 !important; -} - - #transparentHeader .dropdown-menu .nav-header { - color: #BFBDBC !important; -} - */ - .dropdown-toggle, .dashSwitch { border-radius: 0 !important; } diff --git a/js/apps/system/aardvark/frontend/css/dashboardView.css b/js/apps/system/aardvark/frontend/css/dashboardView.css index 26b7398911..6434e3f5e2 100644 --- a/js/apps/system/aardvark/frontend/css/dashboardView.css +++ b/js/apps/system/aardvark/frontend/css/dashboardView.css @@ -200,17 +200,6 @@ li:hover h6, li.hover h6 { font-family: 'Open Sans', sans-serif !important; } -#dashboardHeader, #transparentHeader { - margin-left: 5px; - margin-right: 5px; - padding-right: 5px; - padding-left: 5px; - background-color: #686766; - color: #FFFFFF; - height: 36px; - margin-top: 5px !important; -} - /*NVD3*/ .nv-series { diff --git a/js/apps/system/aardvark/frontend/css/documentsView.css b/js/apps/system/aardvark/frontend/css/documentsView.css index e8ffe031d6..50b20f13ec 100644 --- a/js/apps/system/aardvark/frontend/css/documentsView.css +++ b/js/apps/system/aardvark/frontend/css/documentsView.css @@ -156,7 +156,7 @@ } #collectionPrev { - margin-left: 20px; + margin-left: 25px; } #collectionNext { diff --git a/js/apps/system/aardvark/frontend/css/headerBar.css b/js/apps/system/aardvark/frontend/css/headerBar.css index c56c9c8806..b62a7d205d 100644 --- a/js/apps/system/aardvark/frontend/css/headerBar.css +++ b/js/apps/system/aardvark/frontend/css/headerBar.css @@ -1,13 +1,111 @@ +/* The bar on top of each page */ div.headerBar { position: relative; + margin-top: 5px; margin-left: 5px; margin-right: 5px; + margin-bottom: 0px; + background-color: #686766; + color: #FFFFFF; + height: 36px; + font-size: 16px; + padding-left: 5px; + padding-right: 5px; } +/* The title of the page */ + +div.headerBar a.arangoHeader, +.modal-header .arangoHeader { + color: white; + position: relative; + top: 7px; + left: 5px; + font-size: 16px; +} + +/* The buttons on the right side */ + div.headerBar > div.pagination { - position: absolute; - right: 5px; margin: 4px 0px; } +/* Breadcrumbs on the left side */ + +div.headerBar > div.breadcrumb { + padding-left: 5px !important; +} + +/* Disabled breadcrumb */ +div.breadcrumb a.disabledBread { + color:#fff; +} + +/* #transparentHeader */ + +/* Unused +div.headerBar > .btn-group { + margin-top: 6px !important; +} + +#transparentHeader i { + margin-top: 0px; + margin-right: 0px; + left: 10px; + position: absolute; +} +*/ + +/* option 1 - dropdown filter */ +div.headerBar .dropdown-menu { + border-radius: 0px 0px 0px 0px; + margin-top: 6px; + margin-right: -20px; + background-color: rgba(0, 0, 0, 0.7); + border: solid 1px #686766; +} + +div.headerBar .dropdown-menu .checkboxLabel { + color: white !important; +} + +div.headerBar .dropdown-menu .divider { + background-color: #686755 !important; + border-bottom: 0 !important; + color: #686755 !important; +} + +/* option 2 */ +/* +#transparentHeader .dropdown-menu { +border-radius: 0 0 4px 4px !important; +margin-top: 6px !important; +margin-right: -3px !important; +background-color: #686766; +border-left: solid 1px #BFBDBC; +border-bottom: solid 1px #BFBDBC; +border-right: solid 1px #BFBDBC; +border-top: 0; +} + + #transparentHeader .dropdown-menu .checkboxLabel { + color: white !important; +} + + #transparentHeader .dropdown-menu .divider { + background-color: #BFBDBC !important; + border-bottom: 0 !important; + color: #686755 !important; +} + + #transparentHeader .dropdown-menu .nav-header { + color: #BFBDBC !important; +} + */ + + +/* arangoHeader */ +.arangoHeader { + font-weight: 400; +} diff --git a/js/apps/system/aardvark/frontend/css/layout.css b/js/apps/system/aardvark/frontend/css/layout.css index e10bc147dc..9b05dd7192 100644 --- a/js/apps/system/aardvark/frontend/css/layout.css +++ b/js/apps/system/aardvark/frontend/css/layout.css @@ -30,22 +30,6 @@ box-shadow: 0; } -.btn-margin { - /* margin-left: 15px !important;*/ -} - -#transparentHeader .arangoHeader, #dashboardHeader .arangoHeader, .modal-header .arangoHeader{ - color: white; - position: relative; - top: 7px; - left: 5px; - font-size: 16px; -} - -.arangoHeader { - font-weight: 400; -} - .navbar .nav li.dropdown.open > .dropdown-toggle, .navbar .nav li.dropdown.active > .dropdown-toggle, .navbar .nav li.dropdown.open.active > .dropdown-toggle { background: #788f3d; }