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

0.6.0 Feature Release #61

Merged
merged 7 commits into from
Dec 23, 2020
Merged

0.6.0 Feature Release #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
caa9238
Update yellow color
lbussy Oct 3, 2020
4a0a5c2
Merge pull request #57 from brewpi-remix/tilt_yellow
lbussy Oct 4, 2020
4af80c1
Clean up refreshStatus()
lbussy Dec 13, 2020
e18e199
Employ css grid in header
lbussy Dec 19, 2020
e3f0b9d
Merge pull request #59 from brewpi-remix/top_align
lbussy Dec 19, 2020
be4bdca
Handle custom logos better
lbussy Dec 21, 2020
255309b
Merge pull request #60 from brewpi-remix/logo_work
lbussy Dec 21, 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
240 changes: 75 additions & 165 deletions css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,12 @@
@import url('dygraph.css');

@font-face {
font-family: 'CPMono_v07_Plain', monospace;
src: url('../font/CPMono_v07_Plain.otf') format('opentype');
}

body {
background: #fff;
color: #000;
font-family: Verdana, Arial, sans-serif;
width:980px;
font-size: 12px;
}

#top-bar button.script-status{
margin:10px;
}

img.logo {
width: 200px;
height: 55px;
}

button.script-status{
width: 200px;
float: right;
clear: right;
min-height: 25px;
}

button#maintenance{
width: 200px;
float: right;
clear:right;
min-height: 25px;
margin: 10px 10px 10px 10px;
}

/* Control Panel */
.google-visualization-table-td{
text-align: center !important;
Expand All @@ -56,7 +26,6 @@ button#maintenance{
text-align: left;
}


#status-message{
width: 400px;
padding: 0.5em 0.8em;
Expand Down Expand Up @@ -135,20 +104,6 @@ button#maintenance{
margin-top: 10px;
}

#lcd-version-panel{ /* Not used anymore */
width: 950px;
height: 28px;
margin-top: 10px;
margin-bottom: 10px;
float:left;
}

#lcd-bottom-bar{ /* Not used anymore */
width: 938px;
margin: 5px;
float:left;
}

.lcd-title{
color: #FFFFFF;
padding: 12px;
Expand All @@ -158,23 +113,6 @@ button#maintenance{
#lcd-top-bar{
width: 968px;
margin: 5px;
float:left;
}

#lcd-logo-container div#lcd-name-container{
float: left;
display: block;
width: 940px;
margin: 5px;
line-height: 0.5em;
color: #000;
}

#lcd-logo-panel{
width: 980px;
height: 78px;
margin-top: 10px;
margin-bottom: 10px;
}

#lcd-portal{
Expand All @@ -188,9 +126,21 @@ iframe {
}

#top-bar{
width: 968px;
width: 958px;
margin: 5px;
}

button.script-status{
width: 200px;
margin: 5px;
}

button#maintenance{
width: 200px;
float: right;
clear: right;
min-height: 25px;
margin: 5px;
float:left;
}

