Skip to content

Commit

Permalink
Merge pull request #72 from Carbon-Farm-Network/ui-changes
Browse files Browse the repository at this point in the history
ui changes
  • Loading branch information
LeosPrograms authored Feb 6, 2024
2 parents 2b4bd26 + 8e7cd1d commit cf42792
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 6 deletions.
6 changes: 3 additions & 3 deletions ui/src/lib/Nav.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<!-- This example requires Tailwind CSS v2.0+ -->
<nav class="h-full">
<div class="max-w-7xl mx-auto px-2 sm:px-6 lg:px-8 h-full">
<div class="px-2 sm:px-6 lg:px-8 h-full">
<div class="relative flex items-center justify-between h-full">
<div class="absolute inset-y-0 left-0 flex items-center sm:hidden">
<!-- Mobile menu button-->
Expand Down Expand Up @@ -94,7 +94,7 @@
alt="Workflow"
/> -->
</div>
<div class="hidden sm:block sm:ml-6 w-full">
<div class="hidden sm:block sm:ml-6 w-full sm:mt-3">
<div class="flex justify-end space-x-4">
<!-- Current: "bg-gray-900 text-white", Default: "text-gray-300 hover:bg-gray-700 hover:text-white" -->

Expand Down Expand Up @@ -287,7 +287,7 @@

<style>
.nav-default {
@apply text-gray-300 px-3 py-2 rounded-md text-sm font-medium;
@apply text-gray-300 px-3 py-2 rounded-md text-base font-medium;
}
.nav-default:hover {
Expand Down
8 changes: 5 additions & 3 deletions ui/src/routes/plans/new/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -580,10 +580,12 @@
/>

<!-- custom header introduced to enable planning to be more inline with the beginning of the page -->
<div class="custom-background" style="height: 8vh">
<div class="custom-background" style="height: 15vh">
<div class="mx-auto px-2 sm:px-6 lg:px-8">
<h2 class="pt-1 text-white text-2xl">Planning</h2>
<p class="text-white text-xs">This page is for demonstration purposes only</p>
<h2 class="pt-1 text-white text-3xl">Planning</h2>
<p class="text-white text-xs">
Creating and modifying a plan, and recording actual activity
</p>
</div>
</div>

Expand Down
Binary file added ui/static/IMG_5548.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ui/static/IMG_9114.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ui/static/IMG_9495.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ui/static/dsf.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions ui/static/washing-machine.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit cf42792

Please sign in to comment.