Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openbis
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sispub
openbis
Commits
708ec3be
Commit
708ec3be
authored
1 year ago
by
vkovtun
Browse files
Options
Downloads
Patches
Plain Diff
SSDM-13579: Made toggle button look nicer.
parent
bb989506
No related branches found
No related tags found
1 merge request
!40
SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ui-admin/src/js/components/database/data-browser/DataBrowser.jsx
+1
-1
1 addition, 1 deletion
...n/src/js/components/database/data-browser/DataBrowser.jsx
ui-admin/src/js/components/database/data-browser/Toolbar.jsx
+24
-24
24 additions, 24 deletions
ui-admin/src/js/components/database/data-browser/Toolbar.jsx
with
25 additions
and
25 deletions
ui-admin/src/js/components/database/data-browser/DataBrowser.jsx
+
1
−
1
View file @
708ec3be
...
...
@@ -48,7 +48,7 @@ const styles = theme => ({
},
content
:
{
flex
:
'
1 1 100%
'
,
height
:
'
calc(100vh -
'
+
theme
.
spacing
(
10
)
+
'
px)
'
,
height
:
0
,
overflowY
:
'
hidden
'
}
})
...
...
This diff is collapsed.
Click to expand it.
ui-admin/src/js/components/database/data-browser/Toolbar.jsx
+
24
−
24
View file @
708ec3be
...
...
@@ -28,6 +28,7 @@ import CreateNewFolderIcon from '@material-ui/icons/CreateNewFolderOutlined'
import
autoBind
from
'
auto-bind
'
import
{
ToggleButton
}
from
'
@material-ui/lab
'
import
Button
from
'
@material-ui/core/Button
'
import
IconButton
from
'
@material-ui/core/IconButton
'
const
color
=
'
secondary
'
...
...
@@ -37,15 +38,13 @@ const styles = (theme) => ({
display
:
'
flex
'
,
whiteSpace
:
'
nowrap
'
,
marginLeft
:
theme
.
spacing
(
1
),
marginBottom
:
theme
.
spacing
(
1
)
marginBottom
:
theme
.
spacing
(
1
),
marginRight
:
theme
.
spacing
(
1
)
},
buttons
:
{
flex
:
'
0 0 auto
'
,
display
:
'
flex
'
,
whiteSpace
:
'
nowrap
'
,
'
& button
'
:
{
marginRight
:
theme
.
spacing
(
1
)
}
},
leftSection
:
{
flexGrow
:
1
,
...
...
@@ -54,8 +53,10 @@ const styles = (theme) => ({
flexShrink
:
0
},
toggleButton
:
{
marginRight
:
theme
.
spacing
(
1
),
border
:
'
1px solid
'
+
theme
.
palette
[
color
].
main
+
'
80
'
,
border
:
'
none
'
,
borderRadius
:
'
50%
'
,
display
:
'
inline-flex
'
,
padding
:
theme
.
spacing
(
1.5
)
+
'
px
'
,
'
& *
'
:
{
color
:
theme
.
palette
[
color
].
main
}
...
...
@@ -72,14 +73,15 @@ class Toolbar extends React.Component {
render
()
{
const
{
viewType
,
onViewTypeChange
,
classes
,
showInfo
,
onShowInfoChange
}
=
this
.
props
const
size
=
'
small
'
const
buttonSize
=
'
small
'
const
iconButtonSize
=
'
medium
'
return
(
<
div
className
=
{
classes
.
toolbar
}
>
<
div
className
=
{
[
classes
.
buttons
,
classes
.
leftSection
].
join
(
'
'
)
}
>
<
Button
classes
=
{
{
root
:
classes
.
button
}
}
color
=
{
color
}
size
=
{
s
ize
}
size
=
{
buttonS
ize
}
variant
=
'outlined'
startIcon
=
{
<
CreateNewFolderIcon
/>
}
>
...
...
@@ -90,7 +92,7 @@ class Toolbar extends React.Component {
<
ToggleButton
classes
=
{
{
root
:
classes
.
toggleButton
}
}
color
=
{
color
}
size
=
{
s
ize
}
size
=
{
buttonS
ize
}
selected
=
{
showInfo
}
onChange
=
{
onShowInfoChange
}
value
=
{
messages
.
get
(
messages
.
INFO
)
}
...
...
@@ -98,52 +100,50 @@ class Toolbar extends React.Component {
>
<
InfoIcon
/>
</
ToggleButton
>
<
Button
<
Icon
Button
classes
=
{
{
root
:
classes
.
button
}
}
color
=
{
color
}
size
=
{
s
ize
}
size
=
{
iconButtonS
ize
}
variant
=
'outlined'
>
<
SearchIcon
/>
</
Button
>
</
Icon
Button
>
{
viewType
===
'
list
'
&&
(
<
Button
<
Icon
Button
classes
=
{
{
root
:
classes
.
button
}
}
color
=
{
color
}
size
=
{
s
ize
}
size
=
{
iconButtonS
ize
}
variant
=
'outlined'
onClick
=
{
()
=>
onViewTypeChange
(
'
grid
'
)
}
>
<
ViewComfyIcon
/>
</
Button
>
</
Icon
Button
>
)
}
{
viewType
===
'
grid
'
&&
(
<
Button
<
Icon
Button
classes
=
{
{
root
:
classes
.
button
}
}
color
=
{
color
}
size
=
{
s
ize
}
size
=
{
iconButtonS
ize
}
variant
=
'outlined'
onClick
=
{
()
=>
onViewTypeChange
(
'
list
'
)
}
>
<
ViewListIcon
/>
</
Button
>
</
Icon
Button
>
)
}
<
Button
<
Icon
Button
classes
=
{
{
root
:
classes
.
button
}
}
color
=
{
color
}
size
=
{
s
ize
}
size
=
{
iconButtonS
ize
}
variant
=
'outlined'
onClick
=
{
()
=>
onViewTypeChange
(
'
list
'
)
}
>
<
SettingsIcon
/>
</
Button
>
</
Icon
Button
>
<
Button
classes
=
{
{
root
:
classes
.
button
}
}
color
=
{
color
}
size
=
{
s
ize
}
size
=
{
buttonS
ize
}
variant
=
'contained'
startIcon
=
{
<
PublishIcon
/>
}
onClick
=
{
()
=>
onViewTypeChange
(
'
list
'
)
}
>
{
messages
.
get
(
messages
.
UPLOAD
)
}
</
Button
>
...
...
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