Skip to content

Commit

Permalink
added breadcrumb collapse-on-small-widths behavior
Browse files Browse the repository at this point in the history
  • Loading branch information
Kevin Sutherland committed May 11, 2018
1 parent dce26b1 commit 5897568
Show file tree
Hide file tree
Showing 110 changed files with 108 additions and 5 deletions.
Empty file modified app/Console/Commands/FieldConvertScript.php 100644 → 100755
Empty file.
Empty file modified app/Console/Commands/ThumbScript.php 100644 → 100755
Empty file.
Empty file modified app/FieldHelpers/koraSearchForSite.php 100644 → 100755
Empty file.
Empty file modified app/Http/Requests/UserRequest.php 100644 → 100755
Empty file.
3 changes: 3 additions & 0 deletions config.rb
@@ -1,3 +1,6 @@
Encoding.default_external = "utf-8"
# ^ this ^ is here because it prevents the following error:
# Encoding::InvalidByteSequenceError on line ["22"] of /usr/lib/ruby/vendor_ruby/execjs/encoding.rb: "\xE6" on US-ASCII
require 'compass/import-once/activate'
require 'autoprefixer-rails'
# Require any additional compass plugins here.
Expand Down
Empty file modified npm-shrinkwrap.json 100644 → 100755
Empty file.
6 changes: 1 addition & 5 deletions public/assets/css/app.css

Large diffs are not rendered by default.

Empty file modified public/assets/javascripts/backups/backup.js 100644 → 100755
Empty file.
Empty file modified public/assets/javascripts/backups/index.js 100644 → 100755
Empty file.
Empty file modified public/assets/javascripts/backups/restore.js 100644 → 100755
Empty file.
Empty file modified public/assets/javascripts/exodus/index.js 100644 → 100755
Empty file.
Empty file modified public/assets/javascripts/exodus/transfer.js 100644 → 100755
Empty file.
Empty file modified public/assets/javascripts/forms/import.js 100644 → 100755
Empty file.
Empty file modified public/assets/javascripts/forms/importk2.js 100644 → 100755
Empty file.
38 changes: 38 additions & 0 deletions public/assets/javascripts/navigation/breadcrumbs.js
@@ -0,0 +1,38 @@
function collision($div1, $div2) {
var x1 = $div1.offset().left;
var y1 = $div1.offset().top;
var h1 = $div1.outerHeight(true);
var w1 = $div1.outerWidth(true);
var b1 = y1 + h1;
var r1 = x1 + w1;
var x2 = $div2.offset().left;
var y2 = $div2.offset().top;
var h2 = $div2.outerHeight(true);
var w2 = $div2.outerWidth(true);
var b2 = y2 + h2;
var r2 = x2 + w2;

if (b1 < y2 || y1 > b2 || r1 < x2 || x1 > r2) return false;
return true;
}

var result
window.setInterval(function() {
result = collision($('.navigation-left .navigation-item:last-child'), $('.navigation-search'));
console.log('' + result)
if (result === true) {
$('.navigation-left').addClass('collapsed');
}
unsetBreadCrumbs ()
}, 200);

// can't use the above function to unset breadcrumbs because immediately on collapse the above function returns false and would unset and reset recursively
function unsetBreadCrumbs () {
if (window.innerWidth >= 700 && $('.navigation-left').hasClass('collapsed')) {
$('.collapsed').removeClass('collapsed');
}
}

// this script is meant to detect when the left section of the nav (breadcrumbs) collide with the right side of the nav (nav-search)
// needs to be done this way because the width of left-nav is variable
// when collision = true, apply .collapsed to the <ul.nav-left>, and css should handle the rest
Empty file modified public/assets/javascripts/optionPresets/create.js 100644 → 100755
Empty file.
Empty file modified public/assets/javascripts/optionPresets/index.js 100644 → 100755
Empty file.
Empty file modified public/assets/javascripts/projects/import.js 100644 → 100755
Empty file.
Empty file modified public/assets/javascripts/records/import.js 100644 → 100755
Empty file.
Empty file modified public/assets/javascripts/records/modal.js 100644 → 100755
Empty file.
1 change: 1 addition & 0 deletions public/{kevin}
Empty file modified resources/assets/scss/partials/_backups-progress.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/_backups-restore.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/_backups.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/_dashboard.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/_exodus-transfer.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/_exodus.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/_field-preset-create.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/_field-presets.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/_form-import.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/_form-importk2.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/_grid.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/_install-success.scss 100644 → 100755
Empty file.
1 change: 1 addition & 0 deletions resources/assets/scss/partials/_navigation.scss
Expand Up @@ -9,6 +9,7 @@
padding: 0;
position: fixed;
top: -$status-height;
white-space: nowrap;
width: 100vw;
z-index: 9999;

