From e8a7d6aeae9d8fe6e0bc2007294e3b390617b5ff Mon Sep 17 00:00:00 2001 From: Thaum Date: Thu, 5 Feb 2015 10:07:22 +0000 Subject: [PATCH] Small design and style fixes --- inventory.css | 49 +++++++++++++++++++ rpg-docs/client/views/GeneralCSS/general.css | 1 + .../character/Stats/skillRow/skillRow.css | 2 +- .../client/views/character/Stats/stats.css | 4 -- .../views/character/characterSheet.html | 6 +-- .../views/character/inventory/inventory.html | 5 +- 6 files changed, 57 insertions(+), 10 deletions(-) create mode 100644 inventory.css diff --git a/inventory.css b/inventory.css new file mode 100644 index 00000000..cf635cd0 --- /dev/null +++ b/inventory.css @@ -0,0 +1,49 @@ +#inventory { + padding: 4px; +} + +.containers { + display: flex; + flex-wrap: wrap; +} + +.container { + width: 332px; + flex-grow: 1; +} + +.containerTop { + cursor: pointer; + margin: -16px -16px 0 -16px; + padding: 16px; +} + +.equipmentTop { + margin: -16px -16px 0 -16px; + padding: 16px; +} + +.containerMain { + margin: 0 -16px -16px -16px; + padding-bottom: 16px; +} + +.equipmentMain { + margin: 0 -16px -16px -16px; + padding-bottom: 16px; +} + +.inventoryItem { + background: white; + transition: box-shadow 0.35s cubic-bezier(0.4, 0, 0.2, 1); + margin: 1px 0 1px 0; +} + +.inventoryItem[hero] { + box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.37); +} + +.itemSlot { + background-color: rgb(232, 232, 232); + background-color: rgba(0, 0, 0, 0.1); +} diff --git a/rpg-docs/client/views/GeneralCSS/general.css b/rpg-docs/client/views/GeneralCSS/general.css index a94bed0c..74b972ae 100644 --- a/rpg-docs/client/views/GeneralCSS/general.css +++ b/rpg-docs/client/views/GeneralCSS/general.css @@ -96,6 +96,7 @@ paper-button { .fab-buffer { height: 88px; + width: 100%; } *[hidden] { diff --git a/rpg-docs/client/views/character/Stats/skillRow/skillRow.css b/rpg-docs/client/views/character/Stats/skillRow/skillRow.css index a7988995..e46eb080 100644 --- a/rpg-docs/client/views/character/Stats/skillRow/skillRow.css +++ b/rpg-docs/client/views/character/Stats/skillRow/skillRow.css @@ -1,6 +1,6 @@ .skillRow { height: 32px; - margin: 0 -8px 0 -8px; + margin: 0 -16px 0 -16px; } .skillRow core-icon { diff --git a/rpg-docs/client/views/character/Stats/stats.css b/rpg-docs/client/views/character/Stats/stats.css index d249b7d1..910f4bb1 100644 --- a/rpg-docs/client/views/character/Stats/stats.css +++ b/rpg-docs/client/views/character/Stats/stats.css @@ -42,10 +42,6 @@ justify-content: center; } -.card .subhead { - padding: 16px; -} - .editEffect > * { vertical-align: bottom; } diff --git a/rpg-docs/client/views/character/characterSheet.html b/rpg-docs/client/views/character/characterSheet.html index 73bb8a35..9ff1d941 100644 --- a/rpg-docs/client/views/character/characterSheet.html +++ b/rpg-docs/client/views/character/characterSheet.html @@ -22,9 +22,9 @@ {{> stats}} {{> features}} {{> inventory}} - spellBook - persona - journal + {{> spells}} + Persona Under Construction + Journal Under Construction diff --git a/rpg-docs/client/views/character/inventory/inventory.html b/rpg-docs/client/views/character/inventory/inventory.html index 44e9ed57..b1e4ed47 100644 --- a/rpg-docs/client/views/character/inventory/inventory.html +++ b/rpg-docs/client/views/character/inventory/inventory.html @@ -3,7 +3,7 @@
-
+
Equipment
(net Worth)
(weightCarried)lbs
@@ -29,7 +29,7 @@ {{#each containers}} -
+
{{name}}
{{valueString totalValue}}
{{round totalWeight}}lbs
@@ -45,6 +45,7 @@
{{/each}} +