diff --git a/gulpfile.js b/gulpfile.js index 80b57550..3e7f9c1e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -94,7 +94,7 @@ gulp.task('sass:build', function () { }); gulp.task('sass:watch', function () { - gulp.watch('./sass/**/*.scss', ['sass']); + gulp.watch('./sass/**/*.scss', ['sass:build']); }); gulp.task('copy', function () { diff --git a/index.html b/index.html index 852f9027..6c7681c4 100644 --- a/index.html +++ b/index.html @@ -7,6 +7,7 @@ +
diff --git a/js/components/ascribe_buttons/delete_button.js b/js/components/ascribe_buttons/delete_button.js index 0d37a236..e52ff119 100644 --- a/js/components/ascribe_buttons/delete_button.js +++ b/js/components/ascribe_buttons/delete_button.js @@ -45,7 +45,7 @@ let DeleteButton = React.createClass({ } else if (availableAcls.indexOf('del_from_collection') > -1){ content = ; - btnDelete = ; + btnDelete = ; } else{ return
; diff --git a/js/components/ascribe_table/table_item_checkbox.js b/js/components/ascribe_table/table_item_checkbox.js index 131f7427..cb368369 100644 --- a/js/components/ascribe_table/table_item_checkbox.js +++ b/js/components/ascribe_table/table_item_checkbox.js @@ -17,7 +17,9 @@ let TableItemCheckbox = React.createClass({ render() { return ( - + + + ); } }); diff --git a/js/constants/application_constants.js b/js/constants/application_constants.js index 81eadc26..7b23a41f 100644 --- a/js/constants/application_constants.js +++ b/js/constants/application_constants.js @@ -1,8 +1,8 @@ 'use strict'; let constants = { - 'baseUrl': 'http://localhost:8000/api/', - //'baseUrl': 'http://staging.ascribe.io/api/', + //'baseUrl': 'http://localhost:8000/api/', + 'baseUrl': 'http://staging.ascribe.io/api/', 'debugCredentialBase64': 'ZGltaUBtYWlsaW5hdG9yLmNvbTowMDAwMDAwMDAw', // dimi@mailinator:0000000000 'aclList': ['edit', 'consign', 'consign_request', 'unconsign', 'unconsign_request', 'transfer', 'loan', 'loan_request', 'share', 'download', 'view', 'delete', 'del_from_collection', 'add_to_collection'] diff --git a/sass/main.scss b/sass/main.scss index 877c594c..587884eb 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -46,6 +46,12 @@ margin-bottom:0; } +/*This is aligning the first checkbox in pieclist detail with all the other ones*/ +.table > thead:first-child > tr:first-child > th { + padding-left:0; +} + + .ascribe-table-header-column > span { display: table-cell; vertical-align: middle;