Skip to content

Commit

Permalink
Merge branch 'Code-Cleanup'
Browse files Browse the repository at this point in the history
  • Loading branch information
@GaryKeeble
GaryKeeble committed Aug 19, 2016
2 parents 3e04cc2 + 8f9f843 commit f547bbb
Show file tree
Hide file tree
Showing 6 changed files with 147 additions and 190 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Expand Up @@ -4,3 +4,4 @@
/blackbox-chrome-app.zip
.idea/workspace.xml
.idea/tasks.xml
/.idea/
108 changes: 44 additions & 64 deletions css/header_dialog.css
View file
@@ -1,7 +1,7 @@
/* Colums START> */
.cf_column {
min-height: 20px;
margin-bottom: 0px;
margin-bottom: 0;
}

.full {
Expand Down Expand Up @@ -77,19 +77,19 @@ input[type="number"]::-webkit-inner-spin-button {
float: left;
width: calc(100% - 2px);
margin-bottom: 10px;
font-family: 'open_sansregular', Arial;
font-family: 'open_sansregular', Arial, serif;
}

.gui_box_titlebar {
background-color: #e4e4e4;
border-radius: 3px 3px 0px 0px;
border-radius: 3px 3px 0 0;
font-size: 13px;
width: 100%;
height: 27px;
padding-bottom: 0px;
padding-bottom: 0;
float: left;
margin-bottom: 7px;
font-family: 'open_sanssemibold', Arial;
font-family: 'open_sanssemibold', Arial, serif;
}

/* Spacers */
Expand All @@ -109,7 +109,7 @@ input[type="number"]::-webkit-inner-spin-button {
padding-left: 10px;
padding-right: 10px;
padding-top: 4px;
margin-bottom: 0px;
margin-bottom: 0;
float: left;
}

Expand All @@ -136,7 +136,7 @@ input[type="number"]::-webkit-inner-spin-button {
.header-dialog .parameter label {
background-color: #828885;
padding: 4px;
border-left: 0px solid #ccc;
border-left: 0 solid #ccc;
border-bottom: 1px solid #ccc;
font-weight: normal;
color: white;
Expand All @@ -147,7 +147,7 @@ input[type="number"]::-webkit-inner-spin-button {
.header-dialog .parameter th {
background-color: #828885;
padding: 4px;
border-left: 0px solid #ccc;
border-left: 0 solid #ccc;
border-bottom: 1px solid #ccc;
font-weight: bold;
color: white;
Expand All @@ -170,7 +170,7 @@ input[type="number"]::-webkit-inner-spin-button {
}

.header-dialog .cf th:last-child {
border-right: 0px;
border-right: 0;
}

.header-dialog .cf td:first-child {
Expand All @@ -180,7 +180,7 @@ input[type="number"]::-webkit-inner-spin-button {

.header-dialog .cf td:last-child {
border-bottom-right-radius: 3px;
border-right: 0px;
border-right: 0;
border-top-right-radius: 3px;
}

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

.header-dialog table {
float: left;
margin: 0px;
margin: 0;
border-collapse: collapse;
width: calc(100% - 1px);
}

.header-dialog .gui_box {
/*margin-bottom: 0px;*/
/*margin-bottom: 0;*/
}

.header-dialog .parameter td+input {
padding: 1px;
background-color:red;
border-bottom: 0px solid #ccc;
border-bottom: 0 solid #ccc;
}

.header-dialog table, .header-dialog table td {
padding: 1px;
border-bottom: 0px solid #ccc;
border-bottom: 0 solid #ccc;
}

.header-dialog table th {
padding: 0px;
border: 0px;
padding: 0;
border: 0;
font-weight: normal;
}

.header-dialog .pid_titlebar th {
padding: 5px;
text-align: left;
border-right: 1px solid #ccc;
width: calc(100% -1px);
width: calc(100% - 1px);
}

.header-dialog .pid_titlebar th:first-child {
Expand All @@ -262,7 +262,7 @@ input[type="number"]::-webkit-inner-spin-button {
}

.header-dialog table tr td:last-child {
border-right: 0px solid #ccc;
border-right: 0 solid #ccc;
}

.header-dialog table td {
Expand All @@ -273,7 +273,7 @@ input[type="number"]::-webkit-inner-spin-button {

.header-dialog table tr td {
text-align: left;
padding-left: 0px;
padding-left: 0;
}

.header-dialog table input {
Expand All @@ -282,8 +282,8 @@ input[type="number"]::-webkit-inner-spin-button {
height: 20px;
line-height: 20px;
text-align: right;
border: 0px solid #ccc;
border-radius: 0px;
border: 0 solid #ccc;
border-radius: 0;
}

.header-dialog .missing {
Expand All @@ -302,7 +302,7 @@ input[type="number"]::-webkit-inner-spin-button {
.header-dialog .controller {
float: left;
width: calc(100% - 10px);
margin-left: 0px;
margin-left: 0;
margin-bottom: 10px;
border-radius: 4px;
border: 1px solid #ccc;
Expand Down Expand Up @@ -330,9 +330,7 @@ input[type="number"]::-webkit-inner-spin-button {
color: white;
height: 19px;
font-weight: normal;
padding: 2px;
padding-bottom: 3px;
padding-left: 6px;
padding: 2px 2px 3px 6px;
}

.header-dialog .profile select {
Expand Down Expand Up @@ -374,7 +372,7 @@ input[type="number"]::-webkit-inner-spin-button {
float: right;
width: calc(100% - 2px);
margin-top: 10px;
/* padding-left: 0px; */
/* padding-left: 0; */
}

html:not(.isCF) .cf-only,
Expand All @@ -396,7 +394,7 @@ html:not(.isBF28) .bf-only {
.header-dialog .fixed_band {
position: absolute;
width: 100%;
bottom: 0px;
bottom: 0;
}

.header-dialog .spacer_box {
Expand All @@ -408,24 +406,21 @@ html:not(.isBF28) .bf-only {
.pid_mode {
width: 100%;
height: 25px;
background-color: #D6D6D6;
float: left;
margin: 0px;
padding: 0px;
margin: 0;
text-align: left;
padding-left: 5px;
line-height: 13px;
padding-top: 8px;
padding: 8px 0 0 5px;
font-size: 12px;
border-bottom: 1px solid #ccc;
color: #828282;
font-family: 'open_sans', Arial;
background-image: linear-gradient(-45deg, rgba(255, 255, 255, .2) 10%, transparent 10%, transparent 20%,
rgba(255, 255, 255, .2) 20%, rgba(255, 255, 255, .2) 30%, transparent 30%, transparent 40%,
rgba(255, 255, 255, .2) 40%, rgba(255, 255, 255, .2) 50%, transparent 50%, transparent 60%,
rgba(255, 255, 255, .2) 60%, rgba(255, 255, 255, .2) 70%, transparent 70%, transparent 80%,
rgba(255, 255, 255, .2) 80%, rgba(255, 255, 255, .2) 90%, transparent 90%, transparent 100%,
rgba(255, 255, 255, .2) 100%, transparent);
font-family: 'open_sans', Arial, serif;
background: #D6D6D6 linear-gradient(315deg, rgba(255, 255, 255, .2) 10%, transparent 10%, transparent 20%,
rgba(255, 255, 255, .2) 20%, rgba(255, 255, 255, .2) 30%, transparent 30%, transparent 40%,
rgba(255, 255, 255, .2) 40%, rgba(255, 255, 255, .2) 50%, transparent 50%, transparent 60%,
rgba(255, 255, 255, .2) 60%, rgba(255, 255, 255, .2) 70%, transparent 70%, transparent 80%,
rgba(255, 255, 255, .2) 80%, rgba(255, 255, 255, .2) 90%, transparent 90%, transparent 100%,
rgba(255, 255, 255, .2) 100%, transparent);
}

.pid_titlebar {
Expand Down Expand Up @@ -457,7 +452,7 @@ html:not(.isBF28) .bf-only {

.header-dialog .number .helpicon {
margin-top: 3px;
margin-right: 0px;
margin-right: 0;
}

.header-dialog .gui_box_titlebar .helpicon {
Expand All @@ -482,7 +477,7 @@ html:not(.isBF28) .bf-only {

.header-dialog .number:last-child {
padding-bottom: 5px;
border-bottom: 0px;
border-bottom: 0;
}

.header-dialog .number input {
Expand All @@ -502,11 +497,11 @@ html:not(.isBF28) .bf-only {
.header-dialog .misc table td
{
padding: 1px;
border: 0px solid #ccc;
border: 0 solid #ccc;
}

.header-dialog .noline td {
border: 0px solid #ccc;
border: 0 solid #ccc;
}

.header-dialog .features label,
Expand All @@ -516,7 +511,7 @@ html:not(.isBF28) .bf-only {
height: 20px;
line-height: 20px;
text-align: left;
border: 0px solid silver;
border: 0 solid silver;
border-radius: 3px;
margin-right: 11px;
font-weight: normal;
Expand All @@ -530,7 +525,7 @@ html:not(.isBF28) .bf-only {
height: 20px;
line-height: 20px;
text-align: left;
border: 0px solid silver;
border: 0 solid silver;
border-radius: 3px;
margin-right: 11px;
font-weight: normal;
Expand All @@ -539,29 +534,14 @@ html:not(.isBF28) .bf-only {

.header-dialog .gui_box span {
font-style: normal;
font-family: 'open_sansregular', Arial;
font-family: 'open_sansregular', Arial, sans-serif;
line-height: 19px;
color: #7d7d7d;
font-size: 11px;
}

.noline {
border:0px;
}

#content-watermark {
position: absolute;
bottom: 40px;
left: 0;
right: 0;
z-index: -1;
overflow: hidden;
background-image: url("../images/light-wide-2.svg");
background-repeat: no-repeat;
background-position: 95% 20%;
background-size: 430px;
height: 174px;
opacity: 0.15;
border:0;
}

.header-dialog .resetbt {
Expand All @@ -579,11 +559,11 @@ html:not(.isBF28) .bf-only {
}

.header-dialog .leftzero {
padding-left: 0px;
padding-left: 0;
}

.header-dialog .tpa-breakpoint {
border-top-left-radius: 0px;
border-top-left-radius: 0;
}

.header-dialog .roll {
Expand Down

0 comments on commit f547bbb

Please sign in to comment.