Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Metabase
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Engineering Digital Service
Metabase
Commits
adf8d62b
Commit
adf8d62b
authored
7 years ago
by
Atte Keinänen
Browse files
Options
Downloads
Patches
Plain Diff
Move collection text below title + add dummy details button next to it
parent
c3e3b07d
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
frontend/src/metabase/icon_paths.js
+1
-0
1 addition, 0 deletions
frontend/src/metabase/icon_paths.js
frontend/src/metabase/query_builder/components/CardHeader.jsx
+22
-8
22 additions, 8 deletions
...tend/src/metabase/query_builder/components/CardHeader.jsx
with
23 additions
and
8 deletions
frontend/src/metabase/icon_paths.js
+
1
−
0
View file @
adf8d62b
...
...
@@ -115,6 +115,7 @@ export var ICON_PATHS = {
attrs
:
{
viewBox
:
"
0 0 36 33
"
}
},
info
:
'
M16 0 A16 16 0 0 1 16 32 A16 16 0 0 1 16 0 M19 15 L13 15 L13 26 L19 26 z M16 6 A3 3 0 0 0 16 12 A3 3 0 0 0 16 6
'
,
infooutlined
:
'
M16 29c7.18 0 13-5.82 13-13S23.18 3 16 3 3 8.82 3 16s5.82 13 13 13zm0 3C7.163 32 0 24.837 0 16S7.163 0 16 0s16 7.163 16 16-7.163 16-16 16zm1.697-20h-4.185v14h4.185V12zm.432-3.834c0-.342-.067-.661-.203-.958a2.527 2.527 0 0 0-1.37-1.31 2.613 2.613 0 0 0-.992-.188c-.342 0-.661.062-.959.189a2.529 2.529 0 0 0-1.33 1.309c-.13.297-.195.616-.195.958 0 .334.065.646.196.939.13.292.31.549.54.77.23.22.492.395.79.526.297.13.616.196.958.196.351 0 .682-.066.992-.196.31-.13.583-.306.817-.527a2.47 2.47 0 0 0 .553-.77c.136-.292.203-.604.203-.938z
'
,
int
:
{
path
:
'
M15.141,15.512 L14.294,20 L13.051,20 C12.8309989,20 12.6403341,19.9120009 12.479,19.736 C12.3176659,19.5599991 12.237,19.343668 12.237,19.087 C12.237,19.0503332 12.2388333,19.0155002 12.2425,18.9825 C12.2461667,18.9494998 12.2516666,18.9146668 12.259,18.878 L12.908,15.512 L10.653,15.512 L10.015,19.01 C9.94899967,19.3620018 9.79866784,19.6149992 9.564,19.769 C9.32933216,19.9230008 9.06900143,20 8.783,20 L7.584,20 L8.42,15.512 L7.155,15.512 C6.92033216,15.512 6.74066729,15.4551672 6.616,15.3415 C6.49133271,15.2278328 6.429,15.0390013 6.429,14.775 C6.429,14.6723328 6.43999989,14.5550007 6.462,14.423 L6.605,13.554 L8.695,13.554 L9.267,10.518 L6.913,10.518 L7.122,9.385 C7.17333359,9.10633194 7.28699912,8.89916734 7.463,8.7635 C7.63900088,8.62783266 7.92499802,8.56 8.321,8.56 L9.542,8.56 L10.224,5.018 C10.282667,4.7246652 10.4183323,4.49733414 10.631,4.336 C10.8436677,4.17466586 11.0929986,4.094 11.379,4.094 L12.611,4.094 L11.775,8.56 L14.019,8.56 L14.866,4.094 L16.076,4.094 C16.3326679,4.094 16.5416659,4.1673326 16.703,4.314 C16.8643341,4.4606674 16.945,4.64766553 16.945,4.875 C16.945,4.9483337 16.9413334,5.00333315 16.934,5.04 L16.252,8.56 L18.485,8.56 L18.276,9.693 C18.2246664,9.97166806 18.1091676,10.1788327 17.9295,10.3145 C17.7498324,10.4501673 17.4656686,10.518 17.077,10.518 L15.977,10.518 L15.416,13.554 L16.978,13.554 C17.2126678,13.554 17.3904994,13.6108328 17.5115,13.7245 C17.6325006,13.8381672 17.693,14.0306653 17.693,14.302 C17.693,14.4046672 17.6820001,14.5219993 17.66,14.654 L17.528,15.512 L15.141,15.512 Z M10.928,13.554 L13.183,13.554 L13.744,10.518 L11.5,10.518 L10.928,13.554 Z
'
,
attrs
:
{
viewBox
:
'
0 0 24, 24
'
}
...
...
This diff is collapsed.
Click to expand it.
frontend/src/metabase/query_builder/components/CardHeader.jsx
+
22
−
8
View file @
adf8d62b
...
...
@@ -391,6 +391,9 @@ export default class CardHeader extends Component {
}
render
()
{
const
badgeItemStyle
=
"
text-uppercase flex align-center no-decoration text-bold
"
;
const
description
=
this
.
props
.
card
?
this
.
props
.
card
.
description
:
null
;
return
(
<
div
className
=
"relative"
>
<
HeaderBar
...
...
@@ -401,14 +404,25 @@ export default class CardHeader extends Component {
buttons
=
{
this
.
getHeaderButtons
()
}
setItemAttributeFn
=
{
this
.
props
.
onSetCardAttribute
}
badge
=
{
this
.
props
.
card
.
collection
&&
<
Link
to
=
{
Urls
.
collection
(
this
.
props
.
card
.
collection
)
}
className
=
"text-uppercase flex align-center no-decoration"
style
=
{
{
color
:
this
.
props
.
card
.
collection
.
color
,
fontSize
:
12
}
}
>
<
Icon
name
=
"collection"
size
=
{
12
}
style
=
{
{
marginRight
:
"
0.5em
"
}
}
/>
{
this
.
props
.
card
.
collection
.
name
}
</
Link
>
<
div
className
=
"flex"
>
<
Link
to
=
{
Urls
.
collection
(
this
.
props
.
card
.
collection
)
}
className
=
{
badgeItemStyle
}
style
=
{
{
color
:
this
.
props
.
card
.
collection
.
color
,
fontSize
:
12
}
}
>
<
Icon
name
=
"collection"
size
=
{
14
}
style
=
{
{
marginRight
:
"
0.5em
"
}
}
/>
{
this
.
props
.
card
.
collection
.
name
}
</
Link
>
{
description
&&
<
div
className
=
{
cx
(
"
ml2
"
,
badgeItemStyle
)
}
style
=
{
{
fontSize
:
12
}
}
>
<
Icon
name
=
"infooutlined"
size
=
{
14
}
style
=
{
{
marginRight
:
"
0.5em
"
}
}
/>
Details
</
div
>
}
</
div
>
}
/>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment