mirror of
https://gitlab.silvrtree.co.uk/martind2000/nci.git
synced 2025-02-10 18:29:16 +00:00
fix sorting issue and header overflow
This commit is contained in:
parent
66362b2a08
commit
94d57445b3
@ -16,9 +16,8 @@ module.exports = function(app) {
|
||||
if (data.projectName) {
|
||||
start.projectName = data.projectName;
|
||||
}
|
||||
if (data.descCreateDate) {
|
||||
start.descCreateDate = data.descCreateDate;
|
||||
}
|
||||
|
||||
start.descCreateDate = data.descCreateDate || '';
|
||||
|
||||
var findParams = _(data).pick('offset', 'limit');
|
||||
findParams.start = start;
|
||||
|
@ -3,6 +3,7 @@
|
||||
width: 300px;
|
||||
color: white;
|
||||
cursor: pointer;
|
||||
|
||||
&_preview {
|
||||
color: rgba(255, 255, 255, 0.5);
|
||||
padding: 5px 25px 5px 5px;
|
||||
@ -38,7 +39,7 @@
|
||||
|
||||
&_link {
|
||||
float: left;
|
||||
display: block;
|
||||
width: 90%;
|
||||
color: white;
|
||||
text-decoration: none;
|
||||
&:hover {
|
||||
@ -48,7 +49,9 @@
|
||||
}
|
||||
&_run {
|
||||
float: right;
|
||||
width: 10%;
|
||||
color: rgba(255, 255, 255, 0.5);
|
||||
text-align: right;
|
||||
&:hover {
|
||||
color: white;
|
||||
text-decoration: none;
|
||||
|
@ -3,5 +3,7 @@
|
||||
.navbar-header
|
||||
Link.navbar-brand(to="dashboard")
|
||||
span NCI
|
||||
.navbar-left.navbar-form(style={paddingTop: "11px"})
|
||||
ProjectsSelector()
|
||||
|
||||
.collapse.navbar-collapse
|
||||
.navbar-form.navbar-left(style={paddingTop: "11px"})
|
||||
ProjectsSelector()
|
||||
|
@ -4,7 +4,8 @@ define([
|
||||
'react',
|
||||
'react-router',
|
||||
'app/components/projects/selector/index',
|
||||
'templates/app/components/header/index'
|
||||
'templates/app/components/header/index',
|
||||
'bootstrap/collapse'
|
||||
], function(React, Router, ProjectsSelector, template) {
|
||||
template = template.locals({
|
||||
Link: Router.Link,
|
||||
|
@ -10,6 +10,10 @@ require.config({
|
||||
_dataio: '/data.io',
|
||||
socketio: '/socket.io/socket.io.js',
|
||||
jquery: 'libs/jquery/jquery',
|
||||
ansi_up: 'libs/ansi_up/ansi_up'
|
||||
ansi_up: 'libs/ansi_up/ansi_up',
|
||||
'bootstrap/collapse': 'libs/bootstrap/js/collapse'
|
||||
},
|
||||
shim: {
|
||||
'bootstrap/collapse': ['jquery']
|
||||
}
|
||||
});
|
||||
|
Loading…
Reference in New Issue
Block a user