Skip to content

Commit

Permalink
Merge pull request #797 from betagouv/dependabot/npm_and_yarn/prettie…
Browse files Browse the repository at this point in the history
…r-3.2.5

chore(deps-dev): bump prettier from 2.8.8 to 3.2.5
  • Loading branch information
wiwski authored Mar 19, 2024
2 parents 3eba3c6 + f35073d commit fbe5335
Show file tree
Hide file tree
Showing 74 changed files with 339 additions and 327 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ updates:
schedule:
interval: "weekly"
time: "07:00"
timezone: "Europe/Paris"
timezone: "Europe/Paris"
4 changes: 3 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
_static/**
**/assets/dist/**
.github/workflows/automerge-dependabot.yaml
.github/workflows/automerge-dependabot.yaml
.mypy_cache/**
*.html
58 changes: 29 additions & 29 deletions euphro_auth/static/css/admin/user.css
Original file line number Diff line number Diff line change
@@ -1,73 +1,73 @@
#changelist {
flex-direction: column-reverse;
flex-direction: column-reverse;
}

#changelist table {
table-layout: fixed ;
table-layout: fixed;
}

#changelist table thead th {
word-wrap: break-word;
white-space: normal;
word-wrap: break-word;
white-space: normal;
}

#changelist th.column-invitation_completed_display,
#changelist th.column-invitation_completed_display,
#changelist th.column-is_lab_admin,
#changelist th.column-is_superuser {
width: 100px;
width: 100px;
}

#changelist th.action-checkbox-column {
width: 2.5rem !important;
width: 2.5rem !important;
}

#changelist table td.field-last_institution_display {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}

#changelist th.field-full_name_display {
width: 200px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
width: 200px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}

#changelist td.field-email {
word-wrap: anywhere;
word-wrap: anywhere;
}

#changelist #changelist-filter {
margin: 0;
flex: none;
width: 100%;
margin: 0;
flex: none;
width: 100%;
}

#changelist #changelist-filter a {
display: inline-flex;
color: var(--text-action-high-blue-france);
display: inline-flex;
color: var(--text-action-high-blue-france);
}

#changelist .actions {
display: flex;
align-items: end;
margin-bottom: 15px;
padding-left: 10px !important;
display: flex;
align-items: end;
margin-bottom: 15px;
padding-left: 10px !important;
}

#changelist .actions button[type="submit"] {
margin-left: 2rem;
margin-left: 2rem;
}

#changelist #changelist-search #euphrosyne-searchbar {
max-width: 600px;
max-width: 600px;
}

.change-form .fr-tag {
padding: .25rem .75rem;
padding: 0.25rem 0.75rem;
}

.object-tools {
display: none;
}
display: none;
}
22 changes: 15 additions & 7 deletions euphrosyne/assets/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
--link-fg: var(--primary);
--default-button-bg: var(--blue-france-300);
--default-button-hover-bg: var(--blue-france-hover);

--grey-100: #161616;
--grey-425: #666;
--grey-1000: #f8f8f8;
Expand All @@ -36,19 +36,28 @@ select {
height: auto;
}

input[type="button"]:not(:disabled):hover, input[type="image"]:not(:disabled):hover, input[type="reset"]:not(:disabled):hover, input[type="submit"]:not(:disabled):hover {
input[type="button"]:not(:disabled):hover,
input[type="image"]:not(:disabled):hover,
input[type="reset"]:not(:disabled):hover,
input[type="submit"]:not(:disabled):hover {
--hover: var(--background-action-high-blue-france-hover);
}

button.fr-link:hover, button.fr-tabs__tab:hover {
button.fr-link:hover,
button.fr-tabs__tab:hover {
--hover: var(--background-default-grey-hover);
}

button.fr-btn--tertiary:hover, button.fr-btn--secondary:hover {
button.fr-btn--tertiary:hover,
button.fr-btn--secondary:hover {
--hover: inherit;
}

.button, input[type=submit], input[type=button], .submit-row input, a.button {
.button,
input[type="submit"],
input[type="button"],
.submit-row input,
a.button {
border-radius: 0;
}

Expand Down Expand Up @@ -126,7 +135,6 @@ ul.messagelist li {
}
ul.messagelist li.info {
background-color: var(--background-contrast-grey);

}
ul.messagelist li span.close {
float: right;
Expand Down Expand Up @@ -243,4 +251,4 @@ ul li {

.workplace .fr-tabs__panel {
background-color: var(--background-default-grey);
}
}
12 changes: 5 additions & 7 deletions euphrosyne/assets/css/dsrf-overrides.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,15 @@ input[type="email"],
input[type="url"],
input[type="number"],
input[type="tel"],
input[type="search"]
textarea,
input[type="search"] textarea,
select,
.vTextField {
border: 0;
border-radius: .25rem .25rem 0 0;
padding: .5rem 1rem;
border-radius: 0.25rem 0.25rem 0 0;
padding: 0.5rem 1rem;
margin-top: 0;
color: var(--text-default-grey);
background-color: var(--background-contrast-grey)
background-color: var(--background-contrast-grey);
}

.submit-row .deletelink-box a.deletelink {
Expand All @@ -45,7 +44,6 @@ th .text a {
background: none;
}


table input.fr-input[type="checkbox"] {
width: auto;
}
}
2 changes: 1 addition & 1 deletion euphrosyne/assets/js/components/RunningVMTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default function RunningVMTable() {
const t = {
"Virtual machine": window.gettext("Virtual machine"),
"No running virtual machines": window.gettext(
"No running virtual machines"
"No running virtual machines",
),
};

Expand Down
2 changes: 1 addition & 1 deletion euphrosyne/assets/js/components/UpcomingProjects.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ async function fetchUpcomingProjects(): Promise<UpcomingProject[]> {

export default function UpcomingProjects(): JSX.Element {
const [upcomingProjects, setUpcomingProjects] = useState<UpcomingProject[]>(
[]
[],
);
const [isLoading, setIsLoading] = useState(true);
useEffect(() => {
Expand Down
4 changes: 2 additions & 2 deletions euphrosyne/assets/js/components/header/Translate.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default function Translate() {
];
const [currentLang, setCurrentLang] = useState("fr");
const currentLangLabel = (locales.find(
(locale) => locale[0] === currentLang
(locale) => locale[0] === currentLang,
) || locales[0])[1];

const changeLang = (lang: string) => {
Expand All @@ -27,7 +27,7 @@ export default function Translate() {
document.cookie
.split("; ")
.find((row) => row.startsWith("django_language="))
?.split("=")[1] || "fr"
?.split("=")[1] || "fr",
);
}, []);

Expand Down
4 changes: 2 additions & 2 deletions euphrosyne/assets/js/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ window.addEventListener("DOMContentLoaded", () => {
const { currentPath, items } = getNavItemsData();
renderComponent(
"header-nav",
createElement(HeaderNav, { currentPath, items })
createElement(HeaderNav, { currentPath, items }),
);
} else {
console.info("No header-nav element found. Not rendering header nav.");
Expand All @@ -73,7 +73,7 @@ window.addEventListener("DOMContentLoaded", () => {
const currentUser = getUserData();
renderComponent(
"header-main",
createElement(Header, { project, backLink, currentUser })
createElement(Header, { project, backLink, currentUser }),
);
} else {
console.info("No header-main element found. Not rendering header.");
Expand Down
2 changes: 1 addition & 1 deletion euphrosyne/assets/js/react.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export function renderComponent(elementId: string, component: JSX.Element) {
const element = document.getElementById(elementId);
if (!element) {
console.error(
`Could not render ${component.type}. Element with id ${elementId} not found.`
`Could not render ${component.type}. Element with id ${elementId} not found.`,
);
return;
}
Expand Down
72 changes: 36 additions & 36 deletions euphrosyne/static/css/dashboard.css
Original file line number Diff line number Diff line change
@@ -1,76 +1,76 @@
.dashboard .content {
background-color: var(--background-alt-grey);
background-color: var(--background-alt-grey);
}

.dashboard #content {
width: auto;
width: auto;
}

.calendar {
background-color: var(--background-raised-grey);
filter: drop-shadow(var(--raised-shadow));
z-index: calc(var(--ground) + 750);
background-color: var(--background-raised-grey);
filter: drop-shadow(var(--raised-shadow));
z-index: calc(var(--ground) + 750);
}

.calendar td :nth-child(2n + 1) {
background: inherit;
}

.upcoming-projects-banner {
display: flex;
justify-content: space-between;
display: flex;
justify-content: space-between;
}

.upcoming-projects-banner a {
color: var(--text-action-high-blue-france);
color: var(--text-action-high-blue-france);
}


/** FULL CALENDAR */
:root {
--fc-event-text-color: unset !important;
--fc-button-bg-color: transparent !important;
--fc-button-text-color: var(--text-action-high-blue-france) !important;
--fc-button-border-color: transparent;
--fc-border-color : transparent;

--fc-button-active-bg-color: var(--background-action-high-blue-france) !important;
--fc-button-active-border-color: transparent !important;
--fc-button-text-color:var(--text-inverted-blue-france) !important;
--fc-event-text-color: unset !important;
--fc-button-bg-color: transparent !important;
--fc-button-text-color: var(--text-action-high-blue-france) !important;
--fc-button-border-color: transparent;
--fc-border-color: transparent;

--fc-button-hover-bg-color: var(--hover-tint);
--fc-button-hover-border-color: unset;
--fc-button-hover-text-color: inherit;
--fc-button-active-bg-color: var(
--background-action-high-blue-france
) !important;
--fc-button-active-border-color: transparent !important;
--fc-button-text-color: var(--text-inverted-blue-france) !important;

--fc-button-hover-bg-color: var(--hover-tint);
--fc-button-hover-border-color: unset;
--fc-button-hover-text-color: inherit;
}
.fc-event-title {
font-size: .8rem;
font-size: 0.8rem;
}
.fc-daygrid-event, .fc-button {
border-radius: 0 !important;
.fc-daygrid-event,
.fc-button {
border-radius: 0 !important;
}
.fc .fc-button-primary:hover {
background-color: var(--hover-tint) !important;
background-color: var(--hover-tint) !important;
}
.fc .fc-button-primary[aria-pressed='false'] {
--hover: inherit;
color: inherit !important;
.fc .fc-button-primary[aria-pressed="false"] {
--hover: inherit;
color: inherit !important;
}
.fc .fc-button-primary[aria-pressed='true'] {
--hover: var(--background-action-high-blue-france-hover);
.fc .fc-button-primary[aria-pressed="true"] {
--hover: var(--background-action-high-blue-france-hover);
}

.fc-daygrid-event-dot {
display: none;
display: none;
}

.calendar .fc .fc-prev-button {
margin-right: 1rem;;
margin-right: 1rem;
}

@media (min-width: 1080px) {
.dashboard .module table td a {
padding: .6em;
}
.dashboard .module table td a {
padding: 0.6em;
}
}
4 changes: 3 additions & 1 deletion euphrosyne/static/css/login.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
padding: 10px 15px;
background-color: var(--background-default-grey);
color: var(--text-action-high-grey);
box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14),
box-shadow:
0 3px 1px -2px rgba(0, 0, 0, 0.2),
0 2px 2px 0 rgba(0, 0, 0, 0.14),
0 1px 5px 0 rgba(0, 0, 0, 0.12);
}
.orcid-row a:hover {
Expand Down
Loading

0 comments on commit fbe5335

Please sign in to comment.