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

Minor changes to the top bar styles #7802

Merged
merged 9 commits into from
Sep 26, 2023
+55 −37
Merged

Minor changes to the top bar styles #7802

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c379f4c
Add and enable M PLUS 1, adjust ExecutionModeSelector styles
vitvakatu Sep 12, 2023
46e82ea
Add basic animation for the dropdown
vitvakatu Sep 12, 2023
77a694f
Adjust sizes of text in the top bar
vitvakatu Sep 12, 2023
d606b54
Merge branch 'develop' into wip/vitvakatu/gui2-top-bar
vitvakatu Sep 19, 2023
97f8007
Address review comments
vitvakatu Sep 19, 2023
44ffc1c
Merge branch 'develop' into wip/vitvakatu/gui2-top-bar
vitvakatu Sep 25, 2023
a898d4c
Fix merge conflict
vitvakatu Sep 25, 2023
c0971da
fix formatting
vitvakatu Sep 26, 2023
b720369
Merge branch 'develop' into wip/vitvakatu/gui2-top-bar
somebody1234 Sep 26, 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
3 changes: 3 additions & 0 deletions app/gui2/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
<meta charset="UTF-8" />
<link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=M+PLUS+1:wght@500;600&display=swap" rel="stylesheet">
<title>Vite App</title>
</head>
<body>
Expand Down
5 changes: 2 additions & 3 deletions app/gui2/src/assets/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
*::after {
box-sizing: border-box;
margin: 0;
font-weight: normal;
font-weight: 500;
}

body {
Expand All @@ -63,8 +63,7 @@ body {
background: #e4d4be;
color: var(--color-text);
transition: color 0.5s, background-color 0.5s;
font-family: Inter, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu,
Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
font-family: 'M PLUS 1', sans-serif;
font-size: 11.5px;
font-weight: 500;
line-height: 174.5%;
vitvakatu marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
2 changes: 1 addition & 1 deletion app/gui2/src/assets/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ body {
display: flex;
flex-direction: column;
flex: 1;
font-weight: normal;
font-weight: 500;
}
42 changes: 29 additions & 13 deletions app/gui2/src/components/ExecutionModeSelector.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,25 +43,26 @@ useDocumentEvent('click', onDocumentClick)
"
/>
</div>
<div v-if="isDropdownOpen" class="execution-mode-dropdown">
<template v-for="otherMode in modes" :key="otherMode">
<span
v-if="modelValue !== otherMode"
class="button"
@click="emit('update:modelValue', otherMode)"
v-text="otherMode"
></span>
</template>
</div>
<Transition name="dropdown">
<div v-if="isDropdownOpen" class="execution-mode-dropdown">
<template v-for="otherMode in modes" :key="otherMode">
<span
v-if="modelValue !== otherMode"
class="button"
@click="emit('update:modelValue', otherMode)"
v-text="otherMode"
></span>
</template>
</div>
</Transition>
</div>
</template>

<style scoped>
span {
display: inline-block;
height: 20px;
padding-top: 1px;
padding-bottom: 1px;
height: 24px;
padding: 1px 0px;
vitvakatu marked this conversation as resolved.
Show resolved Hide resolved
}

.ExecutionModeSelector {
Expand All @@ -72,10 +73,12 @@ span {
.execution-mode-button {
display: flex;
align-items: center;
height: 24px;
border-radius: var(--radius-full);
background: #64b526;

> .execution-mode {
font-weight: 600;
padding: 0 8px;
}

Expand Down Expand Up @@ -112,4 +115,17 @@ span {
background: var(--color-dim);
}
}

.dropdown-enter-active,
.dropdown-leave-active {
transition: all 0.1s;
vitvakatu marked this conversation as resolved.
Show resolved Hide resolved
}

.dropdown-enter-from,
.dropdown-leave-to {
max-height: 0;
padding: 0;
vitvakatu marked this conversation as resolved.
Show resolved Hide resolved
overflow: hidden;
vitvakatu marked this conversation as resolved.
Show resolved Hide resolved
}

</style>
2 changes: 1 addition & 1 deletion app/gui2/src/components/NavBreadcrumb.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const emit = defineEmits<{ click: [] }>()
<style scoped>
span {
display: inline-block;
height: 20px;
height: 24px;
padding-top: 1px;
padding-bottom: 1px;
vitvakatu marked this conversation as resolved.
Show resolved Hide resolved
}
Expand Down
2 changes: 1 addition & 1 deletion app/gui2/src/components/ProjectTitle.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const emit = defineEmits<{ execute: []; 'update:mode': [mode: string] }>()

> .title {
display: inline-block;
height: 20px;
height: 24px;
padding-top: 1px;
padding-bottom: 1px;
vitvakatu marked this conversation as resolved.
Show resolved Hide resolved
}
Expand Down
Loading