Skip to content

Commit 672b5bd

Browse files
puthreputhre
committed
fix for #78, fixed css imports and changed colors a bit
1 parent f180ad6 commit 672b5bd

File tree

13 files changed

+105
-15
lines changed

13 files changed

+105
-15
lines changed

‎css/style.css‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,4 +457,48 @@ td.ε_row {
457457
.ui-widget-header {
458458
background: var(--color-background-dark);
459459
color: var(--color-text-lighter);
460+
}
461+
.select2-search { background-color: var(--color-main-background); color: var(--color-text-darker)}
462+
.select2-search input { background-color: var(--color-main-background); color: var(--color-text-darker)}
463+
.select2-results { background-color: var(--color-main-background); color: var(--color-text-darker)}
464+
.select2-selection { background-color: var(--color-main-background); color: var(--color-text-darker)}
465+
.select2-container--default .select2-selection--single {
466+
background-color: var(--color-main-background);
467+
color: var(--color-text-darker)
468+
}
469+
.select2-container--default .select2-selection--single .select2-selection__rendered{
470+
line-height: 26px;
471+
background-color: var(--color-main-background);
472+
color: var(--color-text-darker)
473+
}
474+
475+
.select2-container--default .select2-selection--single .select2-selection__placeholder{
476+
background-color: var(--color-main-background);
477+
color: var(--color-text-lighter)
478+
}
479+
.select2-container--default .select2-selection--multiple .select2-selection__choice {
480+
background-color: var(--color-main-background);
481+
color: var(--color-text-lighter);
482+
}
483+
.select2-container--default .select2-selection--multiple {
484+
background-color: var(--color-main-background);
485+
}
486+
.select2-container--default.select2-container--focus .select2-selection--multiple {
487+
border: solid var(--color-text-lighter) 1px;
488+
}
489+
490+
#report-range{
491+
/*var(--color-background-dark);*/
492+
493+
}
494+
.select2-dropdown {
495+
background-color: var(--color-background-dark);
496+
}
497+
.ui-button{
498+
background-color: var(--color-main-background);
499+
color: var(--color-text-normal);
500+
}
501+
.ui-widget-content {
502+
background-color: var(--color-main-background);
503+
color: var(--color-text-normal);
460504
}

‎js/src/clients.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ var $ = require("jquery");
33
require("jquery-migrate");
44
// var moment = require("moment");
55
require("jqueryui");
6-
require("jqueryui/jquery-ui.css");
6+
//require("jqueryui/jquery-ui.css");
77
import Tabulator from 'tabulator-tables';
88
require('tabulator-tables/dist/css/tabulator.css');
9-
9+
require('../../css/style.css');
1010
//require('tabulator-tables/dist/js/jquery_wrapper.js');
1111
// import 'select2/dist/js/select2.full.js'
1212
// require('select2/dist/css/select2.css');