Expand Down
Empty file modified resources/assets/scss/partials/_project-import.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/_record-data-card.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/_record-import.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/backups/_backup-card.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/backups/_filters.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/backups/_modals.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/field-presets/_create.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/field-presets/_filters.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/field-presets/_preset-card.scss 100644 → 100755
Empty file.
Empty file.
Empty file modified resources/assets/scss/partials/field-show/_typed-specific.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/general/_progress-bar.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/general/_tooltip.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/grid/_element.scss 100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file modified resources/assets/scss/partials/install/_pagination.scss 100644 → 100755
Empty file.
27 changes: 27 additions & 0 deletions resources/assets/scss/partials/navigation/_left.scss
Expand Up @@ -68,6 +68,33 @@
color: palette('green', accent);
}
}
// start new
// .collapsed will be applied when breadcrumbs.js detects collision between the two designated elements
&.collapsed {
li {
overflow: hidden;
&:after {
background: rgb(227,227,227);
background: linear-gradient(90deg, rgba(227,227,227,0.4) 0%, rgba(227,227,227,1) 35%);
padding-left: 1em;
}
}
& a {
@include transition();

max-width: 2em;
}
& a:hover,
& a:focus,
& li:hover a {
max-width: 1000px;
}
& li:hover:after {
background: transparent;
padding-left: 0;
}
}
// end new
}

@media screen and (max-width: $max-mobile-xs-width) {
Expand Down
Empty file modified resources/assets/scss/partials/record-create/_pagination.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/record-index/_filters.scss 100644 → 100755
Empty file.
Empty file modified resources/assets/scss/partials/record-index/_pagination.scss 100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified resources/assets/scss/partials/side-menu/_drawer-element.scss 100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified resources/views/advancedSearch/results.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/globalSearch/results.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/install/success.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/backups/createBackupModal.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/backups/deleteBackupModal.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/backups/javascripts.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/backups/support.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/dashboard/javascripts.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/exodus/javascripts.blade.php 100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
37 changes: 37 additions & 0 deletions resources/views/partials/nav.blade.php
Expand Up @@ -62,7 +62,44 @@
@include("partials.menu.sideMenu")
@endif
</ul>
<!--<script src="/assets/javascripts/navigation/breadcrumbs.js"></script>-->
<script type="text/javascript">
function collision($div1, $div2) {
var x1 = $div1.offset().left;
var y1 = $div1.offset().top;
var h1 = $div1.outerHeight(true);
var w1 = $div1.outerWidth(true);
var b1 = y1 + h1;
var r1 = x1 + w1;
var x2 = $div2.offset().left;
var y2 = $div2.offset().top;
var h2 = $div2.outerHeight(true);
var w2 = $div2.outerWidth(true);
var b2 = y2 + h2;
var r2 = x2 + w2;
if (b1 < y2 || y1 > b2 || r1 < x2 || x1 > r2) return false;
return true;
}
var result
window.setInterval(function() {
result = collision($('.navigation-left .navigation-item:last-child'), $('.navigation-search'));
console.log('' + result)
if (result === true) {
$('.navigation-left').addClass('collapsed');
}
unsetBreadCrumbs ()
}, 200);
function unsetBreadCrumbs () {
if (window.innerWidth >= 700 && $('.navigation-left').hasClass('collapsed')) {
$('.collapsed').removeClass('collapsed');
}
}
</script>

<script type="text/javascript">
var globalQuickSearchUrl = '{{ action('ProjectSearchController@globalQuickSearch') }}';
var globalSearchUrl = '{{action('ProjectSearchController@globalSearch')}}';
Expand Down
Empty file.
Empty file modified resources/views/partials/optionPresets/javascripts.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/records/adv-form.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/records/advanced/associator.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/records/advanced/date.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/records/advanced/filetype.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/records/advanced/genlist.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/records/advanced/list.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/records/advanced/mslist.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/records/advanced/number.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/records/advanced/richtext.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/records/advanced/schedule.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/records/advanced/text.blade.php 100644 → 100755
Empty file.
Empty file.
Empty file modified resources/views/partials/records/pagination-form.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/records/pagination.blade.php 100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file modified resources/views/partials/revisions/pagination.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/sideMenu.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/sideMenu/dashboard.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/sideMenu/form.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/sideMenu/management.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/sideMenu/plugins.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/sideMenu/project.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/partials/sideMenu/record.blade.php 100644 → 100755
Empty file.
Empty file modified resources/views/records/results.blade.php 100644 → 100755
Empty file.

0 comments on commit 5897568

Please sign in to comment.