app/assets/stylesheets/hyrax/dashboard.scss in hyrax-3.6.0 vs app/assets/stylesheets/hyrax/dashboard.scss in hyrax-4.0.0.beta1

- old
+ new

@@ -1,17 +1,17 @@ -@import 'morris.js/0.5.1/morris'; -@import 'bootstrap/variables'; +@import "morris"; +@import "bootstrap/variables"; $tab-margin: 44px !default; $title-text-color: #4e4a42 !default; $body-background-color: #f0f0f0 !default; $tab-active-accent-color: $brand-primary !default; $admin-sidebar-background-color: #5c5c5c !default; $admin-sidebar-profile-background-color: #505050 !default; $admin-sidebar-section-heading-color: #dedede !default; $admin-sidebar-link-color: #ffffff !default; $admin-sidebar-link-hover-color: #000000 !default; -$admin-sidebar-link-background-color: #505050 !default; +$admin-sidebar-link-background-color: #eeeeee !default; $admin-content-background-color: #f0f0f0 !default; $admin-vertical-padding: 0 !default; $admin-panel-border-color: #dedede !default; .works-list { @@ -35,58 +35,18 @@ margin: 0 5px; } body.dashboard { background-color: $body-background-color; - padding-top: $navbar-height; - - @media only screen and (max-width : 767px) { - padding-top: 0; - } + padding-top: 3.5rem; } .dashboard { .count-display { font-size: 1.1em; } - .tabs { - margin-top: $tab-margin; - position: relative; - } - - .nav-tabs { - border-bottom: 0; - margin-bottom: 0; - margin-top: -$tab-margin; - padding: 0 5px; - } - - .nav-tabs > li > a { - border-top: 2px solid transparent; - } - - .nav-tabs > li.active > a, - .nav-tabs > li.active > a:hover { - border-top: 2px solid $tab-active-accent-color; - } - - /* The #masthead selector below could (and ideally, should) be removed if we can - * replace the "navbar-static-top" class with "navbar-fixed-top" for the Admin UI only - */ - #masthead { - border: 0; - left: 0; - position: fixed; - right: 0; - top: 0; - - @media only screen and (max-width : 767px) { - position: initial; - } - } - /* This is needed in Chrome for the admin/admin_sets edit view AND the collection * sharing edit view to render the participants tab * Without this the contents of that tab flow off the right-hand side of the screen * (The other containers on that page have `float: left` except for the fieldset.) */ @@ -101,56 +61,56 @@ .main-header { margin-bottom: 0; margin-top: 0; h1 { - font-size: $font-size-h2; - margin-left: $padding-xs-horizontal; - margin-top: $padding-base-vertical; + font-size: $h2-font-size; + margin-left: $table-cell-padding-sm; + margin-top: $input-btn-padding-y; .fa { color: $gray; - margin-right: $padding-xs-horizontal; + margin-right: $table-cell-padding-sm; } } - .btn { - margin-bottom: $padding-base-vertical; + margin-bottom: $input-btn-padding-y; } } // the span selector is required because Blacklight is using it. - .list-filters-label, span.constraints-label { + .list-filters-label, + span.constraints-label { font-weight: bold; margin-right: 2em; } .constraints-container { - padding: $panel-heading-padding; + padding: $card-spacer-y $card-spacer-x; .start-over { padding: 4px 6px; } } .table { - .date, - .action { + .date, + .action { width: 13ch; } } .list-filters { - background-color: $panel-default-heading-bg; + background-color: $card-cap-bg; margin-bottom: 20px; - padding: $panel-heading-padding; + padding: $card-spacer-y $card-spacer-x; .btn-group > .facet-values { display: none; } - .btn-group.open > .facet-values { + .btn-group.show > .facet-values.show { display: table; } .facet-values { width: 20em; // TODO: make this responsive. @@ -177,11 +137,11 @@ .sort-toggle { padding: 0; } - .user-activity .panel-body { + .user-activity .card-body { overflow: scroll; max-height: 20em; } .transfer_link { @@ -204,53 +164,68 @@ .navbar { margin-bottom: 0; } - // The select collection modal for batch operations - .collection-list-modal { - .modal-content { - float: left; - .modal-header, - .modal-footer, - .modal-body { - float: left; - width: 100%; - } - } + .card.labels { + border-top: 1px solid $card-border-color; + margin-bottom: 0; } - .panel { - border: 1px solid $admin-panel-border-color; - float: left; - width: 100%; + .spacer { + margin-bottom: 5px; + } +} - .panel-heading, - .panel-footer, - .panel-body, - .list-group-item { - float: left; - width: 100%; - } +.dropdown-item { + display: list-item; - .panel-title { - color: $title-text-color; - display: block; - font-size: 18px; - font-weight: 600; - line-height: 30px; + > .facet-values { + display: table; + table-layout: fixed; - &.h2 { - font-size: 22px; - } + > .facet-label { + display: table-cell; + hyphens: auto; + text-indent: -0.938rem; } + + > .facet-count { + display: table-cell; + text-align: right; + } } +} - .panel.panel-default.labels { - border-top: 1px solid $panel-default-border; - margin-bottom: 0; +ul#visibility_ssi-dropdown-options { + table-layout: fixed; + + > li { + display: table-row; + + > .facet-label { + display: table-cell; + hyphens: auto; + } + + > .facet-count { + display: table-cell; + text-align: right; + } } +} - .spacer { - margin-bottom: 5px; +.card.tabs { + background-color: transparent; + + > .card-body { + background-color: white; } } + +#form_workflows .card-body .radio label span input { + margin-right: 0.5rem; +} + +div.main-content.maximized.admin-stats { + background-color: white; +} \ No newline at end of file