Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release-v0.16.2 #1953

Merged
merged 7 commits into from
Jul 28, 2023
Merged

release-v0.16.2 #1953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1447b10
put os-notes in the app catalog on-load of the bazaar agent
Jul 28, 2023
ae70888
added icon image from Trent
Jul 28, 2023
3d9868e
New notes Icon
gdbroman Jul 28, 2023
56d3924
replaced full notes app icon url to 'AppIconNotes'
Jul 28, 2023
a9a0a3e
update background color based on new color value from gus
Jul 28, 2023
fce7e14
Merge pull request #1951 from holium/new-notes-icon
gdbroman Jul 28, 2023
fe02a77
Merge pull request #1952 from holium/bazaar-notes-on-load
gdbroman Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions desks/realm/app/bazaar.hoon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@
=/ old=(unit state-0)
(mole |.(!<(state-0 vase)))
?^ old :: `this(state u.old)
=| notes-app=native-app:store
=. title.notes-app 'Notes'
=. info.notes-app 'Realm\'s collaborative notes app.'
=. color.notes-app '#F2CA00'
=. icon.notes-app 'AppIconNotes'
=. config.notes-app [size=[0 0] titlebar-border=%.n show-titlebar=%.y]
=| lexicon-app=native-app:store
=. title.lexicon-app 'Lexicon'
=. color.lexicon-app '#EEDFC9'
Expand All @@ -67,10 +73,9 @@
=. catalog.u.old (~(del by catalog.u.old) %lexicon)
=. catalog.u.old (~(del by catalog.u.old) %trove)
:_ this(state u.old)
:: add two new app entries for Realm's new "native" apps: %trove and %lexicon
:~ ::[%pass / %agent [our.bowl %bazaar] %poke bazaar-action+!>([%delete-catalog-entry [%lexicon]]])]
:: add three new app entries for Realm's new "native" apps: %notes, %trove, and %lexicon
:~ [%pass / %agent [our.bowl %bazaar] %poke bazaar-action+!>([%add-catalog-entry [%os-notes notes-app]])]
[%pass / %agent [our.bowl %bazaar] %poke bazaar-action+!>([%add-catalog-entry [%os-lexicon lexicon-app]])]
::[%pass / %agent [our.bowl %bazaar] %poke bazaar-action+!>([%delete-catalog-entry [%trove]]])]
[%pass / %agent [our.bowl %bazaar] %poke bazaar-action+!>([%add-catalog-entry [%os-trove trove-app]])]
==
%- (slog leaf+"nuking old %bazaar state" ~) :: temporarily doing this for making development easier
Expand Down
83 changes: 20 additions & 63 deletions lib/design-system/src/general/Icon/icons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,69 +363,26 @@ export const paths = {
),
AppIconNotes: (
<>
<rect width="22" height="22" rx="3" fill="#B7ECC2" />
<path
d="M11.9781 4.99998L16.9582 6.15697C17.8643 6.36748 18.5056 7.17488 18.5056 8.10509V13.8445C18.5056 14.7676 17.8739 15.5707 16.9768 15.7882L11.9781 17M11.9781 4.99998V17M11.9781 4.99998V4.99998C11.1042 4.99998 10.3957 5.70846 10.3957 6.58241V15.4176C10.3957 16.2915 11.1042 17 11.9781 17V17"
stroke="#428E65"
strokeWidth="0.5"
strokeLinecap="round"
/>
<path
d="M10.4944 5.99998H5.49435C4.38978 5.99998 3.49435 6.89542 3.49435 7.99998V14C3.49435 15.1046 4.38978 16 5.49435 16H10.4944"
stroke="#428E65"
strokeWidth="0.5"
strokeLinecap="round"
/>
<path
d="M10.2002 6.99998H6.00021C5.17179 6.99998 4.50021 7.67156 4.50021 8.49998V13.5C4.50021 14.3284 5.17179 15 6.00021 15H10.2002"
stroke="#428E65"
strokeWidth="0.5"
strokeLinecap="round"
/>
<circle
cx="11.1868"
cy="8.1648"
r="0.25"
fill="#4C996F"
stroke="#428E65"
strokeWidth="0.0274741"
/>
<circle
cx="11.1868"
cy="9.61541"
r="0.25"
fill="#4C996F"
stroke="#428E65"
strokeWidth="0.0274741"
/>
<circle
cx="11.1868"
cy="11.0659"
r="0.25"
fill="#4C996F"
stroke="#428E65"
strokeWidth="0.0274741"
/>
<circle
cx="11.1868"
cy="12.5166"
r="0.25"
fill="#4C996F"
stroke="#428E65"
strokeWidth="0.0274741"
/>
<circle
cx="11.1868"
cy="13.967"
r="0.25"
fill="#4C996F"
stroke="#428E65"
strokeWidth="0.0274741"
/>
<path
d="M16.6065 11C16.6065 11.6696 16.4321 12.264 16.1632 12.6834C15.8927 13.1055 15.5491 13.3215 15.2081 13.3215C14.8672 13.3215 14.5236 13.1055 14.253 12.6834C13.9842 12.264 13.8098 11.6696 13.8098 11C13.8098 10.3305 13.9842 9.73603 14.253 9.31668C14.5236 8.89457 14.8672 8.6786 15.2081 8.6786C15.5491 8.6786 15.8927 8.89457 16.1632 9.31668C16.4321 9.73603 16.6065 10.3305 16.6065 11Z"
stroke="#428E65"
strokeWidth="0.5"
<rect width="250" height="250" rx="24" fill="#F2CA00" />
<path
d="M179.917 33H69.9167C57.2804 33 47 43.2804 47 55.9167V193.417C47 206.053 57.2804 216.333 69.9167 216.333H179.917C192.553 216.333 202.833 206.053 202.833 193.417V55.9167C202.833 43.2804 192.553 33 179.917 33Z"
fill="#F2CA00"
/>
<path
d="M152.916 115.772H84.1659C81.6313 115.772 79.5825 113.724 79.5825 111.189C79.5825 108.654 81.6313 106.606 84.1659 106.606H152.916C155.45 106.606 157.499 108.654 157.499 111.189C157.499 113.724 155.45 115.772 152.916 115.772Z"
fill="#324561"
/>
<path
d="M166.666 88.2723H84.1659C81.6313 88.2723 79.5825 86.2235 79.5825 83.6889C79.5825 81.1543 81.6313 79.1056 84.1659 79.1056H166.666C169.2 79.1056 171.249 81.1543 171.249 83.6889C171.249 86.2235 169.2 88.2723 166.666 88.2723Z"
fill="#324561"
/>
<path
d="M166.666 143.272H84.1659C81.6313 143.272 79.5825 141.224 79.5825 138.689C79.5825 136.154 81.6313 134.106 84.1659 134.106H166.666C169.2 134.106 171.249 136.154 171.249 138.689C171.249 141.224 169.2 143.272 166.666 143.272Z"
fill="#324561"
/>
<path
d="M139.166 170.772H84.1659C81.6313 170.772 79.5825 168.724 79.5825 166.189C79.5825 163.654 81.6313 161.606 84.1659 161.606H139.166C141.7 161.606 143.749 163.654 143.749 166.189C143.749 168.724 141.7 170.772 139.166 170.772Z"
fill="#324561"
/>
</>
),
Expand Down