Skip to content

Commit

Permalink
misc style changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@metagrover
metagrover committed Feb 5, 2017
1 parent bd2c391 commit 03d5824
Show file tree
Hide file tree
Showing 4 changed files with 81 additions and 61 deletions.
108 changes: 60 additions & 48 deletions app/assets/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,12 +291,6 @@ a {
color: red;
border-color: rgba(255, 0, 0, 0.24); }

.rbc-red .rbc.rbc-rangeslider .rc-slider-track {
background: red; }

.rbc-red .rbc.rbc-rangeslider .rc-slider-handle {
border-color: red; }

.rbc-red .rbc.rbc-resultlist .rbc-json-print span:hover {
color: red; }

Expand Down Expand Up @@ -327,8 +321,16 @@ a {
background-color: #f5f5f5; }
.rbc-red .rbc .rbc-search-icon {
color: red; }
.rbc-red .rbc .primary-title {
color: red; }
.rbc-red .rbc .rc-slider .rc-slider-track {
background: red; }
.rbc-red .rbc .rc-slider .rc-slider-handle {
border-color: red; }
.rbc-red .rbc .rc-slider .rc-slider-dot {
background-color: #e9e9e9;
border-color: #e9e9e9; }
.rbc-red .rbc .rc-slider .rc-slider-dot-active {
border-color: red;
background-color: red; }
.rbc-red .rbc label,
.rbc-red .rbc [type="checkbox"] + label:before, .rbc-red .rbc [type="checkbox"]:not(.filled-in) + label:after,
.rbc-red .rbc [type="radio"]:not(:checked) + label:before, .rbc-red .rbc [type="radio"]:not(:checked) + label:after {
Expand Down Expand Up @@ -439,12 +441,6 @@ a {
color: orange;
border-color: rgba(255, 165, 0, 0.24); }

.rbc-orange .rbc.rbc-rangeslider .rc-slider-track {
background: orange; }

.rbc-orange .rbc.rbc-rangeslider .rc-slider-handle {
border-color: orange; }

.rbc-orange .rbc.rbc-resultlist .rbc-json-print span:hover {
color: orange; }

Expand Down Expand Up @@ -475,8 +471,16 @@ a {
background-color: #f5f5f5; }
.rbc-orange .rbc .rbc-search-icon {
color: orange; }
.rbc-orange .rbc .primary-title {
color: orange; }
.rbc-orange .rbc .rc-slider .rc-slider-track {
background: orange; }
.rbc-orange .rbc .rc-slider .rc-slider-handle {
border-color: orange; }
.rbc-orange .rbc .rc-slider .rc-slider-dot {
background-color: #e9e9e9;
border-color: #e9e9e9; }
.rbc-orange .rbc .rc-slider .rc-slider-dot-active {
border-color: orange;
background-color: orange; }
.rbc-orange .rbc label,
.rbc-orange .rbc [type="checkbox"] + label:before, .rbc-orange .rbc [type="checkbox"]:not(.filled-in) + label:after,
.rbc-orange .rbc [type="radio"]:not(:checked) + label:before, .rbc-orange .rbc [type="radio"]:not(:checked) + label:after {
Expand Down Expand Up @@ -587,12 +591,6 @@ a {
color: yellow;
border-color: rgba(255, 255, 0, 0.24); }

.rbc-yellow .rbc.rbc-rangeslider .rc-slider-track {
background: yellow; }

.rbc-yellow .rbc.rbc-rangeslider .rc-slider-handle {
border-color: yellow; }

.rbc-yellow .rbc.rbc-resultlist .rbc-json-print span:hover {
color: yellow; }

Expand Down Expand Up @@ -623,8 +621,16 @@ a {
background-color: #f5f5f5; }
.rbc-yellow .rbc .rbc-search-icon {
color: yellow; }
.rbc-yellow .rbc .primary-title {
color: yellow; }
.rbc-yellow .rbc .rc-slider .rc-slider-track {
background: yellow; }
.rbc-yellow .rbc .rc-slider .rc-slider-handle {
border-color: yellow; }
.rbc-yellow .rbc .rc-slider .rc-slider-dot {
background-color: #e9e9e9;
border-color: #e9e9e9; }
.rbc-yellow .rbc .rc-slider .rc-slider-dot-active {
border-color: yellow;
background-color: yellow; }
.rbc-yellow .rbc label,
.rbc-yellow .rbc [type="checkbox"] + label:before, .rbc-yellow .rbc [type="checkbox"]:not(.filled-in) + label:after,
.rbc-yellow .rbc [type="radio"]:not(:checked) + label:before, .rbc-yellow .rbc [type="radio"]:not(:checked) + label:after {
Expand Down Expand Up @@ -735,12 +741,6 @@ a {
color: green;
border-color: rgba(0, 128, 0, 0.24); }

.rbc-green .rbc.rbc-rangeslider .rc-slider-track {
background: green; }

.rbc-green .rbc.rbc-rangeslider .rc-slider-handle {
border-color: green; }

.rbc-green .rbc.rbc-resultlist .rbc-json-print span:hover {
color: green; }

Expand Down Expand Up @@ -771,8 +771,16 @@ a {
background-color: #f5f5f5; }
.rbc-green .rbc .rbc-search-icon {
color: green; }
.rbc-green .rbc .primary-title {
color: green; }
.rbc-green .rbc .rc-slider .rc-slider-track {
background: green; }
.rbc-green .rbc .rc-slider .rc-slider-handle {
border-color: green; }
.rbc-green .rbc .rc-slider .rc-slider-dot {
background-color: #e9e9e9;
border-color: #e9e9e9; }
.rbc-green .rbc .rc-slider .rc-slider-dot-active {
border-color: green;
background-color: green; }
.rbc-green .rbc label,
.rbc-green .rbc [type="checkbox"] + label:before, .rbc-green .rbc [type="checkbox"]:not(.filled-in) + label:after,
.rbc-green .rbc [type="radio"]:not(:checked) + label:before, .rbc-green .rbc [type="radio"]:not(:checked) + label:after {
Expand Down Expand Up @@ -883,12 +891,6 @@ a {
color: #1893e7;
border-color: rgba(24, 147, 231, 0.24); }

.rbc-blue .rbc.rbc-rangeslider .rc-slider-track {
background: #1893e7; }

.rbc-blue .rbc.rbc-rangeslider .rc-slider-handle {
border-color: #1893e7; }

.rbc-blue .rbc.rbc-resultlist .rbc-json-print span:hover {
color: #1893e7; }

Expand Down Expand Up @@ -919,8 +921,16 @@ a {
background-color: #f5f5f5; }
.rbc-blue .rbc .rbc-search-icon {
color: #1893e7; }
.rbc-blue .rbc .primary-title {
color: #1893e7; }
.rbc-blue .rbc .rc-slider .rc-slider-track {
background: #1893e7; }
.rbc-blue .rbc .rc-slider .rc-slider-handle {
border-color: #1893e7; }
.rbc-blue .rbc .rc-slider .rc-slider-dot {
background-color: #e9e9e9;
border-color: #e9e9e9; }
.rbc-blue .rbc .rc-slider .rc-slider-dot-active {
border-color: #1893e7;
background-color: #1893e7; }
.rbc-blue .rbc label,
.rbc-blue .rbc [type="checkbox"] + label:before, .rbc-blue .rbc [type="checkbox"]:not(.filled-in) + label:after,
.rbc-blue .rbc [type="radio"]:not(:checked) + label:before, .rbc-blue .rbc [type="radio"]:not(:checked) + label:after {
Expand Down Expand Up @@ -1031,12 +1041,6 @@ a {
color: #ccc;
border-color: rgba(204, 204, 204, 0.24); }

.rbc-dark .rbc.rbc-rangeslider .rc-slider-track {
background: #ccc; }

.rbc-dark .rbc.rbc-rangeslider .rc-slider-handle {
border-color: #ccc; }

.rbc-dark .rbc.rbc-resultlist .rbc-json-print span:hover {
color: #ccc; }

Expand Down Expand Up @@ -1067,8 +1071,16 @@ a {
background-color: #aaa; }
.rbc-dark .rbc .rbc-search-icon {
color: #ccc; }
.rbc-dark .rbc .primary-title {
color: #ccc; }
.rbc-dark .rbc .rc-slider .rc-slider-track {
background: #ccc; }
.rbc-dark .rbc .rc-slider .rc-slider-handle {
border-color: #ccc; }
.rbc-dark .rbc .rc-slider .rc-slider-dot {
background-color: #e9e9e9;
border-color: #e9e9e9; }
.rbc-dark .rbc .rc-slider .rc-slider-dot-active {
border-color: #ccc;
background-color: #ccc; }
.rbc-dark .rbc label,
.rbc-dark .rbc [type="checkbox"] + label:before, .rbc-dark .rbc [type="checkbox"]:not(.filled-in) + label:after,
.rbc-dark .rbc [type="radio"]:not(:checked) + label:before, .rbc-dark .rbc [type="radio"]:not(:checked) + label:after {
Expand Down
30 changes: 19 additions & 11 deletions app/assets/styles/partials/theme/_default.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,6 @@ $themes: (
}
}

.rbc.rbc-rangeslider {
.rc-slider-track {
background: map-get($map, color);
}
.rc-slider-handle {
border-color: map-get($map, color);
}
}

.rbc.rbc-resultlist {
.rbc-json-print {
span {
Expand Down Expand Up @@ -190,10 +181,27 @@ $themes: (
color: map-get($map, color);
}

.primary-title {
color: map-get($map, color);
.rc-slider {
.rc-slider-track {
background: map-get($map, color);
}

.rc-slider-handle {
border-color: map-get($map, color);
}

.rc-slider-dot {
background-color: #e9e9e9;
border-color: #e9e9e9;
}

.rc-slider-dot-active {
border-color: map-get($map, color);
background-color: map-get($map, color);
}
}


label,
[type="checkbox"]+label:before, [type="checkbox"]:not(.filled-in)+label:after,
[type="radio"]:not(:checked)+label:before, [type="radio"]:not(:checked)+label:after {
Expand Down
2 changes: 1 addition & 1 deletion app/sensors/SingleDropdownRange.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export class SingleDropdownRange extends Component {
if(record) {
return {
range: {
[this.props.appbaseField]: {
[this.props.appbaseField]: {
gte: record.start,
lte: record.end,
boost: 2.0
Expand Down
2 changes: 1 addition & 1 deletion dist/css/style.min.css
View file

Large diffs are not rendered by default.

0 comments on commit 03d5824

Please sign in to comment.