‎js/src/dashboard.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ var $ = require("jquery");
22
require("jquery-migrate");
33
// var moment = require("moment");
44
require("jqueryui");
5-
require("jqueryui/jquery-ui.css");
5+
//require("jqueryui/jquery-ui.css");
6+
require('../../css/style.css');
67
var Chart = require("chart.js");
78
(function() {
89
$.ajaxSetup({

‎js/src/projects.js‎

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@ var $ = require("jquery");
22
require("jquery-migrate");
33
// var moment = require("moment");
44
require("jqueryui");
5-
require("jqueryui/jquery-ui.css");
5+
//require("jqueryui/jquery-ui.css");
66
import Tabulator from 'tabulator-tables';
77
require('tabulator-tables/dist/css/tabulator.css');
88
import 'select2/dist/js/select2.full.js'
99
require('select2/dist/css/select2.css');
10+
require('../../css/style.css');
11+
//require("piklor.js");
12+
/*var Piklor = require('./piklor.js');
13+
require('../../css/piklor.css');*/
1014

1115
(function() {
1216

@@ -24,7 +28,44 @@ require('select2/dist/css/select2.css');
2428
autoOpen: false,
2529
modal: true
2630
});
31+
/* debugger;
32+
var pk = new Piklor.Piklor(".color-picker", [
33+
"#1abc9c"
34+
, "#2ecc71"
35+
, "#3498db"
36+
, "#9b59b6"
37+
, "#34495e"
38+
, "#16a085"
39+
, "#27ae60"
40+
, "#2980b9"
41+
, "#8e44ad"
42+
, "#2c3e50"
43+
, "#f1c40f"
44+
, "#e67e22"
45+
, "#e74c3c"
46+
, "#ecf0f1"
47+
, "#95a5a6"
48+
, "#f39c12"
49+
, "#d35400"
50+
, "#c0392b"
51+
, "#bdc3c7"
52+
, "#7f8c8d"
53+
], {
54+
open: ".picker-wrapper .btn"
55+
})
56+
, wrapperEl = pk.getElm(".picker-wrapper")
57+
, header = pk.getElm("header")
58+
, footer = pk.getElm("footer")
59+
;
60+
pk.colorChosen(function (col) {
61+
wrapperEl.style.backgroundColor = col;
62+
header.style.backgroundColor = col;
63+
footer.style.backgroundColor = col;
64+
});*/
65+
66+
2767
// OC.currentUser
68+
2869
$("#client-select").select2({
2970
width: '200px',
3071
placeholder: 'Select client...',

‎js/src/reports.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ var $ = require("jquery");
22
require("jquery-migrate");
33
// var moment = require("moment");
44
require("jqueryui");
5-
require("jqueryui/jquery-ui.css");
5+
//require("jqueryui/jquery-ui.css");
66
require("daterangepicker");
77
import Tabulator from 'tabulator-tables';
88
require('tabulator-tables/dist/css/tabulator.css');
99
require('daterangepicker/daterangepicker.css');
1010
import 'select2/dist/js/select2.full.js'
1111
require('select2/dist/css/select2.css');
12+
require('../../css/style.css');
1213

1314
(function() {
1415
$.ajaxSetup({

‎js/src/tags.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ var $ = require("jquery");
22
require("jquery-migrate");
33
// var moment = require("moment");
44
require("jqueryui");
5-
require("jqueryui/jquery-ui.css");
5+
//require("jqueryui/jquery-ui.css");
66
import Tabulator from 'tabulator-tables';
77
require('tabulator-tables/dist/css/tabulator.css');
8-
8+
require('../../css/style.css');
99
(function() {
1010
$.ajaxSetup({
1111
headers: { 'RequestToken': OC.requestToken }

‎js/src/timelines-admin.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ var $ = require("jquery");
22
require("jquery-migrate");
33
// var moment = require("moment");
44
require("jqueryui");
5-
require("jqueryui/jquery-ui.css");
5+
//require("jqueryui/jquery-ui.css");
66
import Tabulator from 'tabulator-tables';
77
require('tabulator-tables/dist/css/tabulator.css');
88
import 'select2/dist/js/select2.full.js'
99
require('select2/dist/css/select2.css');
10+
require('../../css/style.css');
1011

1112
(function() {
1213

‎js/src/timelines.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ var $ = require("jquery");
22
require("jquery-migrate");
33
// var moment = require("moment");
44
require("jqueryui");
5-
require("jqueryui/jquery-ui.css");
5+
//require("jqueryui/jquery-ui.css");
66
import Tabulator from 'tabulator-tables';
77
require('tabulator-tables/dist/css/tabulator.css');
88
require("daterangepicker");
99
require('daterangepicker/daterangepicker.css');
1010
import 'select2/dist/js/select2.full.js'
1111
require('select2/dist/css/select2.css');
12+
require('../../css/style.css');
1213

1314
(function() {
1415
$.ajaxSetup({

‎js/src/timer.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ require("jquery-migrate");
33
require("daterangepicker");
44
var moment = require("moment");
55
require("jqueryui");
6-
require("jqueryui/jquery-ui.css");
6+
//require("jqueryui/jquery-ui.css");
77
//import 'select2/dist/js/select2.full.js'
88
import 'select2/dist/js/select2.js'
99
require('select2/dist/css/select2.css');
1010
require('daterangepicker/daterangepicker.css');
11+
require('../../css/style.css');
1112

1213

1314
(
@@ -126,7 +127,7 @@ function() {
126127

127128
var jqxhr = $.post( baseUrl,
128129
{
129-
start:picker.data('daterangepicker').startDate.format('DD/MM/YY HH:mm'),
130+
start:picker.data('daterangepicker').startDate.format('DD/MM/YY HH:mm'),
130131
end:picker.data('daterangepicker').endDate.format('DD/MM/YY HH:mm'),
131132
tzoffset: new Date().getTimezoneOffset(),
132133
async: true,

‎js/webpack.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module.exports = {
2727
use: ['style-loader', 'css-loader'],
2828
},
2929
{
30-
test: /\.(jpg|png)$/,
30+
test: /\.(jpg|png|jpeg|svg)$/,
3131
loader: 'file-loader'
3232
},
3333
]

0 commit comments

Comments
 (0)