Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IMPR: Better color management to support themed css #877

Open
wants to merge 24 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion IRIS_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.65.0
3.66.0
2 changes: 1 addition & 1 deletion mopidy_iris/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from mopidy import config, ext

__version__ = "3.65.0"
__version__ = "3.66.0"

logger = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mopidy-iris",
"version": "3.65.0",
"version": "3.66.0",
"description": "Mopidy HTTP interface",
"repository": "https://github.com/jaedb/iris",
"author": "James Barnsley <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = Mopidy-Iris
version = 3.65.0
version = 3.66.0
url = https://github.com/jaedb/iris
author = James Barnsley
author_email = [email protected]
Expand Down
217 changes: 126 additions & 91 deletions src/js/locale/ru.yaml

Large diffs are not rendered by default.

102 changes: 51 additions & 51 deletions src/scss/app.scss
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
@import "vendor/font-awesome/index";

@import 'vendor/font-awesome/index';
@import "global/colours";
@import "global/colours_theme";
@import "global/variables";
@import "global/core";
@import "global/reset";
@import "global/forms";

@import 'global/colours';
@import 'global/variables';
@import 'global/core';
@import 'global/reset';
@import 'global/forms';
@import "components/context-menu";
@import "components/lists";
@import "components/loader";
@import "components/images";
@import "components/parallax";
@import "components/icon";
@import "components/slider";
@import "components/playback-controls";
@import "components/output-control";
@import "components/sidebar";
@import "components/grid";
@import "components/grid-slider";
@import "components/header";
@import "components/notifications";
@import "components/dropdown-field";
@import "components/autocomplete-field";
@import "components/filter-field";
@import "components/sub-views";
@import "components/sub-tabs";
@import "components/debug";
@import "components/tooltip";
@import "components/snapcast";
@import "components/popularity";
@import "components/colour-field";
@import "components/icon-field";
@import "components/commands";
@import "components/related-artists";
@import "components/error-message";
@import "components/mute-control";
@import "components/select-field";
@import "components/pin-list";
@import "components/dropzones";

@import 'components/context-menu';
@import 'components/lists';
@import 'components/loader';
@import 'components/images';
@import 'components/parallax';
@import 'components/icon';
@import 'components/slider';
@import 'components/playback-controls';
@import 'components/output-control';
@import 'components/sidebar';
@import 'components/grid';
@import 'components/grid-slider';
@import 'components/header';
@import 'components/notifications';
@import 'components/dropdown-field';
@import 'components/autocomplete-field';
@import 'components/filter-field';
@import 'components/sub-views';
@import 'components/sub-tabs';
@import 'components/debug';
@import 'components/tooltip';
@import 'components/snapcast';
@import 'components/popularity';
@import 'components/colour-field';
@import 'components/icon-field';
@import 'components/commands';
@import 'components/related-artists';
@import 'components/error-message';
@import 'components/mute-control';
@import 'components/select-field';
@import 'components/pin-list';
@import 'components/dropzones';
@import "views/artist";
@import "views/user";
@import "views/album";
@import "views/playlist";
@import "views/track";
@import "views/queue";
@import "views/search";
@import "views/library";
@import "views/discover";
@import "views/settings";
@import "views/modal";

@import 'views/artist';
@import 'views/user';
@import 'views/album';
@import 'views/playlist';
@import 'views/track';
@import 'views/queue';
@import 'views/search';
@import 'views/library';
@import 'views/discover';
@import 'views/settings';
@import 'views/modal';

@import "../../node_modules/react-input-range/lib/css/index.css";
@import "../../node_modules/react-input-range/lib/css/index.css";
148 changes: 73 additions & 75 deletions src/scss/components/_autocomplete-field.scss
Original file line number Diff line number Diff line change
@@ -1,75 +1,73 @@

.autocomplete-field {
position: relative;

.input {
width: 100%;
}

&.loading {
.input {
position: relative;

&:after {
position: absolute;
display: block;
content: '';
background: rgba(255,255,255,0.2);
opacity: 1;
animation: slideloader 1s infinite;
bottom: 0;
left: 0;
right: 0;
height: 4px;
z-index: 1;
}
}
}

.results {
position: absolute;
top: 37px;
left: 0;
right: 0;
z-index: 97;
background: colour('dark_grey');
color: colour('white');

.type {
&:not(:first-child) {
padding-top: 5px;
}

h4 {
padding: 10px 14px 4px;
margin: 0;
font-size: 12px;
text-transform: uppercase;
}

.result {
display: block;
padding: 10px 14px;
border-top: 1px solid lighten(colour('dark_grey'), 10%);
cursor: pointer;

&:hover {
background: lighten(colour('dark_grey'), 10%);
}
}
}

.all-results {
display: block;
padding: 10px 14px;
border-top: 1px solid lighten(colour('dark_grey'), 10%);
cursor: pointer;
font-weight: bold;

&:hover {
background: lighten(colour('dark_grey'), 10%);
}
}
}
}

.autocomplete-field {
position: relative;

.input {
width: 100%;
}

&.loading {
.input {
position: relative;

&:after {
position: absolute;
display: block;
content: "";
background: rgba(255, 255, 255, 0.2);
opacity: 1;
animation: slideloader 1s infinite;
bottom: 0;
left: 0;
right: 0;
height: 4px;
z-index: 1;
}
}
}

.results {
position: absolute;
top: 37px;
left: 0;
right: 0;
z-index: 97;
background: colour("dark_grey");
color: colour("white");

.type {
&:not(:first-child) {
padding-top: 5px;
}

h4 {
padding: 10px 14px 4px;
margin: 0;
font-size: 12px;
text-transform: uppercase;
}

.result {
display: block;
padding: 10px 14px;
border-top: 1px solid colour("dark_grey");
cursor: pointer;

&:hover {
background: colour("dark_grey");
}
}
}

.all-results {
display: block;
padding: 10px 14px;
border-top: 1px solid colour("dark_grey");
cursor: pointer;
font-weight: bold;

&:hover {
background: colour("dark_grey");
}
}
}
}
Loading