diff options
4 files changed, 47 insertions, 41 deletions
diff --git a/app/assets/stylesheets/components/_buttons.sass b/app/assets/stylesheets/components/_buttons.sass index 93f9907a5..2881cee3e 100644 --- a/app/assets/stylesheets/components/_buttons.sass +++ b/app/assets/stylesheets/components/_buttons.sass @@ -142,47 +142,48 @@ table, .table margin: 0 border-radius: 0 box-shadow: 0 0 3px rgba($darkgrey, 0.25) - > ul - padding: 0 - margin: 0 - > li > a, > li > button - padding: 5px 15px - white-space: nowrap - padding: 5px 15px - font-weight: normal - line-height: $line-height - display: block - font-size: 14px - &:hover, &:focus - text-decoration: none - background-color: whitesmoke - outline: none - &:not(:first-child) + & > ul:not(:first-child) + position: relative + margin-top: 11px + &:before + content: '' + display: block + position: absolute + left: 15px + right: 15px + top: -6px + height: 1px + background-color: $grey + + ul.dropdown-menu, .dropdown-menu > ul + padding: 0 + margin: 0 + > li > a, > li > button + padding: 5px 15px + white-space: nowrap + padding: 5px 15px + font-weight: normal + line-height: $line-height + display: block + font-size: 14px + &:hover, &:focus + text-decoration: none + background-color: whitesmoke + outline: none + + > li.delete-action + > a, > button + display: block position: relative - margin-top: 11px - &:before - content: '' - display: block - position: absolute - left: 15px - right: 15px - top: -6px - height: 1px - background-color: $grey - - > li.delete-action + .fa:first-child + margin-right: 0.5em + + & + li.delete-action > a, > button - display: block - position: relative - .fa:first-child - margin-right: 0.5em - - & + li.delete-action - > a, > button - margin-top: 0 - &:before - display: none + margin-top: 0 + &:before + display: none &.table-2entries .t2e-item diff --git a/app/assets/stylesheets/components/_tables.sass b/app/assets/stylesheets/components/_tables.sass index 119a38c07..35e1122f3 100644 --- a/app/assets/stylesheets/components/_tables.sass +++ b/app/assets/stylesheets/components/_tables.sass @@ -372,7 +372,7 @@ white-space: nowrap // border-right: 1px solid rgba($grey, 0.5) max-width: 100% - min-width: 280px + min-width: 330px padding-right: 1px .t2e-item diff --git a/app/assets/stylesheets/modules/_jp_collection.sass b/app/assets/stylesheets/modules/_jp_collection.sass index b4370a5ac..46ea3fb6e 100644 --- a/app/assets/stylesheets/modules/_jp_collection.sass +++ b/app/assets/stylesheets/modules/_jp_collection.sass @@ -121,6 +121,11 @@ .totals color: $blue padding-top: 4px + margin-left: -5px + margin-right: -5px + span + white-space: nowrap + padding: 0 5px i padding-right: 3px @@ -219,7 +224,7 @@ input display: inline-block - width: 40px + width: 50px border: none margin-right: 5px color: black diff --git a/app/javascript/journey_patterns/components/JourneyPattern.js b/app/javascript/journey_patterns/components/JourneyPattern.js index 01734f3a3..35765b99a 100644 --- a/app/javascript/journey_patterns/components/JourneyPattern.js +++ b/app/javascript/journey_patterns/components/JourneyPattern.js @@ -109,7 +109,7 @@ export default class JourneyPattern extends Component{ } else{ let hours = parseInt(time/60) - return hours + " h " + (time - 60*hours) + " min" + return hours + " h " + (time - 60*hours) } } |