Skip to content
This repository was archived by the owner on May 16, 2019. It is now read-only.

Commit 43d0ff8

Browse files
jjeffryesjjeffryes
committed
Merge pull request #1121 from OpenBazaar/misc107
Updated the default themes
2 parents 46bc146 + 5cb9ea3 commit 43d0ff8

File tree

8 files changed

+44
-44
lines changed

8 files changed

+44
-44
lines changed

‎imgs/themes/1/header-thumbnail.png‎

-40.2 KB
Loading

‎imgs/themes/1/header.png‎

1.88 MB
Loading

‎imgs/themes/3/header-thumbnail.png‎

-46.6 KB
Loading

‎imgs/themes/3/header.png‎

-155 KB
Loading

‎imgs/themes/5/header-thumbnail.png‎

-69.3 KB
Loading

‎imgs/themes/5/header.png‎

-95.1 KB
Loading

‎js/templates/onboardingModal.html‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -421,57 +421,57 @@
421421

422422
<div class="theme-container clearfix custCol-border borderBottom">
423423
<input type="radio" name="theme-selection" class="fieldItem marginBottom20" id="theme-3"
424-
data-primary-color="#3F4641"
425-
data-secondary-color="#515752"
426-
data-background-color="#272B24"
424+
data-primary-color="#474559"
425+
data-secondary-color="#353443"
426+
data-background-color="#1d1d25"
427427
data-text-color="#ffffff"
428428
data-header="imgs/themes/3/header.png" />
429429
<label for="theme-3" class="js-homeModal-themeSelected radioLabel">
430-
<div class="theme-background" style="background: #272B24">
431-
<div class="theme-global-header" style="background: #515752"></div>
430+
<div class="theme-background" style="background: #1d1d25">
431+
<div class="theme-global-header" style="background: #353443"></div>
432432
<div class="theme-header" style="background: url(imgs/themes/3/header-thumbnail.png); background-size: cover"></div>
433-
<div class="theme-nav" style="background: #515752">
434-
<div class="theme-tab" style="background: #3F4641"></div>
433+
<div class="theme-nav" style="background: #353443">
434+
<div class="theme-tab" style="background: #474559"></div>
435435
</div>
436-
<div class="theme-body" style="background: #3F4641"></div>
436+
<div class="theme-body" style="background: #474559"></div>
437437
</div>
438438
</label>
439439
</div>
440440

441441
<div class="theme-container clearfix custCol-border borderRight borderBottom">
442442
<input type="radio" name="theme-selection" class="fieldItem marginBottom20" id="theme-4"
443-
data-primary-color="#6C7D46"
444-
data-secondary-color="#5C6A3C"
445-
data-background-color="#29301B"
443+
data-primary-color="#929e8e"
444+
data-secondary-color="#6e776b"
445+
data-background-color="#3d413b"
446446
data-text-color="#ffffff"
447447
data-header="imgs/themes/4/header.png" />
448448
<label for="theme-4" class="js-homeModal-themeSelected radioLabel">
449-
<div class="theme-background" style="background: #29301B">
450-
<div class="theme-global-header" style="background: #5C6A3C"></div>
449+
<div class="theme-background" style="background: #3d413b">
450+
<div class="theme-global-header" style="background: #6e776b"></div>
451451
<div class="theme-header" style="background: url(imgs/themes/4/header-thumbnail.png); background-size: cover"></div>
452-
<div class="theme-nav" style="background: #5C6A3C">
453-
<div class="theme-tab" style="background: #6C7D46"></div>
452+
<div class="theme-nav" style="background: #6e776b">
453+
<div class="theme-tab" style="background: #929e8e"></div>
454454
</div>
455-
<div class="theme-body" style="background: #6C7D46"></div>
455+
<div class="theme-body" style="background: #929e8e"></div>
456456
</div>
457457
</label>
458458
</div>
459459

460460
<div class="theme-container clearfix custCol-border borderRight borderBottom">
461461
<input type="radio" name="theme-selection" class="fieldItem marginBottom20" id="theme-5"
462-
data-primary-color="#128092"
463-
data-secondary-color="#007088"
464-
data-background-color="#02334E"
462+
data-primary-color="#41658a"
463+
data-secondary-color="#334e6a"
464+
data-background-color="#1c2b3a"
465465
data-text-color="#ffffff"
466466
data-header="imgs/themes/5/header.png" />
467467
<label for="theme-5" class="js-homeModal-themeSelected radioLabel">
468-
<div class="theme-background" style="background: #02334E">
469-
<div class="theme-global-header" style="background: #007088"></div>
468+
<div class="theme-background" style="background: #1c2b3a">
469+
<div class="theme-global-header" style="background: #334e6a"></div>
470470
<div class="theme-header" style="background: url(imgs/themes/5/header-thumbnail.png); background-size: cover"></div>
471-
<div class="theme-nav" style="background: #007088">
472-
<div class="theme-tab" style="background: #128092"></div>
471+
<div class="theme-nav" style="background: #334e6a">
472+
<div class="theme-tab" style="background: #41658a"></div>
473473
</div>
474-
<div class="theme-body" style="background: #128092"></div>
474+
<div class="theme-body" style="background: #41658a"></div>
475475
</div>
476476
</label>
477477
</div>

