Skip to content

Commit

Permalink
Added version identifier for Butter - BTTR
Browse files Browse the repository at this point in the history
  • Loading branch information
Lucas Moreira committed Feb 24, 2018
1 parent f45ab4f commit a11233b
Show file tree
Hide file tree
Showing 20 changed files with 85 additions and 94 deletions.
10 changes: 5 additions & 5 deletions libraries/jbox/jBox.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

.jBox-container {
background: #fff;
border:1px solid #ffbb00;
border:1px solid #f7931e;
font-size:11px;
line-height:13px;
color:#525352;
Expand Down Expand Up @@ -82,7 +82,7 @@
background: #fff;
-webkit-transform: rotate(45deg);
transform: rotate(45deg);
border:1px solid #ffbb00;
border:1px solid #f7931e;

}

Expand Down Expand Up @@ -167,7 +167,7 @@
border-radius: 3px;
padding: 0 20px;
-webkit-transition: color .2s, background-color .2s;
transition: color .2s, background-color .2s;
transition: color .2s, background-color .2s;
}

.jBox-Confirm-button-cancel {
Expand Down Expand Up @@ -515,7 +515,7 @@ body[class*=" jBox-blockScroll-"] {
margin-top: -10px;
margin-left: -10px;
}

.jBox-spinner:before {
content: 'Loading…';
display: block;
Expand All @@ -525,7 +525,7 @@ body[class*=" jBox-blockScroll-"] {
-webkit-box-sizing: border-box;
box-sizing: border-box;
}

.jBox-spinner:not(:required):before {
content: '';
border-radius: 50%;
Expand Down
44 changes: 22 additions & 22 deletions src/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ a.disabled {
.cf_doc_version_bt a {
padding: 1px 9px 1px 9px;
margin-top: -45px;
background-color: #ffbb00;
background-color: #f7931e;
border-radius: 3px;
border: 1px solid #e8b423;
color: #000;
Expand Down Expand Up @@ -111,7 +111,7 @@ input[type="number"]::-webkit-inner-spin-button {
}

.message-positive {
color: #ffbb00;
color: #f7931e;
}

.message-negative {
Expand Down Expand Up @@ -144,7 +144,7 @@ input[type="number"]::-webkit-inner-spin-button {
height: 20px;
width: 200px;
left: 80px;
top: 50px;
top: 70px;
color: #949494;
opacity: 0.5;
}
Expand Down Expand Up @@ -473,7 +473,7 @@ input[type="number"]::-webkit-inner-spin-button {

#log a {
font-weight: regular;
color: #ffbb00;
color: #f7931e;
}

#log a:hover {
Expand Down Expand Up @@ -505,7 +505,7 @@ input[type="number"]::-webkit-inner-spin-button {
float: left;
height: calc(100% - 150px);
width: 200px;
border-right: 4px solid #ffbb00;
border-right: 4px solid #f7931e;
background-color: #2e2e2e;
transition: all 0.2s;

Expand Down Expand Up @@ -578,7 +578,7 @@ input[type="number"]::-webkit-inner-spin-button {
}

#tabs li.active a {
background-color: #ffbb00;
background-color: #f7931e;
color: #000;
transition: none;
text-shadow: 0px 1px rgba(255, 255, 255, 0.45);
Expand All @@ -587,7 +587,7 @@ input[type="number"]::-webkit-inner-spin-button {

#tabs li.active a:hover {
cursor: default;
background-color: #ffbb00;
background-color: #f7931e;
}

.tabicon {
Expand Down Expand Up @@ -988,7 +988,7 @@ dialog {

/* Tab Title */
.tab_title {
border-bottom: 1px solid #ffbb00;
border-bottom: 1px solid #f7931e;
font-size: 20px;
line-height: 24px;
height: 30px;
Expand Down Expand Up @@ -1037,7 +1037,7 @@ dialog {
margin-top: 0px;
margin-bottom: 0px;
margin-right: 20px;
background-color: #ffbb00;
background-color: #f7931e;
border-radius: 3px;
border: 1px solid #dba718;
color: #000;
Expand All @@ -1060,7 +1060,7 @@ dialog {
}

.content_toolbar .btn a:active {
background-color: #ffbb00;
background-color: #f7931e;
transition: all ease 0.0s;
box-shadow: inset 0px 1px 5px rgba(0, 0, 0, 0.35);
}
Expand Down Expand Up @@ -1202,7 +1202,7 @@ dialog {
}

.gui_note .gui_box_titlebar {
background-color: #ffbb00;
background-color: #f7931e;
background-image: linear-gradient(-45deg, rgba(255, 255, 255, .3) 10%, transparent 10%, transparent 20%,
rgba(255, 255, 255, .3) 20%, rgba(255, 255, 255, .3) 30%, transparent 30%, transparent 40%,
rgba(255, 255, 255, .3) 40%, rgba(255, 255, 255, .3) 50%, transparent 50%, transparent 60%,
Expand Down Expand Up @@ -1258,7 +1258,7 @@ dialog {
margin-top: 9px;
margin-bottom: 0px;
margin-right: 20px;
background-color: #ffbb00;
background-color: #f7931e;
border-radius: 3px;
border: 1px solid #dba718;
color: #000;
Expand Down Expand Up @@ -1292,7 +1292,7 @@ dialog {
.default_btn a {
padding: 5px 0px 5px 0px;
text-align: center;
background-color: #ffbb00;
background-color: #f7931e;
border-radius: 4px;
border: 1px solid #dba718;
color: #000;
Expand Down Expand Up @@ -1329,7 +1329,7 @@ dialog {
margin-top: 8px;
margin-bottom: 8px;
margin-right: 10px;
background-color: #ffbb00;
background-color: #f7931e;
border-radius: 3px;
border: 1px solid #dba718;
color: #000;
Expand Down Expand Up @@ -1370,10 +1370,10 @@ dialog {
}

.small a:hover {
background-color: #ffbb00;
background-color: #f7931e;
color: #000;
text-shadow: 0px 1px rgba(255, 255, 255, 0.25);
border: 1px solid #ffbb00;
border: 1px solid #f7931e;
transition: all ease 0.2s;
}

Expand All @@ -1384,7 +1384,7 @@ dialog {
}

.green a {
background-color: #ffbb00;
background-color: #f7931e;
text-shadow: 0px 1px rgba(255, 255, 255, 0.25);
color: #000;
border: 1px solid #dba718;
Expand Down Expand Up @@ -1438,7 +1438,7 @@ dialog {
}

.gps_true {
background-color: #ffbb00;
background-color: #f7931e;
padding: 1px 7px 2px 7px;
border-radius: 3px;
color: #FFFFFF;
Expand Down Expand Up @@ -1474,7 +1474,7 @@ dialog {
}

.connect_b a.connect {
background-color: #ffbb00;
background-color: #f7931e;
border: 1px solid #dba718;
background-image: url(../images/icons/cf_icon_usb2_white.svg);
background-repeat: no-repeat;
Expand Down Expand Up @@ -1589,7 +1589,7 @@ dialog {


.dataflash-free_global {
background-color: #ffbb00;
background-color: #f7931e;
border-radius: 4px;
}

Expand Down Expand Up @@ -1704,7 +1704,7 @@ dialog {
position: relative;
box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.20);
border-radius: 0px;
background-color: #ffbb00;
background-color: #f7931e;
/* border-radius: 4px; */
margin-top: 0px;
}
Expand Down Expand Up @@ -1768,7 +1768,7 @@ button {
}

button.active {
background-color: #ffbb00;
background-color: #f7931e;
border: 1px solid #dba718;
color: #000;
}
Expand Down
6 changes: 3 additions & 3 deletions src/css/tabs/adjustments.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
}

.tab-adjustments .range .marker, .tab-adjustments .channel-slider .noUi-connect {
background: #ffbb00;
background: #f7931e;
box-shadow: inset 0 0px 2px rgba(0, 0, 0, 0.4), 0px 1px 0px rgba(255, 255, 255, 0.6);
}

Expand Down Expand Up @@ -63,7 +63,7 @@
.tab-adjustments .adjustment select {
/* outline: 1px solid silver; */
border-radius: 3px;
border: 1px solid silver;
border: 1px solid silver;
}

.tab-adjustments .adjustment td {
Expand Down Expand Up @@ -121,4 +121,4 @@

.tab-adjustments .spacebottom {
margin-bottom: 15px;
}
}
8 changes: 4 additions & 4 deletions src/css/tabs/auxiliary.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
}

.tab-auxiliary .range .marker, .tab-auxiliary .channel-slider .noUi-connect {
background: #ffbb00;
background: #f7931e;
border-radius: 3px;
}

.tab-auxiliary .mode.on .info {
background: #ffbb00;
background: #f7931e;
color: black;
}

.tab-auxiliary .mode.on:nth-child(odd) .info {
background: #ffbb00;
background: #f7931e;
}

.tab-auxiliary .mode.off .info {
Expand Down Expand Up @@ -217,4 +217,4 @@
.tab-auxiliary .fixed_band .save_btn a {
margin-right: 15px;
}
}
}
4 changes: 2 additions & 2 deletions src/css/tabs/firmware_flasher.css
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@
}

.tab-firmware_flasher .info .progress.valid::-webkit-progress-bar {
background-color: #ffbb00;
background-color: #f7931e;
border-radius: 4px;
}

.tab-firmware_flasher .info .progress.valid::-webkit-progress-value {
background-color: #ffbb00;
background-color: #f7931e;
border-radius: 4px;
}

Expand Down
4 changes: 2 additions & 2 deletions src/css/tabs/help.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
}

.tab-help li span a {
color: #ffbb00;
color: #f7931e;
}

.tab-help .subline {
margin-bottom: 5px;
}
}
14 changes: 7 additions & 7 deletions src/css/tabs/landing.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
}

.tab-landing .content_top {
height: 140px;
height: auto;
background: #fff;
padding: 20px;
background-image: url(../../images/pattern.png);
background-size: 300px;
}

.tab-landing .content_mid {
background-color: #ffbb00;
background-color: #f7931e;
overflow: hidden;
}

Expand All @@ -36,14 +36,14 @@
margin-left: auto;
margin-right: auto;
margin-top: 5px;
width: 800px;
width: 80%;
color: black;
font-size: 14px;
font-family: 'open_sanslight', Arial;
}

.tab-landing .logowrapper img {
width: 600px;
width: 100%;
margin: 5px;
}

Expand Down Expand Up @@ -176,7 +176,7 @@
#changelog .wrapper {
height: 100%;
padding: 0 20px;
border-left: 5px solid #ffbb00;
border-left: 5px solid #f7931e;
overflow-y: auto;
display: none;
}
Expand All @@ -186,7 +186,7 @@
top: 50px;
right: 215px;
position: absolute;
background: #ffbb00;
background: #f7931e;
border-radius: 5px 5px 0 0;
border-bottom: none;
height: 30px;
Expand Down Expand Up @@ -237,4 +237,4 @@

#changelog .log p {
margin-bottom: 20px;
}
}
2 changes: 1 addition & 1 deletion src/css/tabs/led_strip.css
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@

.tab-led-strip .wires-remaining div {
font-size: 40px;
color: #ffbb00;
color: #f7931e;
margin-bottom: -5px;
margin-top: -10px;
}
Expand Down
2 changes: 1 addition & 1 deletion src/css/tabs/motors.css
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
}

.tab-motors .plot_control .motor-button a {
background-color: #ffbb00;
background-color: #f7931e;
border-radius: 3px;
border: 1px solid #e8b423;
color: #000;
Expand Down
Loading

0 comments on commit a11233b

Please sign in to comment.