Merge pull request #511 from seyfeb/bugfix/510

Updates color in nutrition info and removes bullet point
nextcloud · Jan 15, 2021 · ee80881 · ee80881
2 parents 58a0b97 + 512737c
commit ee80881
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,8 @@
   [#505](https://github.com/nextcloud/cookbook/pull/505) @christianlupus
 - Allow pasting of instructions without newline again
   [#503](https://github.com/nextcloud/cookbook/pull/503) @christianlupus
+- Updated color and bullets in nutrition information, fixes #510
+  [#511](https://github.com/nextcloud/cookbook/pull/511/) @seyfeb
 
 
 ## 0.7.8 - 2021-01-08

diff --git a/css/style.css b/css/style.css
@@ -113,22 +113,19 @@
         flex-basis: 20rem;
         padding-right: 2rem;
     }
-        #app-content-wrapper aside ul {
-            list-style-type: disc;
+        #app-content-wrapper aside ul li {
+            margin-left: 1em;
         }
-            #app-content-wrapper aside ul li {
-                margin-left: 1em;
+            #app-content-wrapper aside ul li span,
+            #app-content-wrapper aside ul li input[type="checkbox"] {
+                line-height: 1rem;
+                margin: 0 0.5rem 0 0;
+                padding: 0;
+                height: auto;
+                width: 1rem;
+                display: inline-block;
+                vertical-align: middle;
             }
-                #app-content-wrapper aside ul li span,
-                #app-content-wrapper aside ul li input[type="checkbox"] {
-                    line-height: 1rem;
-                    margin: 0 0.5rem 0 0;
-                    padding: 0;
-                    height: auto;
-                    width: 1rem;
-                    display: inline-block;
-                    vertical-align: middle;
-                }
 
     #app-content-wrapper .recipe-content {
         padding: 1rem;

diff --git a/src/components/RecipeNutritionInfoItem.vue b/src/components/RecipeNutritionInfoItem.vue
@@ -35,7 +35,8 @@ li {
 
 li .title {
     margin-bottom: 0em;
-    color: var(--color-primary);
+    color: var(--color-main-text);
+    font-weight: bolder;
 }
 
 </style>
diff --git a/src/components/RecipeView.vue b/src/components/RecipeView.vue
@@ -58,7 +58,7 @@
 
                     <section v-if="showNutritions">
                         <h3>{{ t('cookbook', 'Nutrition Information') }}</h3>
-                        <ul>
+                        <ul class="nutrition-items">
                             <recipe-nutrition-info-item v-if="('servingSize' in nutrition) && !isNullOrEmpty(nutrition['servingSize'])" :title="t('cookbook', 'Serving Size')" :data="nutrition['servingSize']" />
                             <recipe-nutrition-info-item v-if="('calories' in nutrition) && !isNullOrEmpty(nutrition['calories'])" :title="t('cookbook', 'Energy')" :data="nutrition['calories']" />
                             <recipe-nutrition-info-item v-if="('sugarContent' in nutrition) && !isNullOrEmpty(nutrition['sugarContent'])" :title="t('cookbook', 'Sugar')" :data="nutrition['sugarContent']" />
@@ -379,6 +379,10 @@ aside {
         margin-top: 2rem;
     }
 
+    .nutrition-items {
+        list-style-type: none;
+    }
+
     .times {
         display: flex;
         margin-top: 10px;