‎js/templates/settings.html‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -541,47 +541,47 @@ <h3 class="padding15 margin0 fontWeight500"><%= polyglot.t('Theme') %></h3>
541541
<div class="theme-container clearfix custCol-border borderBottom">
542542
<input type="radio" name="settings-theme-selection" class="js-settingsThemeSelection fieldItem marginBottom20"
543543
id="settings-theme-3"
544-
data-primary-color="#3F4641"
545-
data-secondary-color="#515752"
546-
data-background-color="#272B24"
544+
data-primary-color="#474559"
545+
data-secondary-color="#353443"
546+
data-background-color="#1d1d25"
547547
data-text-color="#ffffff"
548548
data-cover-photo="imgs/themes/3/header.png" />
549549
<label for="settings-theme-3" class="radioLabel">
550-
<div class="theme-background" style="background: #272B24">
551-
<div class="theme-global-header" style="background: #515752"></div>
550+
<div class="theme-background" style="background: #1d1d25">
551+
<div class="theme-global-header" style="background: #353443"></div>
552552
<div class="theme-header" style="background: url(imgs/themes/3/header-thumbnail.png); background-size: cover"></div>
553-
<div class="theme-nav" style="background: #515752">
554-
<div class="theme-tab" style="background: #3F4641"></div>
553+
<div class="theme-nav" style="background: #353443">
554+
<div class="theme-tab" style="background: #474559"></div>
555555
</div>
556-
<div class="theme-body" style="background: #3F4641"></div>
556+
<div class="theme-body" style="background: #474559"></div>
557557
</div>
558558
</label>
559559
</div>
560560

561561
<div class="theme-container clearfix custCol-border borderRight">
562-
<input type="radio" name="settings-theme-selection" class="js-settingsThemeSelection fieldItem marginBottom20" id="settings-theme-4" data-primary-color="#6C7D46" data-secondary-color="#5C6A3C" data-background-color="#29301B" data-text-color="#ffffff" data-cover-photo="imgs/themes/4/header.png" />
562+
<input type="radio" name="settings-theme-selection" class="js-settingsThemeSelection fieldItem marginBottom20" id="settings-theme-4" data-primary-color="#929e8e" data-secondary-color="#6e776b" data-background-color="#3d413b" data-text-color="#ffffff" data-cover-photo="imgs/themes/4/header.png" />
563563
<label for="settings-theme-4" class="radioLabel">
564-
<div class="theme-background" style="background: #29301B">
565-
<div class="theme-global-header" style="background: #5C6A3C"></div>
564+
<div class="theme-background" style="background: #3d413b">
565+
<div class="theme-global-header" style="background: #6e776b"></div>
566566
<div class="theme-header" style="background: url(imgs/themes/4/header-thumbnail.png); background-size: cover"></div>
567-
<div class="theme-nav" style="background: #5C6A3C">
568-
<div class="theme-tab" style="background: #6C7D46"></div>
567+
<div class="theme-nav" style="background: #6e776b">
568+
<div class="theme-tab" style="background: #929e8e"></div>
569569
</div>
570-
<div class="theme-body" style="background: #6C7D46"></div>
570+
<div class="theme-body" style="background: #929e8e"></div>
571571
</div>
572572
</label>
573573
</div>
574574

575575
<div class="theme-container clearfix custCol-border borderRight">
576-
<input type="radio" name="settings-theme-selection" class="js-settingsThemeSelection fieldItem marginBottom20" id="settings-theme-5" data-primary-color="#128092" data-secondary-color="#007088" data-background-color="#02334E" data-text-color="#ffffff" data-cover-photo="imgs/themes/5/header.png" />
576+
<input type="radio" name="settings-theme-selection" class="js-settingsThemeSelection fieldItem marginBottom20" id="settings-theme-5" data-primary-color="#41658a" data-secondary-color="#334e6a" data-background-color="#1c2b3a" data-text-color="#ffffff" data-cover-photo="imgs/themes/5/header.png" />
577577
<label for="settings-theme-5" class="radioLabel">
578-
<div class="theme-background" style="background: #02334E">
579-
<div class="theme-global-header" style="background: #007088"></div>
578+
<div class="theme-background" style="background: #1c2b3a">
579+
<div class="theme-global-header" style="background: #334e6a"></div>
580580
<div class="theme-header" style="background: url(imgs/themes/5/header-thumbnail.png); background-size: cover"></div>
581-
<div class="theme-nav" style="background: #007088">
582-
<div class="theme-tab" style="background: #128092"></div>
581+
<div class="theme-nav" style="background: #334e6a">
582+
<div class="theme-tab" style="background: #41658a"></div>
583583
</div>
584-
<div class="theme-body" style="background: #128092"></div>
584+
<div class="theme-body" style="background: #41658a"></div>
585585
</div>
586586
</label>
587587
</div>

0 commit comments

Comments
 (0)