Skip to content

Commit

Permalink
feat: consolidate styles in global.scss in shared-atomic-design-compo…
Browse files Browse the repository at this point in the history
…nents library (#931)

* Consolidate styles in global.scss in shared-atomic-design-components library to share across our apps; remove duplicated style files

* Remove unnessesary comments and code
  • Loading branch information
katamatata authored Jul 11, 2024
1 parent 1898d2f commit dad87af
Show file tree
Hide file tree
Showing 15 changed files with 41 additions and 310 deletions.
2 changes: 1 addition & 1 deletion apps/redi-connect/src/components/organisms/Navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
}

// since the default a:hover behaviour is defined as underline (main.scss) we had
// since the default a:hover behaviour is defined as underline (global.scss) we had
// to define this class for the logo and the !important explictly for safari browser
&__logo:hover {
text-decoration: none !important;
Expand Down
1 change: 1 addition & 0 deletions apps/redi-connect/src/main.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import 'global.scss';
2 changes: 1 addition & 1 deletion apps/redi-connect/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import React from 'react'
import ReactDOM from 'react-dom'
import App from './App'
// import i18n (needs to be bundled ;))
import './main.scss'
import './services/i18n/i18n'
import './styles/main.scss'

// We used to call initSentry('con') here. Now we can only init Sentry
// if user accepts it in the cookie banner. So we expose the function
Expand Down
69 changes: 0 additions & 69 deletions apps/redi-connect/src/styles/_forms.scss

This file was deleted.

18 changes: 0 additions & 18 deletions apps/redi-connect/src/styles/_global.scss

This file was deleted.

176 changes: 0 additions & 176 deletions apps/redi-connect/src/styles/main.scss

This file was deleted.

2 changes: 1 addition & 1 deletion apps/redi-talent-pool/src/components/organisms/Navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
}
}

// since the default a:hover behaviour is defined as underline (main.scss) we had
// since the default a:hover behaviour is defined as underline (global.scss) we had
// to define this class for the logo and the !important explictly for safari browser
&__logo:hover {
text-decoration: none !important;
Expand Down
3 changes: 2 additions & 1 deletion apps/redi-talent-pool/src/components/templates/LoggedIn.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
@import '_variables';
@import '~bulma/sass/utilities/_all';

.tp-side-menu {
background-color: #eff6f8;
background-color: $redi-blue-light;

min-width: 84px;

Expand Down
2 changes: 1 addition & 1 deletion apps/redi-talent-pool/src/main.scss
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@import '_main.scss';
@import 'global.scss';
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
@import '_variables.scss';
@import 'global.scss';

$tp-light-blue: #58adc4;
$tp-blue: #eff6f8;
@import '_variables';
@import '~bulma/sass/utilities/_all';

.onboarding-steps {
display: flex;
Expand All @@ -17,7 +14,7 @@ $tp-blue: #eff6f8;
margin-bottom: 2.5rem;
}

border: 1px solid #d8d8d8;
border: 1px solid $grey-light;

&--header {
display: flex;
Expand Down Expand Up @@ -45,9 +42,9 @@ $tp-blue: #eff6f8;
}
}
&--item.current-step {
background-color: $tp-blue;
background-color: $redi-blue-light;
}
&--item.completed-step {
color: $tp-light-blue;
color: $redi-blue-dark;
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
@import '_variables.scss';
@import 'global.scss';

$tp-light-blue: #58adc4;
$tp-blue: #eff6f8;
@import '_variables';
@import '~bulma/sass/utilities/_all';

.company-onboarding-steps {
display: flex;
Expand All @@ -17,7 +14,7 @@ $tp-blue: #eff6f8;
margin-bottom: 2.5rem;
}

border: 1px solid #d8d8d8;
border: 1px solid $grey-light;

&--header {
display: flex;
Expand Down Expand Up @@ -45,9 +42,9 @@ $tp-blue: #eff6f8;
}
}
&--item.current-step {
background-color: $tp-blue;
background-color: $redi-blue-light;
}
&--item.completed-step {
color: $tp-light-blue;
color: $redi-blue-dark;
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import './_variables';
@import '_variables';

.submit {
&-link {
font-size: $size-7;
Expand Down
18 changes: 0 additions & 18 deletions libs/shared-atomic-design-components/src/lib/styles/_global.scss

This file was deleted.

Loading

0 comments on commit dad87af

Please sign in to comment.