Merge pull request OpenBazaar#1576 from mariodian/fix_theme_style

Fix colors for certain themed elements
jjeffryes · May 25, 2016 · 9ae2fdc · 9ae2fdc
2 parents cdcb992 + 4eeadb8
commit 9ae2fdc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/js/templates/appBar.html b/js/templates/appBar.html
@@ -9,4 +9,4 @@
     <div class="btn-win-icon ion-ios-plus-empty"></div>
   </a>      
 </div>
-<div class="title"><%= ob.title %></div>
+<div class="title custCol-text"><%= ob.title %></div>
diff --git a/js/templates/pageConnectModal.html b/js/templates/pageConnectModal.html
@@ -8,9 +8,9 @@
     <div class="statusText pad10 marginBottom12 inlineBlock fontSize16 custCol-text <% ob.tooltip && print('tooltip') %>" <% ob.tooltip && print(`data-tooltip="${ob.tooltip}"`) %>><%= ob.statusText %></div>
 
     <div>
-      <a class="btn btn-large custCol-secondary js-cancel btn-cancel"><%= polyglot.t('Cancel') %></a>
-      <a class="btn btn-large custCol-secondary js-back btn-back"><%= polyglot.t('Back') %></a>
-      <a class="btn btn-large custCol-secondary js-retry btn-retry"><%= polyglot.t('TryAgain') %></a>
+      <a class="btn btn-large custCol-secondary custCol-text js-cancel btn-cancel"><%= polyglot.t('Cancel') %></a>
+      <a class="btn btn-large custCol-secondary custCol-text js-back btn-back"><%= polyglot.t('Back') %></a>
+      <a class="btn btn-large custCol-secondary custCol-text js-retry btn-retry"><%= polyglot.t('TryAgain') %></a>
     </div>
   </div>
 </div>
diff --git a/js/templates/userPage.html b/js/templates/userPage.html
@@ -13,7 +13,7 @@
       <div class="pad20 rowTop20 width100"><h2 class="txt-center"><% polyglot.t('LoadingImage') %></h2></div>
     </div>
     <input type="range" class="cropit-image-zoom-input hCentered rowTop20 js-bannerRangeInput hide" />
-    <label for="headerImageInput" class="btn btn-c1 btn-txt rowTop20 fullCentered js-pageCustomizationButtons colorWhiteForce btn-upload-cover-photo custCol-primary">
+    <label for="headerImageInput" class="btn btn-c1 btn-txt rowTop20 fullCentered js-pageCustomizationButtons btn-upload-cover-photo custCol-primary">
       <span class="ion-qr-scanner fontSize11 marginRight2 textOpacity1"></span>
       <%= polyglot.t('UploadCoverPhoto') %> (950px x 400px)
     </label>