martin/nci
1
0
Fork 0
mirror of https://gitlab.silvrtree.co.uk/martind2000/nci.git synced 2025-02-11 14:49:15 +00:00
Code Issues Projects Releases Wiki Activity

fix sorting issue and header overflow

Browse Source
This commit is contained in:
Vladimir Polyakov 2015-07-11 21:09:28 +03:00
parent 66362b2a08
commit 94d57445b3
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/builds.js
View File

@ -16,9 +16,8 @@ module.exports = function(app) {
if (data.projectName) { if (data.projectName) {
start.projectName = data.projectName; start.projectName = data.projectName;
} }
if (data.descCreateDate) {
start.descCreateDate = data.descCreateDate; start.descCreateDate = data.descCreateDate || '';
}
var findParams = _(data).pick('offset', 'limit'); var findParams = _(data).pick('offset', 'limit');
findParams.start = start; findParams.start = start;

5
static/css/sources/components/projects.less
View File

@ -3,6 +3,7 @@
width: 300px; width: 300px;
color: white; color: white;
cursor: pointer; cursor: pointer;
&_preview { &_preview {
color: rgba(255, 255, 255, 0.5); color: rgba(255, 255, 255, 0.5);
padding: 5px 25px 5px 5px; padding: 5px 25px 5px 5px;
@ -38,7 +39,7 @@
&_link { &_link {
float: left; float: left;
display: block; width: 90%;
color: white; color: white;
text-decoration: none; text-decoration: none;
&:hover { &:hover {
@ -48,7 +49,9 @@
} }
&_run { &_run {
float: right; float: right;
width: 10%;
color: rgba(255, 255, 255, 0.5); color: rgba(255, 255, 255, 0.5);
text-align: right;
&:hover { &:hover {
color: white; color: white;
text-decoration: none; text-decoration: none;

6
static/js/app/components/header/index.jade
View File

@ -3,5 +3,7 @@
.navbar-header .navbar-header
Link.navbar-brand(to="dashboard") Link.navbar-brand(to="dashboard")
span NCI span NCI
.navbar-left.navbar-form(style={paddingTop: "11px"})
ProjectsSelector() .collapse.navbar-collapse
.navbar-form.navbar-left(style={paddingTop: "11px"})
ProjectsSelector()

3
static/js/app/components/header/index.js
View File

@ -4,7 +4,8 @@ define([
'react', 'react',
'react-router', 'react-router',
'app/components/projects/selector/index', 'app/components/projects/selector/index',
'templates/app/components/header/index' 'templates/app/components/header/index',
'bootstrap/collapse'
], function(React, Router, ProjectsSelector, template) { ], function(React, Router, ProjectsSelector, template) {
template = template.locals({ template = template.locals({
Link: Router.Link, Link: Router.Link,

6
static/js/main.js
View File

@ -10,6 +10,10 @@ require.config({
_dataio: '/data.io', _dataio: '/data.io',
socketio: '/socket.io/socket.io.js', socketio: '/socket.io/socket.io.js',
jquery: 'libs/jquery/jquery', 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']
} }
}); });