Skip to content
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

Jump to bottom

fix(css): reuse css vars #256

Merged
merged 2 commits into from
Mar 18, 2021
Merged

fix(css): reuse css vars #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6ee79a
fix(css): reuse css vars
posva Mar 5, 2021
517f8c6
refactor: use inherit
posva Mar 5, 2021
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 src/client/theme-default/components/BuySellAds.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function load() {

.bsa-cpc {
border-radius: 6px;
background-color: #f8f8f8;
background-color: var(--c-bg-accent);
}

.bsa-cpc ::v-deep(a._default_) {
Expand Down
2 changes: 1 addition & 1 deletion src/client/theme-default/components/CarbonAds.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ onMounted(() => {
margin: 0 auto;
max-width: 280px;
font-size: 0.75rem;
background-color: rgba(255, 255, 255, 0.8);
background-color: var(--c-bg-accent);
min-height: 105.38px; /* avoid layout shift on mobile */
}

Expand Down
6 changes: 3 additions & 3 deletions src/client/theme-default/components/HomeHero.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,20 +132,20 @@ const hasAltAction = computed(() => data.value.altActionLink && data.value.altAc
line-height: 44px;
font-size: 1rem;
font-weight: 500;
color: #ffffff;
color: var(--c-bg);
background-color: var(--c-brand);
border: 2px solid var(--c-brand);
transition: background-color 0.1s ease;
}

.action.alt :deep(.item) {
background-color: #fff;
background-color: var(--c-bg);
Copy link
Member Author

Choose a reason for hiding this comment

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

I wonder if we shouldn't just do

Suggested change
background-color: var(--c-bg);
background-color: transparent;

color: var(--c-brand);
}

.action :deep(.item:hover) {
text-decoration: none;
color: #ffffff;
color: var(--c-bg);
background-color: var(--c-brand-light);
}

Expand Down
2 changes: 1 addition & 1 deletion src/client/theme-default/components/NavBar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ defineEmit(['toggle'])
border-bottom: 1px solid var(--c-divider);
padding: .7rem 1.5rem .7rem 4rem;
height: var(--header-height);
background-color: #ffffff;
background-color: inherit;
}

@media (min-width: 720px) {
Expand Down
2 changes: 1 addition & 1 deletion src/client/theme-default/styles/custom-blocks.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

.custom-block.tip {
background-color: #f3f5f7;
border-color: #42b983;
border-color: var(--c-brand);
}

.custom-block.warning {
Expand Down
11 changes: 5 additions & 6 deletions src/client/theme-default/styles/vars.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
/** Base Styles */
:root {

/**
* Colors
* --------------------------------------------------------------------- */

--c-white: #ffffff;
--c-white-dark: #f8f8f8;
--c-black: #000000;

--c-divider-light: rgba(60, 60, 67, .12);
--c-divider-dark: rgba(84, 84, 88, .48);
--c-divider-light: rgba(60, 60, 67, 0.12);
--c-divider-dark: rgba(84, 84, 88, 0.48);

--c-text-light-1: #2c3e50;
--c-text-light-2: #476582;
Expand Down Expand Up @@ -54,19 +54,18 @@

/** Fallback Styles */
:root {

--c-divider: var(--c-divider-light);

--c-text: var(--c-text-light-1);
--c-text-light: var(--c-text-light-2);
--c-text-lighter: var(--c-text-light-3);

--c-bg: var(--c-white);
--c-bg-accent: var(--c-white-dark);

--code-line-height: 24px;
--code-font-family: var(--font-family-mono);
--code-font-size: 14px;
--code-inline-bg-color: rgba(27, 31, 35, .05);
--code-inline-bg-color: rgba(27, 31, 35, 0.05);
--code-bg-color: #282c34;

}