diff --git a/app/assets/images/icons/list.png b/app/assets/images/icons/list.png new file mode 100644 index 00000000..97101a0f Binary files /dev/null and b/app/assets/images/icons/list.png differ diff --git a/app/assets/images/icons/list.svg b/app/assets/images/icons/list.svg new file mode 100644 index 00000000..9ac430a3 --- /dev/null +++ b/app/assets/images/icons/list.svg @@ -0,0 +1,699 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/icons/menu.png b/app/assets/images/icons/menu.png new file mode 100644 index 00000000..e4f891e6 Binary files /dev/null and b/app/assets/images/icons/menu.png differ diff --git a/app/assets/images/icons/menu.svg b/app/assets/images/icons/menu.svg new file mode 100644 index 00000000..6169793d --- /dev/null +++ b/app/assets/images/icons/menu.svg @@ -0,0 +1,97 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/app/assets/stylesheets/user/structure.css.sass b/app/assets/stylesheets/user/structure.css.sass index f2d19af9..c25c3724 100644 --- a/app/assets/stylesheets/user/structure.css.sass +++ b/app/assets/stylesheets/user/structure.css.sass @@ -53,6 +53,13 @@ body background-color: $qbrown text-align: center line-height: 34px + background-repeat: no-repeat + background-position: center center + text-indent: -5000px + &.home-list-link + background-image: image-url('icons/list.png') + &.home-menu-link + background-image: image-url('icons/menu.png') //padding-top: 50px .navbar-fixed-top margin-left: -$side-spacing diff --git a/app/views/user/home.html.slim b/app/views/user/home.html.slim index 7bf887c0..81da736f 100644 --- a/app/views/user/home.html.slim +++ b/app/views/user/home.html.slim @@ -5,5 +5,5 @@ .home-footer .home-footer-content - if list_open? - = link_to 'P', user_list_products_path - = link_to 'L', user_active_list_path + = link_to 'P', user_list_products_path, class: 'home-menu-link' + = link_to 'L', user_active_list_path, class: 'home-list-link' diff --git a/app/views/user/join_occupied_table.html.slim b/app/views/user/join_occupied_table.html.slim index 1ddeaafe..1c1d961b 100644 --- a/app/views/user/join_occupied_table.html.slim +++ b/app/views/user/join_occupied_table.html.slim @@ -1,6 +1,8 @@ .page-header h4= t('user.join_occupied_table.title') .form-actions + = link_to t('user.join_occupied_table.back'), user_root_path, class: :btn + ' = link_to t('user.join_occupied_table.show_the_products'), user_list_products_for_table_path(table_id: @table.id), class: [:btn, 'btn-primary'] ' button.btn.btn-warning{onClick="Quser.join_occupied_table('#{@table.id}')"} = t('user.join_occupied_table.join_this_table')