From d400e73ff678347c1719cbdb2a05ef259d1254b7 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Mon, 29 Apr 2019 15:31:47 +1200 Subject: [PATCH] Move global actions --- app/assets/stylesheets/overrides.sass | 97 +++++++++++----------- app/views/shared/_global_actions.html.haml | 45 +++++----- 2 files changed, 71 insertions(+), 71 deletions(-) diff --git a/app/assets/stylesheets/overrides.sass b/app/assets/stylesheets/overrides.sass index 312f2257d..fd6ffcf1f 100644 --- a/app/assets/stylesheets/overrides.sass +++ b/app/assets/stylesheets/overrides.sass @@ -157,62 +157,61 @@ p.stats .text display: block -.thumbnail - // border: 1px solid lighten($green, 20%) - text-align: center - margin-bottom: 1.5em - max-width: 160px - //max-height: 220px - //height: 180px +// .thumbnail +// // border: 1px solid lighten($green, 20%) +// text-align: center +// margin-bottom: 1.5em +// max-width: 160px +// //max-height: 220px +// //height: 180px - .seed-thumbnail - height: 220px - .seedinfo - .seed-name - font-size: 120% - overflow: hidden +// .seed-thumbnail +// height: 220px +// .seedinfo +// .seed-name +// font-size: 120% +// overflow: hidden - .member-thumbnail - text-align: left - img - height: 85px - width: 85px - max-width: 85px +// .member-thumbnail +// text-align: left +// img +// height: 85px +// width: 85px +// max-width: 85px - .crop-thumbnail - .cropinfo - margin-top: 0.5em - display: inline-block - max-width: 100% - white-space: nowrap - line-height: 1em - padding-bottom: 2px +// .crop-thumbnail +// .cropinfo +// margin-top: 0.5em +// display: inline-block +// max-width: 100% +// white-space: nowrap +// line-height: 1em +// padding-bottom: 2px - .cropname - overflow: hidden - text-overflow: ellipsis - font-size: 120% +// .cropname +// overflow: hidden +// text-overflow: ellipsis +// font-size: 120% - .scientificname - font-size: small - font-style: italic - overflow: hidden - text-overflow: ellipsis - font-size: 70% +// .scientificname +// font-size: small +// font-style: italic +// overflow: hidden +// text-overflow: ellipsis +// font-size: 70% +// .plantingcount +// font-size: small +// .planting-lifespan +// font-size: 70% - .plantingcount - font-size: small - .planting-lifespan - font-size: 70% +// .crop-name a +// padding-top: 2px - .crop-name a - padding-top: 2px - - .scientific-name small - margin-bottom: -2px +// .scientific-name small +// margin-bottom: -2px li.crop-hierarchy list-style-type: disc @@ -374,9 +373,9 @@ ul.thumbnail-buttons width: 185px padding-left: 0 padding-right: 0 - .homepage - .thumbnail - height: 180px + //.homepage + // .thumbnail + // height: 180px #maincontainer padding: 10px diff --git a/app/views/shared/_global_actions.html.haml b/app/views/shared/_global_actions.html.haml index cf7bf1b81..7b602607b 100644 --- a/app/views/shared/_global_actions.html.haml +++ b/app/views/shared/_global_actions.html.haml @@ -1,26 +1,27 @@ -- if signed_in? - %ul.nav.nav-tabs.pull-right#global-actions - %li.nav-item - = link_to member_gardens_path(current_member), class: 'nav-link' do - = garden_icon - = t('links.my_gardens') +.row + .col-md-12 + %ul.nav.nav-tabs.pull-right#global-actions + %li.nav-item + = link_to member_gardens_path(current_member), class: 'nav-link' do + = garden_icon + = t('links.my_gardens') - %li.nav-item - = link_to new_planting_path, class: 'nav-link' do - = planting_icon - = t('plantings.plant') + %li.nav-item + = link_to new_planting_path, class: 'nav-link' do + = planting_icon + = t('plantings.plant') - %li.nav-item - = link_to new_harvest_path, class: 'nav-link' do - = harvest_icon - = t('harvests.harvest') + %li.nav-item + = link_to new_harvest_path, class: 'nav-link' do + = harvest_icon + = t('harvests.harvest') - %li.nav-item - = link_to new_seed_path, class: 'nav-link' do - = seed_icon - = t('buttons.save_seeds') + %li.nav-item + = link_to new_seed_path, class: 'nav-link' do + = seed_icon + = t('buttons.save_seeds') - %li.nav-item - = link_to new_post_path, class: 'nav-link' do - = blog_icon - = t 'posts.write_blog' \ No newline at end of file + %li.nav-item + = link_to new_post_path, class: 'nav-link' do + = blog_icon + = t 'posts.write_blog' \ No newline at end of file