Skip to content

Fix: Expensify help website color code and caret icons are not updated #17491

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

Merged
puneetlath merged 14 commits into from
Apr 24, 2023
Merged

Fix: Expensify help website color code and caret icons are not updated #17491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b4f9f21
expensify help website color code and caret icons are not updated
dukenv0307 Apr 17, 2023
c839e16
edit LHN background color
dukenv0307 Apr 17, 2023
5f732bd
fix weird linking compared to other linking in default.html
dukenv0307 Apr 17, 2023
c84e61e
refactor css cleanner
dukenv0307 Apr 18, 2023
82f03d7
format code
dukenv0307 Apr 18, 2023
ae65bed
Update Gemfile.lock
dukenv0307 Apr 18, 2023
d757dd4
update the color name for help dot
dukenv0307 Apr 19, 2023
4d1338b
Merge branch 'fix/17238-website-color-code-and-caret-icons-are-not-up…
dukenv0307 Apr 19, 2023
7103324
remove colors are not used
dukenv0307 Apr 19, 2023
c80cfe9
edit name of color
dukenv0307 Apr 19, 2023
fe370eb
Update _colors.scss
dukenv0307 Apr 19, 2023
d1bac74
Update _colors.scss
dukenv0307 Apr 19, 2023
939d3a1
add color light gray green
dukenv0307 Apr 20, 2023
deacd0b
fix both icon display in mWeb
dukenv0307 Apr 21, 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
2 changes: 1 addition & 1 deletion docs/_includes/article-card.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<h3 class="title">{{ include.title }}</h3>
</div>
<div class="right-icon">
<i class="fa-solid fa-angle-right icon"></i>
<img src="/assets/images/arrow-right.svg" class="base-icon"></img>
</div>
</a>
4 changes: 2 additions & 2 deletions docs/_includes/lhn-template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{% if hub.href == activeHub %}
<li>
<div class="icon-with-link selected">
<i class="fa-solid fa-angle-down icon"></i>
<img src="/assets/images/down.svg" class="base-icon"></img>
<span>{{ hub.title }}</span>
</div>
<ul class="nested-treeview">
Expand All @@ -38,7 +38,7 @@
{% else %}
<li>
<a href="/hubs/{{ hub.href }}" class="icon-with-link link">
<i class="fa-solid fa-angle-right icon"></i>
<img src="/assets/images/arrow-right.svg" class="base-icon"></img>
{{ hub.title }}
</a>
</li>
Expand Down
6 changes: 3 additions & 3 deletions docs/_layouts/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

<div class="lhn-header">
<div id="header-button">
<i id="angle-up-icon" class="fa-solid fa-angle-up icon hide"></i>
<i id="bars-icon" class="fa-solid fa-bars icon"></i>
<img id="angle-up-icon" src="/assets/images/arrow-up.svg" class="base-icon hide"></img>
<img id="bars-icon" src="/assets/images/menu.svg" class="base-icon"></img>
</div>
<a href="/">
<img src="/assets/images/expensify-help.svg" class="logo" />
Expand All @@ -36,7 +36,7 @@
{% include lhn-template.html %}
{% else %}
<div id="back-button" class="icon-with-link">
<i class="fa-solid fa-angle-left icon"></i>
<img src="/assets/images/back-left.svg" class="base-icon"></img>
<div class="link">Back</div>
</div>
<div class="article-toc"></div>
Expand Down
26 changes: 9 additions & 17 deletions docs/_sass/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
$color-dark: #0B1B34;
$color-gray1: #FAFAFA;
$color-gray2: #ECECEC;
$color-gray3: #C6C9CA;
$color-green: #07d973;
$color-pink: #F68DFE;
$color-white: #FFFFFF;

$color-light-grey-green: #C9D3C5;
$color-gray-green: #8B9C8F;
$color-dark-green: #1B5744;
$color-darker-green: #002E22;
$color-super-dark-green: #061B09;
$color-light-blue: #8DC8FF;

$color-link: #5AB0FF;
$color-link-hovered: #B0D9FF;
$color-green400: #03D47C;
$color-green-icons: #8B9C8F;
$color-green-borders: #1A3D32;
$color-green-highlightBG: #07271F;
$color-green-appBG: #061B09;
$color-light-gray-green: #AFBBB0;
$color-blue300: #5AB0FF;
$color-blue200: #B0D9FF;
$color-white: #E7ECE9;
65 changes: 35 additions & 30 deletions docs/_sass/_main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
@import 'colors';
@import 'fonts';

