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.

Sign up for GitHub

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

reworked css #2

Merged
merged 2 commits into from
Apr 9, 2020
Merged

reworked css #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7736e66
reused css, reduced smell
philipp2310 Apr 8, 2020
e4184be
bump version
philipp2310 Apr 8, 2020
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 AliceSatellite.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "AliceSatellite",
"version": "1.1.0",
"version": "1.1.1",
"icon": "fas fa-satellite",
"category": "alice",
"author": "ProjectAlice",
Expand Down
32 changes: 12 additions & 20 deletions widgets/css/Satellites.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,24 @@
.Satellites_satelliteContainer {
width: 100%;
display: flex;
align-items: flex-start;
padding: 5px;
}

.Satellites_tile {
width: 150px;
height: 150px;
display: block;
margin-right: 15px;
margin-top: 15px;
background-color: #8d9191;
padding: 3px;
box-sizing: border-box;
}

.Satellites_tile_deviceName { font-family: var(--readable); }

.Satellites_tile_muteUnmute {
width: 100%;
height: 80px;
height: 5em;
text-align: center;
margin-top: 15px;
margin-top: 1em;
display: block;
}

.Satellites_tile_heartbeat {
width: 100%;
text-align: right;
}

.Satellites_satelliteWidget .tile {
width: 9.5em;
height: 9.5em;
padding: .3em;
background-color: var(--secondary);
box-sizing: border-box;
box-shadow: none;
display: flex;
}
3 changes: 1 addition & 2 deletions widgets/css/common.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
.Satellites_satelliteWidget {
width: 100%;
height: 100%;
color: #d1d1d1;
padding: 5px;
box-sizing: border-box;
overflow-y: hidden;
overflow-x: scroll;
overflow-x: auto;
}
2 changes: 1 addition & 1 deletion widgets/js/Satellites.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
let device = JSON.parse(devices[id]);

let color = device['connected'] ? '--text' : 'red';
let $tile = $('<div class="Satellites_tile" id="' + device['uid'] + '">' +
let $tile = $('<div class="tile" id="' + device['uid'] + '">' +
'<div class="Satellites_tile_deviceName ' + color + '">' + device['room'] + '</div>' +
'<div class="Satellites_tile_muteUnmute"><i class="fas fa-microphone-alt fa-4x" aria-hidden="true" id="Satellites_muteUnmute_' + device['uid'] + '"></i></div>');

Expand Down
2 changes: 1 addition & 1 deletion widgets/templates/Satellites.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<div class="widgetIcons">
<i class="fas fa-wifi" aria-hidden="true"></i>
</div>
<div class="Satellites_satelliteContainer" id="Satellites_satelliteContainer"></div>
<div class="tileContainer" id="Satellites_satelliteContainer"></div>
</div>