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

Use modern SCSS package and syntax #47

Draft
wants to merge 15 commits into
base: develop
Choose a base branch
from
Draft

Use modern SCSS package and syntax #47

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
debb997
Merge pull request #38 from AssistantNMS/develop
Khaoz-Topsy Feb 17, 2023
c6db3f0
🐛 Add trim to search
Khaoz-Topsy Feb 17, 2023
a9b686a
Merge pull request #39 from AssistantNMS/develop
Khaoz-Topsy Feb 22, 2023
731b19c
Merge pull request #40 from AssistantNMS/develop
Khaoz-Topsy Feb 22, 2023
daf7dfc
Merge pull request #42 from AssistantNMS/develop
Khaoz-Topsy Apr 5, 2023
731deda
Merge pull request #43 from AssistantNMS/develop
Khaoz-Topsy Apr 17, 2023
b406090
Merge pull request #44 from AssistantNMS/develop
Khaoz-Topsy Apr 17, 2023
e1bb1a2
Merge pull request #45 from AssistantNMS/develop
Khaoz-Topsy May 16, 2023
6f9cd1c
use dart-sass
Lenni009 May 19, 2023
1bdc31a
use proper scss syntax
Lenni009 May 19, 2023
2fba79a
add object-fit to community search card img
Lenni009 May 19, 2023
934792e
Merge branch 'main' of https://github.com/Lenni009/AssistantNMSWebApp
Lenni009 May 19, 2023
39bb63d
fix package.json
Lenni009 May 19, 2023
bf08ff4
Merge pull request #1 from Lenni009/main
Lenni009 May 19, 2023
1a0ce11
remove object-fit rule
Lenni009 Jun 7, 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
1,431 changes: 854 additions & 577 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"@types/react-redux": "^7.1.24",
"@types/react-router-dom": "^5.3.3",
"@types/react-vertical-timeline-component": "^3.3.3",
"node-sass": "^7.0.1",
"sass": "^1.62.1",
"typescript": "^4.7.3"
}
}
2 changes: 1 addition & 1 deletion src/pages/catalogue/catalogueListContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export const CatalogueListContainerUnconnected: React.FC<IProps> = (props: IProp
return newDisplayItems;
}

const displayItems = getDisplayItems(items, searchTerm);
const displayItems = getDisplayItems(items, searchTerm.trim());
return (
<CatalogueListPresenter
{...props}
Expand Down
3 changes: 2 additions & 1 deletion src/scss/custom/_community.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ $community-search-icon-border-radius: 5px;

.community-icon {
img {
border-top-left-radius: $community-search-icon-border-radius;
border-top-left-radius: $community-search-icon-border-radius;
object-fit: contain;
Copy link
Member

Choose a reason for hiding this comment

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

Please remove this object-fit rule

}
}
}
Expand Down
1 change: 0 additions & 1 deletion src/scss/custom/_expedition.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
opacity: 1;
transition: opacity 250ms ease-in-out;
display: flex;
width: 100%;

.text-container {
overflow: hidden;
Expand Down
51 changes: 25 additions & 26 deletions src/scss/custom/_fab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
.mdc-fab:not(.mdc-fab--extended) {
border-radius: 50%;
}
.fab-margin {
margin: 0.5em;
}

.mdc-fab {
fill: currentColor;
align-items: center;
appearance: none;
-moz-appearance: none;
-webkit-appearance: none;
border: none;
Expand All @@ -32,29 +30,30 @@
-ms-user-select: none;
user-select: none;
width: 56px;
}

.mdc-fab:after,
.mdc-fab:before {
height: 200%;
left: -50%;
top: -50%;
width: 200%;
}
&::after,
&::before {
height: 200%;
left: -50%;
top: -50%;
width: 200%;
border-radius: 50%;
content: "";
opacity: 0;
pointer-events: none;
position: absolute;
}

.mdc-fab:before {
transition: opacity 15ms linear, background-color 15ms linear;
z-index: 1;
}
.mdc-fab:after,
.mdc-fab:before {
border-radius: 50%;
content: "";
opacity: 0;
pointer-events: none;
position: absolute;
}
&::before {
transition: opacity 15ms linear, background-color 15ms linear;
z-index: 1;
}

.mdc-fab:focus {
outline: unset;
}
&:focus {
outline: unset;
}

&:not(.mdc-fab--extended) {
border-radius: 50%;
}
}
10 changes: 4 additions & 6 deletions src/scss/custom/_general.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ body {
#app .main-panel #navbar.navbar {
max-height: 80px;

@media screen and (min-width: 500px) and (max-width: 991px) {
padding-top: 0 !important;
}

.navbar-toggler .icon-bar {
background-color: white;
}
Expand Down Expand Up @@ -307,12 +311,6 @@ img.tiny {
padding-right: 0.5em;
}

#app .main-panel #navbar.navbar {
@media screen and (min-width: 500px) and (max-width: 991px) {
padding-top: 0 !important;
}
}

.colour-swatch {
display: inline-block;
height: 2em;
Expand Down
Loading