Skip to content

Commit 4d64198

Browse files
authored
Merge pull request #1836 from bolt/update-top-toolbar
Update top toolbar. Kill your darlings!
2 parents 3518a1d + c11cb00 commit 4d64198

File tree

5 files changed

+66
-82
lines changed

5 files changed

+66
-82
lines changed

Diff for: assets/js/app/toolbar/Components/Toolbar.vue

+13-32
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,16 @@
88
<img
99
src="/assets/images/bolt_logo_dashboard.svg"
1010
alt="⚙️ Bolt"
11-
height="28"
11+
height="26"
1212
/>
1313
</div>
1414

15+
<div class="toolbar-item toolbar-item__site">
16+
<a href="/" target="_blank">
17+
<i class="fas fa-sign-out-alt"></i>{{ labels['action.view_site'] }}
18+
</a>
19+
</div>
20+
1521
<form
1622
:action="backendPrefix"
1723
class="toolbar-item toolbar-item__filter input-group"
@@ -25,41 +31,16 @@
2531
:value="filterValue"
2632
/>
2733
<div class="input-group-append">
28-
<button class="btn btn-tertiary" type="submit">
29-
<i class="fas fa-search"></i>{{ labels['listing.button_search'] }}
34+
<button
35+
class="btn btn-tertiary"
36+
type="submit"
37+
:title="labels['listing.button_search']"
38+
>
39+
<i class="fas fa-search" style="margin: 0;"></i>
3040
</button>
3141
</div>
3242
</form>
3343

34-
<div class="toolbar-item toolbar-item__site">
35-
<a href="/" target="_blank">
36-
<i class="fas fa-sign-out-alt"></i>{{ labels['action.view_site'] }}
37-
</a>
38-
</div>
39-
40-
<div class="toolbar-item btn-group toolbar-item__new">
41-
<button
42-
class="btn new-item__dropdown-toggler dropdown-toggle"
43-
type="button"
44-
data-toggle="dropdown"
45-
data-display="static"
46-
aria-haspopup="true"
47-
aria-expanded="false"
48-
>
49-
<i class="fas fa-magic"></i>{{ labels['action.create_new'] }}…
50-
</button>
51-
<div class="new-item__dropdown dropdown-menu">
52-
<ul>
53-
<li v-for="(item, index) in createMenu" :key="index">
54-
<a :href="item.link_new"
55-
><i :class="`fa fa-fw ${item.icon}`"></i>
56-
{{ item.singular_name }}</a
57-
>
58-
</li>
59-
</ul>
60-
</div>
61-
</div>
62-
6344
<div class="toolbar-item btn-group toolbar-item__profile">
6445
<button
6546
class="btn user profile__dropdown-toggler dropdown-toggle"

Diff for: assets/scss/modules/admin/_toolbar.scss

+3-11
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
align-items: center;
4242
justify-content: center;
4343
font-size: 0.875rem;
44-
padding: 0;
4544

4645
a {
4746
font-size: 0.9375rem;
@@ -119,15 +118,7 @@
119118

120119
&__brand {
121120
justify-content: left;
122-
padding-left: 2rem;
123-
124-
@include media-breakpoint-up(lg) {
125-
flex: 0 1 $admin-sidebar-width;
126-
}
127-
128-
@include media-breakpoint-up(wd) {
129-
flex: 0 1 $admin-sidebar-width-wide;
130-
}
121+
padding: 0 2rem;
131122

132123
svg,
133124
img {
@@ -152,7 +143,7 @@
152143

153144
&__filter {
154145
margin-left: auto;
155-
max-width: 400px;
146+
max-width: 200px;
156147
margin-right: 1rem;
157148
}
158149

@@ -161,6 +152,7 @@
161152

162153
@include media-breakpoint-up(sm) {
163154
display: block;
155+
padding-top: 0.1rem;
164156
}
165157

166158
a {

Diff for: package-lock.json

+45-33
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@
3232
"baguettebox.js": "^1.11.1",
3333
"bootbox": "^5.4.0",
3434
"bootstrap": "^4.5.2",
35-
"browserslist": "^4.14.0",
36-
"caniuse-lite": "^1.0.30001122",
35+
"browserslist": "^4.14.1",
36+
"caniuse-lite": "^1.0.30001124",
3737
"codemirror": "^5.57.0",
3838
"dropzone": "^5.7.2",
3939
"flagpack": "^1.0.5",
4040
"hotkeys-js": "^3.8.1",
4141
"jquery": "^3.5.1",
42-
"locutus": "^2.0.11",
42+
"locutus": "^2.0.12",
4343
"luxon": "^1.25.0",
4444
"no-scroll": "^2.1.1",
4545
"node-vibrant": "^3.1.5",
@@ -61,7 +61,7 @@
6161
"zxcvbn": "^4.4.2"
6262
},
6363
"devDependencies": {
64-
"@babel/core": "^7.11.5",
64+
"@babel/core": "^7.11.6",
6565
"@babel/plugin-transform-regenerator": "^7.10.4",
6666
"@babel/plugin-transform-runtime": "^7.11.5",
6767
"@babel/polyfill": "^7.11.5",

Diff for: templates/_base/layout.html.twig

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
{# Setting the labels and their localisations that are used in the sidebar-menu. #}
2929
{% set labels = {
3030
'about.bolt_documentation': 'about.bolt_documentation'|trans,
31-
'action.view_site': 'action.view_site'|trans,
32-
'action.create_new': 'action.create_new'|trans,
31+
'action.view_site': config.get('general/sitename'),
3332
'general.greeting': 'general.greeting'|trans({'%name%': user_display_name}),
3433
'action.logout': 'action.logout'|trans,
3534
'action.edit_profile': 'action.edit_profile'|trans,

0 commit comments

Comments
 (0)