#status-container{
Expand Down Expand Up @@ -226,6 +176,7 @@ iframe {
.temperature-controls {
float: right;
}

.degree{
font-family: 'CPMono_v07_Plain', monospace;
font-size: 2em;
Expand Down Expand Up @@ -253,87 +204,53 @@ iframe {
margin: 5px;
}

/* New Top Bar CSS Grid: */

.header-grid-container {
display: grid;
grid-template-columns: 260px 240px 150px 90px 210px;

grid-template-rows: 70px;
grid-template-areas:
"logo lcd0 scrollname0 scrollvalue0 button"
"logo lcd1 scrollname1 scrollvalue1 button"
"logo lcd2 scrollname2 scrollvalue2 button"
"logo lcd3 scrollname3 scrollvalue3 button"
"name name name name name";
grid-gap: 0px;
padding: 5px;
}

.logo { grid-area: logo; }
.name { grid-area: name; }

.lcd0 { grid-area: lcd0; }
.lcd1 { grid-area: lcd1; }
.lcd2 { grid-area: lcd2; }
.lcd3 { grid-area: lcd3; }

.scrollname0 { grid-area: scrollname0; }
.scrollname1 { grid-area: scrollname1; }
.scrollname2 { grid-area: scrollname2; }
.scrollname3 { grid-area: scrollname3; }

.scrollvalue0 { grid-area: scrollvalue0; }
.scrollvalue1 { grid-area: scrollvalue1; }
.scrollvalue2 { grid-area: scrollvalue2; }
.scrollvalue3 { grid-area: scrollvalue3; }

.button { grid-area: button; }

/* ^^^ New Top Bar CSS Grid ^^^ */

/* LCD display styling */
@font-face {
font-family: "Courier New", Courier, monospace; /*'5x8LCDHD44780UA02Regular';
src: url('../font/5x8_lcd_hd44780u_a02-webfont.eot');
src: url('../font/5x8_lcd_hd44780u_a02-webfont.eot?#iefix') format('embedded-opentype'),
url('../font/5x8_lcd_hd44780u_a02-webfont.woff') format('woff'),
url('../font/5x8_lcd_hd44780u_a02-webfont.ttf') format('truetype'),
url('../font/5x8_lcd_hd44780u_a02-webfont.svg#5x8LCDHD44780UA02Regular') format('svg'); */
font-family: "Courier New", Courier, monospace;
font-weight: normal;
font-style: normal;
}

.lcddisplay {
width: 280px;
height: 85px;
float: left;
margin: 5px;
/*background: #000000; /* Old browsers */
/*background: -moz-linear-gradient(top, #000000 2%, #2b2b2b 11%, #212121 54%, #212121 92%, #000000 100%); /* FF3.6+ */
/*background: -webkit-gradient(linear, left top, left bottom, color-stop(2%,#000000), color-stop(11%,#2b2b2b), color-stop(54%,#212121), color-stop(92%,#212121), color-stop(100%,#000000)); /* Chrome,Safari4+ */
/*background: -webkit-linear-gradient(top, #000000 2%,#2b2b2b 11%,#212121 54%,#212121 92%,#000000 100%); /* Chrome10+,Safari5.1+ */
/*background: -o-linear-gradient(top, #000000 2%,#2b2b2b 11%,#212121 54%,#212121 92%,#000000 100%); /* Opera11.10+ */
/*background: -ms-linear-gradient(top, #000000 2%,#2b2b2b 11%,#212121 54%,#212121 92%,#000000 100%); /* IE10+ */
/*filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#000000', endColorstr='#000000',GradientType=0 ); /* IE6-9 */
/*background: linear-gradient(top, #000000 2%,#2b2b2b 11%,#212121 54%,#212121 92%,#000000 100%); /* W3C */
/*-webkit-box-shadow: inset 1px 1px 5px #333333;*/
/*-moz-box-shadow: inset 1px 1px 5px #333333;*/
/*box-shadow: inset 1px 1px 5px #333333;*/
/*border: 2px solid #333;*/
/*border: 0px solid #2378aa;*/
/*-webkit-border-radius: 2px;*/
/*-moz-border-radius: 2px;*/
/*border-radius: 5px;*/
}

.portallcddisplay {
width: 280px;
height: 90px;
float: left;
margin: 5px;
background: #000000; /* Old browsers */
background: -moz-linear-gradient(top, #000000 2%, #2b2b2b 11%, #212121 54%, #212121 92%, #000000 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(2%,#000000), color-stop(11%,#2b2b2b), color-stop(54%,#212121), color-stop(92%,#212121), color-stop(100%,#000000)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #000000 2%,#2b2b2b 11%,#212121 54%,#212121 92%,#000000 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #000000 2%,#2b2b2b 11%,#212121 54%,#212121 92%,#000000 100%); /* Opera11.10+ */
background: -ms-linear-gradient(top, #000000 2%,#2b2b2b 11%,#212121 54%,#212121 92%,#000000 100%); /* IE10+ */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#000000', endColorstr='#000000',GradientType=0 ); /* IE6-9 */
background: linear-gradient(top, #000000 2%,#2b2b2b 11%,#212121 54%,#212121 92%,#000000 100%); /* W3C */
-webkit-box-shadow: inset 1px 1px 5px #333333;
-moz-box-shadow: inset 1px 1px 5px #333333;
box-shadow: inset 1px 1px 5px #333333;
*border: 2px solid #333;
border: 2px solid #000000;
-webkit-border-radius: 2px;
-moz-border-radius: 2px;
border-radius: 5px;
}

.new-status-display { /* New status block */
width: 170px;
float: left;
margin: 10px;
padding: 0px;
}

.new-status-line{ /* New status block text */
font-family: "Courier New", Courier, monospace;
color: rgb(255, 255, 255);
white-space: nowrap;
font-size: 13px;
font-style: normal;
}

.lcddisplay .lcd-text{
float:left;
margin: 5px 16px;
}

.lcd-line{
float:left;
clear:left;
font-size: 16px;
font-weight: bold;
font-style: normal;
Expand All @@ -344,17 +261,14 @@ iframe {
white-space: pre;
}

.portal-lcd-line{
float:left;
clear:left;
font-size: 16px;
font-weight: normal;
font-style: normal;
font-family: "Courier New", Courier, monospace;
/*font-family: '5x8LCDHD44780UA02Regular', monospace;*/
/*color: #FFFF00;*/
color: yellow;
white-space: pre;
.status-name{
width: 110px;
text-align: left;
}

.status-value{
width: 60px;
text-align: left;
}

.ui-dialog,
Expand All @@ -363,7 +277,7 @@ iframe {
}

#maintenance-panel{
height: 700px!important;
height: 700px !important;
}

#maintenance-panel ul.ui-tabs-nav li{
Expand Down Expand Up @@ -409,6 +323,7 @@ iframe {
#view-logs button{
float: right;
}

#view-logs button:first-child{
margin-right: 40px;
}
Expand Down Expand Up @@ -771,26 +686,21 @@ iframe {
display: block;
margin-left: 4px;
margin-top: 5px;
width: 250px;
width: 260px;
text-align: left;
margin-top: 0px;
}

#logo-container div#beer-name-container{
float: left;
img.logo{
display: block;
line-height: 1.2em;
color: #000;
width: inherit;
margin-top: 0px;
}
max-width:250px;
max-height:70px;
width: auto;
height: auto;
}

.logo-placeholder a{
display:block;
font-size: 20px;
font-weight: bold;
margin-top: 20px;
margin-bottom: 20px;
width: inherit;
span.beer-name-container{
font-size: 0.8em;
}

.beer-name-dialog{
Expand Down
14 changes: 7 additions & 7 deletions css/tilt.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@

/* Orange */
.beer-chart-legend-row.orangeSG{
color:rgba(255, 165, 0, 1);
color:rgba(255, 140, 0, 1);
}
.beer-chart-legend-row .toggle.orangeSG{
background-color:rgba(255, 165, 0, 0.5);
border:1px solid rgba(255, 165, 0, 1);
background-color:rgba(255, 140, 0, 0.5);
border:1px solid rgba(255, 140, 0, 1);
}

/* Blue */
Expand All @@ -56,11 +56,11 @@

/* Yellow */
.beer-chart-legend-row.yellowSG{
color:rgba(255, 255, 0, 1);
color:rgba(250, 165, 0, 1);
}
.beer-chart-legend-row .toggle.yellowSG{
background-color:rgba(255, 255, 0, 0.5);
border:1px solid rgba(255, 255, 0, 1);
background-color:rgba(250, 165, 0, 0.5);
border:1px solid rgba(250, 165, 0, 1);
}

/* Pink */
Expand All @@ -83,4 +83,4 @@
.dygraph-ylabel {
font-size:11px;
margin: 15px 0px 0px 0px;
}
}
Loading