Skip to content

Commit

Permalink
SR-71 #comment Update Toolbar
Browse files Browse the repository at this point in the history
  • Loading branch information
@brenopolanski
brenopolanski committed Feb 12, 2016
1 parent abe0e61 commit 98caca6
Show file tree
Hide file tree
Showing 8 changed files with 191 additions and 183 deletions.
13 changes: 7 additions & 6 deletions src/main/resources/dist/saiku/saiku.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -804,9 +804,10 @@ a.waves-effect .waves-ripple {
background: #fff;
box-shadow: 0 1px 1px rgba(0,0,0,.1);
}
body.fixed-left .side-menu.left {
.fixed-left .side-menu.left {
position: fixed;
bottom: 50px;
left: 0;
height: 100%;
margin-top: 0;
margin-bottom: -70px;
Expand All @@ -815,11 +816,6 @@ body.fixed-left .side-menu.left {
.sidebar-inner {
height: 100%;
}
.sidebar-menu {
width: 100%;
padding-top: 30px;
padding-bottom: 30px;
}
.sidebar-menu,
.sidebar-menu ul,
.sidebar-menu li,
Expand All @@ -833,6 +829,11 @@ body.fixed-left .side-menu.left {
border: 0;
text-decoration: none;
}
.sidebar-menu {
width: 100%;
padding-top: 30px;
padding-bottom: 30px;
}
.sidebar-menu a {
line-height: 1.3;
}
Expand Down
212 changes: 108 additions & 104 deletions src/main/resources/dist/saiku/saiku.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/main/resources/dist/saiku/saiku.js.map
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/main/resources/dist/saiku/saiku.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/main/resources/dist/saiku/saiku.min.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/main/resources/src/js/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import '../../dist/saiku/saiku.css';

var routes = (
<Router history={createHistory()}>
<Route path="/" component={Workspace} />
<Route path="/" component={Login} />
<Route path="/workspace/" component={Workspace} />
<Route path="*" component={NotFound} />
</Router>
Expand Down
122 changes: 62 additions & 60 deletions src/main/resources/src/js/components/saiku/Toolbar.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,68 +21,70 @@ import Icon from './Icon';
class Toolbar extends React.Component {
render() {
return (
<div className="side-menu left">
<div className="sidebar-inner slimscrollleft">
<div className="sidebar-menu">
<ul>
<li>
<a href="#" className="waves-effect waves-light">
<Icon name="home" />
<span> Home </span>
</a>
</li>
<li>
<a href="#" className="waves-effect waves-light">
<Icon name="plus-square" />
<span> New Query </span>
</a>
</li>
<li>
<a href="#" className="waves-effect waves-light">
<Icon name="folder-open-o" />
<span> Open Query </span>
</a>
</li>
<li>
<a href="#" className="waves-effect waves-light">
<Icon name="file-text-o" />
<span> Reporting </span>
</a>
</li>
<li>
<a href="#" className="waves-effect waves-light">
<Icon name="dashboard" />
<span> Dashboard </span>
</a>
</li>
<li>
<a href="#" className="waves-effect waves-light">
<Icon name="cube" />
<span> Schema Designer </span>
</a>
</li>
<li>
<a href="#" className="waves-effect waves-light">
<Icon name="globe" />
<span> Translate </span>
</a>
</li>
<li>
<a href="#" className="waves-effect waves-light">
<Icon name="gear" />
<span> Admin Console </span>
</a>
</li>
<li>
<a href="#" className="waves-effect waves-light">
<Icon name="bug" />
<span> Send a bug </span>
</a>
</li>
</ul>
<div className="fixed-left">
<div className="side-menu left">
<div className="sidebar-inner slimscrollleft">
<div className="sidebar-menu">
<ul>
<li>
<a href="#" className="waves-effect waves-light">
<Icon name="home" />
<span> Home </span>
</a>
</li>
<li>
<a href="#" className="waves-effect waves-light">
<Icon name="plus-square" />
<span> New Query </span>
</a>
</li>
<li>
<a href="#" className="waves-effect waves-light">
<Icon name="folder-open-o" />
<span> Open Query </span>
</a>
</li>
<li>
<a href="#" className="waves-effect waves-light">
<Icon name="file-text-o" />
<span> Reporting </span>
</a>
</li>
<li>
<a href="#" className="waves-effect waves-light">
<Icon name="dashboard" />
<span> Dashboard </span>
</a>
</li>
<li>
<a href="#" className="waves-effect waves-light">
<Icon name="cube" />
<span> Schema Designer </span>
</a>
</li>
<li>
<a href="#" className="waves-effect waves-light">
<Icon name="globe" />
<span> Translate </span>
</a>
</li>
<li>
<a href="#" className="waves-effect waves-light">
<Icon name="gear" />
<span> Admin Console </span>
</a>
</li>
<li>
<a href="#" className="waves-effect waves-light">
<Icon name="bug" />
<span> Send a bug </span>
</a>
</li>
</ul>
<Clearfix />
</div>
<Clearfix />
</div>
<Clearfix />
</div>
</div>
);
Expand Down
13 changes: 7 additions & 6 deletions src/main/resources/src/styl/_toolbar.styl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,19 @@
background $white
box-shadow 0 1px 1px rgba(0, 0, 0, 0.1)

body.fixed-left
.fixed-left
.side-menu
&.left
position fixed
bottom 50px
left 0
height 100%
margin-top 0
margin-bottom -70px
padding-bottom 70px

.sidebar-inner
height 100%

.sidebar-menu
padding-top 30px
padding-bottom 30px
width 100%

// TODO: Refactor `.sidebar-menu`
.sidebar-menu
Expand All @@ -61,6 +57,11 @@ body.fixed-left
border 0
text-decoration none

.sidebar-menu
padding-top 30px
padding-bottom 30px
width 100%

.sidebar-menu
a
line-height 1.3
Expand Down

0 comments on commit 98caca6

Please sign in to comment.