Skip to content

Commit ffad66a

Browse files
committed
Chevron position fix
1 parent 06e1cad commit ffad66a

File tree

7 files changed

+35
-34
lines changed

7 files changed

+35
-34
lines changed

htdocs/bootstrap/css/custom-css.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -760,6 +760,16 @@ a.btn.btn-primary:hover:not(.download, .split-nav) {
760760
box-shadow: 2px 3px 4px 1px rgba(0,0,0,0.175);
761761
}
762762

763+
.panel-heading {
764+
display: flex;
765+
align-items: center;
766+
}
767+
768+
.panel-title {
769+
width: 100%;
770+
padding-right: 10px;
771+
}
772+
763773
.panel-default {
764774
border-color: #C3D5DB;
765775
}

jsx/Panel.js

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import PropTypes from 'prop-types';
66
*
77
* @author Alex I.
88
* @version 2.0.0
9-
*
109
* @param {object} props
1110
* @return {JSX.Element}
1211
*/
@@ -64,18 +63,16 @@ const Panel = (props) => {
6463
);
6564
}
6665
panelViews = (
67-
<div className='pull-right'>
68-
<div className='btn-group views'>
69-
<button type='button'
70-
className='btn btn-default btn-xs dropdown-toggle'
71-
data-toggle='dropdown'>
72-
Views<span className='caret'/>
73-
</button>
74-
<ul className='dropdown-menu pull-right'
75-
role='menu'>
76-
{views}
77-
</ul>
78-
</div>
66+
<div className='btn-group views'>
67+
<button type='button'
68+
className='btn btn-default btn-xs dropdown-toggle'
69+
data-toggle='dropdown'>
70+
Views<span className='caret'/>
71+
</button>
72+
<ul className='dropdown-menu pull-right'
73+
role='menu'>
74+
{views}
75+
</ul>
7976
</div>
8077
);
8178
}
@@ -92,16 +89,16 @@ const Panel = (props) => {
9289
? props.views[activeView]['title']
9390
: props.title}
9491
</h3>
92+
{panelViews}
9593
{props.collapsing
9694
? <span className={collapsed ?
97-
'glyphicon pull-right glyphicon-chevron-down' :
98-
'glyphicon pull-right glyphicon-chevron-up'}
95+
'glyphicon glyphicon-chevron-down' :
96+
'glyphicon glyphicon-chevron-up'}
9997
onClick={toggleCollapsed}
10098
data-toggle='collapse'
10199
data-target={`#${props.id}`}
102100
style={{cursor: 'pointer'}}/>
103101
: null}
104-
{panelViews}
105102
</div>
106103
) : '';
107104

@@ -130,6 +127,7 @@ const Panel = (props) => {
130127
};
131128
Panel.propTypes = {
132129
initCollapsed: PropTypes.bool,
130+
props.collapsed: PropTypes.bool,
133131
parentId: PropTypes.string,
134132
id: PropTypes.string,
135133
height: PropTypes.string,

modules/dashboard/css/dashboard.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151

5252
.views {
5353
margin-right: 10px;
54-
margin-top: -10px;
5554
}
5655

5756
.welcome {

modules/dashboard/templates/panel.tpl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
{if $title}
33
<div class="panel-heading">
44
<h3 class="panel-title">{$title}</h3>
5-
<span class="pull-right clickable glyphicon glyphicon-chevron-up"></span>
65
{if !empty($menus)}
7-
<div class="pull-right">
86
<div class="btn-group views">
97
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">Views<span class="caret"></span></button>
108
<ul class="dropdown-menu pull-right" role="menu">
@@ -13,8 +11,8 @@
1311
{/foreach}
1412
</ul>
1513
</div>
16-
</div>
1714
{/if}
15+
<span class="clickable glyphicon glyphicon-chevron-up"></span>
1816
</div>
1917
{/if}
2018
<div class="panel-body">

modules/imaging_browser/css/imaging_browser.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ h3 {
7575

7676
.views {
7777
margin-right: 10px;
78-
margin-top: -2px;
7978
}
8079

8180
.mri-second-row-panel {

modules/imaging_browser/jsx/ImagePanel.js

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,15 @@ class ImagePanelHeader extends Component {
5959
</span>;
6060
}
6161
let headerButton = (
62-
<div className="pull-right">
63-
<div className="btn-group views">
64-
<button
65-
type="button"
66-
className="btn btn-default btn-xs dropdown-toggle"
67-
onClick={this.props.onToggleHeaders}
68-
aria-expanded={this.props.HeadersExpanded}>
69-
Header Info
70-
</button>
71-
<span className="caret"></span>
72-
</div>
62+
<div className="btn-group views">
63+
<button
64+
type="button"
65+
className="btn btn-default btn-xs dropdown-toggle"
66+
onClick={this.props.onToggleHeaders}
67+
aria-expanded={this.props.HeadersExpanded}>
68+
Header Info
69+
</button>
70+
<span className="caret"></span>
7371
</div>
7472
);
7573
return (
@@ -84,8 +82,8 @@ class ImagePanelHeader extends Component {
8482
{this.props.Filename}
8583
</h3>
8684
{QCStatusLabel}
87-
{arrow}
8885
{headerButton}
86+
{arrow}
8987
</div>
9088
);
9189
}

modules/issue_tracker/css/issue_tracker.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ h3 {
5454

5555
.views {
5656
margin-right: 10px;
57-
margin-top: -2px;
5857
}
5958

6059
.btn-volume-viewer {

0 commit comments

Comments
 (0)