sarsoo/Mixonomer
1
0
Fork 0
Code Issues 15 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
aj 2019-08-26 18:31:46 +01:00
commit 1ac189ca7a
2 changed files with 46 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/Playlist/PlaylistsView.js
View File

@ -90,12 +90,10 @@ class PlaylistsView extends Component {
render() { render() {
const table = <div> const table = <Table playlists={this.state.playlists}
<Table playlists={this.state.playlists}
handleRunPlaylist={this.handleRunPlaylist} handleRunPlaylist={this.handleRunPlaylist}
handleDeletePlaylist={this.handleDeletePlaylist} handleDeletePlaylist={this.handleDeletePlaylist}
handleRunAll={this.handleRunAll}/> handleRunAll={this.handleRunAll}/>;
</div>;
const loadingMessage = <p className="center-text">loading...</p>; const loadingMessage = <p className="center-text">loading...</p>;

57
src/scss/style.scss
View File

@ -4,6 +4,7 @@ $ui-colour: #131313;
$light-ui: #575757; $light-ui: #575757;
$text-colour: white; $text-colour: white;
$ui-element: #505050; $ui-element: #505050;
$ui-shadow: #404040;
$pad-px: 20px; $pad-px: 20px;
@ -54,7 +55,7 @@ p {
display: inline-block; display: inline-block;
border-radius: 5px; border-radius: 3px;
border: none; border: none;
margin: 4px auto; margin: 4px auto;
padding: 15px; padding: 15px;
@ -66,6 +67,7 @@ p {
box-shadow: 0 9px #383838; box-shadow: 0 9px #383838;
text: { text: {
shadow: 0.5px 0.5px 0.5px rgba(0,0,0,0.14);
align: center; align: center;
decoration: none; decoration: none;
} }
@ -77,10 +79,10 @@ p {
} }
input[type=text], input[type=password], input[type=number], select { input[type=text], input[type=password], input[type=number], select {
padding: 10px; padding: 15px;
background-color: $ui-element; background-color: $ui-element;
border: black; border: black;
border-radius: 4px; border-radius: 3px;
color: white; color: white;
} }
@ -186,12 +188,24 @@ h1.sectiontitle {
ul.navbar { ul.navbar {
list-style-type: none; list-style-type: none;
border-radius: 5px 5px; background-color: $light-ui;
/*box-shadow: 3px 3px 1px grey;*/
margin: 10px; margin: 10px;
border-radius: 5px;
/*box-shadow: 3px 3px 1px grey;*/
padding: 0; padding: 0;
overflow: hidden; overflow: hidden;
background-color: $light-ui;
user-select: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
-webkit-user-drag: none;
-khtml-user-drag: none;
-moz-user-drag: none;
-o-user-drag: none;
box-shadow: 0 9px 12px 0 black, 0 9px 12px 0 black;
li { li {
float: left; float: left;
@ -199,21 +213,23 @@ ul.navbar {
position: sticky; position: sticky;
top: 0; top: 0;
a { a {
display: block; display: block;
color: $text-colour; color: $text-colour;
text-align: center; text-align: center;
padding: 14px 16px; padding: 14px 16px;
// padding: 10px;
margin: 2px;
border-radius: 5px;
text-decoration: none; text-decoration: none;
text-shadow: 1px 1px 2px black; text-shadow: 1px 1px 1px rgba(0,0,0, 0.5);
-webkit-transition: background-color 0.4s; -webkit-transition: background-color 0.4s;
transition: background-color 0.4s; transition: background-color 0.4s;
&:hover { &:hover {
background-color: #080808; background-color: $ui-shadow;
} }
} }
} }
@ -223,13 +239,24 @@ ul.navbar {
.sidebar { .sidebar {
background-color: $light-ui;
list-style-type: none; list-style-type: none;
background-color: $light-ui;
margin-left: 10px; margin-left: 10px;
margin-right: 10px; margin-right: 10px;
border-radius: 5px; border-radius: 5px;
padding-top: 10px; // padding-top: 10px;
padding-bottom: 10px; // padding-bottom: 10px;
user-select: none;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
-webkit-user-drag: none;
-khtml-user-drag: none;
-moz-user-drag: none;
-o-user-drag: none;
box-shadow: 0 9px 12px 0 black, 0 9px 12px 0 black;
tr { tr {
top: 0; top: 0;
@ -237,7 +264,7 @@ ul.navbar {
td { td {
height: 50px; // height: 50px;
text-align: center; text-align: center;
vertical-align: center; vertical-align: center;
@ -253,13 +280,13 @@ ul.navbar {
padding: 10px; padding: 10px;
text-decoration: none; text-decoration: none;
text-shadow: 1px 1px 2px black; text-shadow: 1px 1px 1px rgba(0,0,0, 0.5);
-webkit-transition: background-color 0.4s; -webkit-transition: background-color 0.4s;
transition: background-color 0.4s; transition: background-color 0.4s;
} }
&:hover { &:hover {
background-color: black; background-color: $ui-shadow;
} }
} }
} }