$color-appBG: $color-green-appBG;
$color-highlightBG: $color-green-highlightBG;
$color-borders: $color-green-borders;
$color-icons: $color-green-icons;
$color-text: $color-white;
$color-link: $color-blue300;
$color-link-hovered: $color-blue200;
$color-success: $color-green400;
$color-text-supporting: $color-light-gray-green;

* {
margin: 0;
padding: 0;
Expand Down Expand Up @@ -63,11 +73,11 @@ html,
body {
height: 100%;
min-height: 100%;
background: $color-darker-green;
background: $color-appBG;
}

hr {
background: $color-light-blue;
background: $color-borders;
border: none;
display: inline-block;
width: 24px;
Expand All @@ -84,7 +94,7 @@ em {
}

a {
color: $color-light-blue;

@shawnborton shawnborton Apr 20, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we getting rid of the link color here? I would think this would just be $color-link

color: $color-link;
text-decoration: none;

img {
Expand All @@ -98,7 +108,7 @@ h3,
h4,
h5,
h6 {
color: $color-white;
color: $color-text;
font-weight: bold;
padding-bottom: 12px;
}
Expand Down Expand Up @@ -134,7 +144,7 @@ textarea {
font-weight: 400;
font-family: "ExpensifyNeue", "Helvetica Neue", "Helvetica", Arial, sans-serif;
font-size: 16px;
color: $color-white;
color: $color-text;
}

button {
Expand All @@ -145,15 +155,15 @@ button {
font-weight: bold;

&.success {
background-color: $color-green;
color: $color-white;
background-color: $color-success;
color: $color-text;
width: 100%;
border-radius: 100px;
padding-left: 20px;
padding-right: 20px;

&:hover {
background-color: desaturate($color-green, 15%);
background-color: desaturate($color-success, 15%);
cursor: pointer;
}

Expand All @@ -174,9 +184,9 @@ button {

#lhn {
position: fixed;
background-color: $color-darker-green;
background-color: $color-highlightBG;
box-sizing: border-box;
border-right-color: $color-dark-green;
border-right-color: $color-borders;
border-right-width: 1px;
border-style: solid;
width: 100%;
Expand Down Expand Up @@ -269,12 +279,13 @@ button {
display: grid;
grid-template-columns: 40px auto;
cursor: pointer;
align-items: center;
}

.selected {
cursor: auto;
font-weight: bold;
color: $color-white;
color: $color-text;
}

.hide {
Expand All @@ -286,7 +297,6 @@ button {
#content-area {
display: flex;
flex-direction: column;
background-color: $color-super-dark-green;
min-height: 100vh;
margin-left: 0;
padding: 80px 24px 0px 24px;
Expand Down Expand Up @@ -385,7 +395,7 @@ button {

.selected-article {
font-weight: bold;
color: $color-white;
color: $color-text;
}

.home-link {
Expand All @@ -412,11 +422,11 @@ button {
padding: 28px;
font-weight: 700;
cursor: pointer;
color: $color-white;
background-color: $color-darker-green;
color: $color-text;
background-color: $color-highlightBG;

&:hover {
background-color: darken($color-darker-green, 1%);
background-color: darken($color-highlightBG, 1%);
}

.row {
Expand Down Expand Up @@ -485,14 +495,9 @@ button {
}
}

.icon {
color: $color-gray-green;
font-size: larger;
display: inline;

&.fa-angle-right {
padding-left: 4px;
}
.base-icon {
width: 20px;
height: 20px;
}

.homepage {
Expand Down Expand Up @@ -609,7 +614,7 @@ button {
}

h3 {
color: $color-green;
color: $color-success;
font-size: 17px;
font-weight: 700;
margin-bottom: 16px;
Expand All @@ -624,13 +629,13 @@ button {
margin: 0 0 8px;

a {
color: $color-white;
color: $color-text;
display: block;
padding: 4px 0;
word-break: break-word;

&:hover {
color: $color-green;
color: $color-success;
}
}
}
Expand All @@ -640,17 +645,17 @@ button {
padding-bottom: 20px;

a {
color: $color-white;
color: $color-text;
display: inline-block;

&:hover {
color: $color-green;
color: $color-success;
}
}
}

&__fine-print {
color: $color-gray-green;
color: $color-text-supporting;
font-size: 10px;

a {
Expand Down
10 changes: 10 additions & 0 deletions docs/assets/images/arrow-right.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions docs/assets/images/arrow-up.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions docs/assets/images/back-left.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions docs/assets/images/down.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions docs/assets/images/menu.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.