Skip to content

Commit 19405ec

Browse files
committed
[spalenque] - #13221 * fix styles for track and level view in schedule
1 parent 7d33ccd commit 19405ec

2 files changed

Lines changed: 43 additions & 14 deletions

File tree

summit/css/schedule-grid.css

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -278,22 +278,32 @@ i.collapse-nav {
278278
}
279279

280280
.view-select-container #view-select {
281-
background-color: #edf2f7;
281+
background-color: #fff;
282282
margin-left: 10px;
283283
border-radius: 5px;
284284
height: 30px;
285-
width: 55px;
286285
cursor: pointer;
286+
border: 1px solid #d6d5d5;
287+
color: #808080;
288+
}
287289

290+
.track-nav-container #track-select {
291+
background-color: #fff;
292+
border-radius: 5px;
293+
height: 30px;
294+
cursor: pointer;
295+
border: 1px solid #d6d5d5;
296+
color: #808080;
297+
width: 95%;
288298
}
289299

290300
@media (max-width: 767px) {
291301
.view-select-container {
292-
width: 50%;
302+
width: 45%;
293303
float: left;
294304
}
295305
.view-days-container {
296-
width: 50%;
306+
width: 55%;
297307
float: left;
298308
padding-right: 5px;
299309
}
@@ -308,7 +318,7 @@ i.collapse-nav {
308318
}
309319

310320
.track-nav-container {
311-
padding: 15px;
321+
padding: 10px 0 0 0;
312322
}
313323

314324
@media all and (min-width: 1400px) {
@@ -374,7 +384,9 @@ i.collapse-nav {
374384
a.navbar-brand.navbar-brand-month
375385
{
376386
font-size: 11pt !important;
377-
color: #2A4E68 !important
387+
color: #2A4E68 !important;
388+
float: right;
389+
margin-right: 15px;
378390
}
379391

380392
.navbar-default .navbar-nav > .active.day-selected

summit/ui/source/js/components/schedule/main-view.js

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class MainView extends Component {
1313
return (
1414
<div className="row navbar-container">
1515
<div className="col-md-3 col-sm-3 view-select-container">
16-
View by
16+
Filter
1717
<select id="view-select" value={view.type}
1818
onChange={e => this.changeView(e, e.target.value)}>
1919
<option value={VIEW_DAYS}>Day</option>
@@ -100,19 +100,36 @@ class MainView extends Component {
100100
} = this.props
101101
return (
102102
<nav className="navbar navbar-default navbar-days">
103-
<div className="container">
103+
<div>
104+
{/* Brand and toggle get grouped for better mobile display */}
105+
<div className="navbar-header">
106+
<button type="button" aria-expanded="false" data-toggle="collapse"
107+
className="navbar-toggle collapsed" data-target="#bs-example-navbar-collapse-1">
108+
<span className="sr-only">
109+
Toggle navigation
110+
</span>
111+
<span className="icon-bar"></span>
112+
<span className="icon-bar"></span>
113+
<span className="icon-bar"></span>
114+
</button>
115+
<a href="#" onClick={e => e.preventDefault()}
116+
className="navbar-brand navbar-brand-month">
117+
Levels
118+
</a>
119+
</div>
120+
{/* Collect the nav links, forms, and other content for toggling */}
104121
<div className="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
105122
<ul className="nav navbar-nav">
106123
{Object.keys(summit.presentation_levels).map(levelId => {
107124
const level = summit.presentation_levels[levelId]
108125
const classes = levelId.toLowerCase() === view.value ? 'active level-selected' : null
109126
return (
110-
<li key={levelId} className={classes}>
111-
<a onClick={e => this.changeView(e, view.type, levelId.toLowerCase())}
112-
href="#" className="level-label">
113-
{level.level}
114-
</a>
115-
</li>
127+
<li key={levelId} className={classes}>
128+
<a onClick={e => this.changeView(e, view.type, levelId.toLowerCase())}
129+
href="#" className="level-label">
130+
{level.level}
131+
</a>
132+
</li>
116133
)})}
117134
</ul>
118135
</div>

0 commit comments

Comments
 (0)