-
diff --git a/main.js b/main.js
index 4d5672a6..9209ba78 100644
--- a/main.js
+++ b/main.js
@@ -78,6 +78,8 @@ el.app.on('ready', () => {
y,
width,
height,
+ minWidth: 900,
+ minHeight: 650,
show: 0,
...(!D.win && !D.mac && { icon: `${__dirname}/D.png` }),
backgroundColor: '#7688d9',
diff --git a/style/less/colour/connect_page.less b/style/less/colour/connect_page.less
index 07e93e12..2d723048 100644
--- a/style/less/colour/connect_page.less
+++ b/style/less/colour/connect_page.less
@@ -45,6 +45,7 @@
outline: dotted black 1px;
}
>div{
+ border: 1px solid @DLG_BOTTOM_BG;
background:@CN_FAV_BTN_BG;
color:@CN_FAV_BTN_FG;
&:not(:first-child) {
@@ -56,11 +57,11 @@
}
}
}
-#cn_lhs {
- background: @CN_LHS_BG;
-}
-#cn, #cn_rhs {
- background: linear-gradient(@CN_RHS_BG, @CN_RHS_BG2);
+#cn, #cn_lhs, #cn_rhs {
+ background-color: @CN_BG;
+ select{
+ background-color: @CN_INPUT_BG;
+ }
}
#cn_env_add {
color: @CN_LABEL_COL;
@@ -79,3 +80,7 @@
font-family: monospace;
}
}
+.cn_head {
+ background-color: @DLG_BOTTOM_BG;
+ color: @CN_INPUT_FG;
+}
diff --git a/style/less/colour/inputs.less b/style/less/colour/inputs.less
index aa947627..a27d6442 100644
--- a/style/less/colour/inputs.less
+++ b/style/less/colour/inputs.less
@@ -55,7 +55,7 @@ input:disabled+label{
}
}
select{
- background-color: @CN_SELECT_BG;
+ background-color: @CN_INPUT_BG;
border: 1px solid @CN_INPUT_BORDER_COL;
color:@CN_SELECT_FG;
}
diff --git a/style/less/colour/preferences.less b/style/less/colour/preferences.less
index 96f4d619..ca27ac78 100644
--- a/style/less/colour/preferences.less
+++ b/style/less/colour/preferences.less
@@ -17,7 +17,7 @@
}
#prf_content {
select{
- background-color: @CN_SELECT_BG;
+ background-color: @CN_INPUT_BG;
color:@CN_SELECT_FG;
}
h2 {
diff --git a/style/less/layout/connect_page.less b/style/less/layout/connect_page.less
index aa6c2420..1cfffd8e 100644
--- a/style/less/layout/connect_page.less
+++ b/style/less/layout/connect_page.less
@@ -1,3 +1,6 @@
+@CN_CONTENT_TOP: 34px;
+@CN_CONTENT_BTM: 64px;
+
#cn {
position: absolute;
z-index:2;
@@ -49,20 +52,20 @@
}
#cn_favs {
- position:absolute;
- top: 0;
+ position: absolute;
+ top: @CN_CONTENT_TOP;
left: 0;
right: 0;
- bottom: 64px;
+ bottom: @CN_CONTENT_BTM;
overflow: auto;
>div {
- line-height: 46px;
+ line-height: 36px;
padding: 0 2px 0 8px;
margin-bottom: 1px;
cursor: default;
.go {
float: right;
- margin-top:6px;
+ margin-top:2px;
margin-right:5px;
width:32px;
height:32px;
@@ -108,12 +111,15 @@
#cn_rhs_inner {
overflow-y: auto;
overflow-x: hidden;
- padding: 10px;
- height:calc(100% - 64px);
+ padding: 2px 8px;
+ height:calc(100% - @CN_CONTENT_BTM - @CN_CONTENT_TOP);
button{
padding:8px;
width: auto;
}
+ .row .col-sm-12:first-child {
+ padding-bottom: 2px;
+ }
.col{
// >input,>select,>button{
>input:not([type=checkbox]),>select{
@@ -163,4 +169,12 @@
#cn_args, #cn_env {
width:100%;
+}
+.cn_head {
+ width:100%;
+ height: @CN_CONTENT_TOP;
+ display: flex;
+ align-items: center;
+ font-weight: 500;
+ padding: 0 8px;
}
\ No newline at end of file
diff --git a/style/less/themes/base.less b/style/less/themes/base.less
index 82538a10..c3c49065 100644
--- a/style/less/themes/base.less
+++ b/style/less/themes/base.less
@@ -6,6 +6,7 @@
@THEME_DARK: darken(@THEME_PRIMARY, 25);
@THEME_HIGHLIGHT: lighten(@THEME_PRIMARY, 10);
@THEME_SECONDARY_DIM:darken(@THEME_SECONDARY,5);
+@THEME_SECONDARY_DARK:darken(@THEME_SECONDARY,10);
@THEME_SECONDARY_HL:lighten(@THEME_SECONDARY,5);
@THEME_WIN_BG:@THEME_PRIMARY;
@THEME_WIN_FG:black;
@@ -15,12 +16,9 @@
@DYALOG_LOGO_IMG:url(img/dyalog.png);
@RIDE_LOGO_IMG:url(img/RideLogo.png);
@SPLASH_IMG:url(img/RideSplash-Blue.png);
-@CN_LHS_BG:@THEME_SECONDARY_DIM;
-@CN_RHS_BG:@THEME_SECONDARY;
-@CN_RHS_BG2:@THEME_SECONDARY;
-@CN_INPUT_BG:@CN_LHS_BG;
+@CN_BG:@THEME_SECONDARY;
+@CN_INPUT_BG:@THEME_SECONDARY_DIM;
@CN_INPUT_FG:black;
-@CN_SELECT_BG:@CN_LHS_BG;
@CN_SELECT_FG:@THEME_DIMMED;
@CN_INPUT_BORDER_COL:fade(#a9a9a9,30);
@CN_INPUT_DIS_BG:@CN_INPUT_BORDER_COL;
@@ -34,7 +32,7 @@
@CN_FAV_BTN_SEL_FG:white;
@CN_FAV_MENU_BTN_BG:transparent;
@CN_FAV_MENU_BTN_FG:@THEME_PRIMARY;
-@CN_FAV_GO_BORDER:@CN_LHS_BG;
+@CN_FAV_GO_BORDER:@THEME_SECONDARY_DIM;
@CN_RHS_BUTTON_BG:@THEME_PRIMARY;
@CN_RHS_BUTTON_FG:@THEME_DARKGREY;
@CN_LABEL_COL:@LABEL_COL;
diff --git a/style/less/themes/dark.less b/style/less/themes/dark.less
index e6f3f6b8..86076d52 100644
--- a/style/less/themes/dark.less
+++ b/style/less/themes/dark.less
@@ -1,9 +1,7 @@
@THEME_SECONDARY:#272937;
@THEME_WIN_BG:@THEME_SECONDARY_DIM;
@THEME_WIN_FG:white;
-@CN_LHS_BG:@THEME_SECONDARY;
-@CN_RHS_BG:@THEME_SECONDARY_DIM;
-@CN_RHS_BG2:black;
+@CN_BG:@THEME_SECONDARY_DARK;
@CN_INPUT_FG:white;
@CN_SELECT_FG:white;
@CN_FAV_BTN_BG:lighten(@THEME_WIN_BG,2);
diff --git a/style/less/themes/light.less b/style/less/themes/light.less
index ec690c15..0c4c3991 100644
--- a/style/less/themes/light.less
+++ b/style/less/themes/light.less
@@ -1,9 +1,7 @@
@THEME_SECONDARY:#edeff5;
@THEME_WIN_BG:@THEME_PRIMARY;
@THEME_WIN_FG:black;
-@CN_LHS_BG:@THEME_SECONDARY_DIM;
-@CN_RHS_BG:@THEME_SECONDARY;
-@CN_RHS_BG2:@THEME_SECONDARY;
+@CN_BG:@THEME_SECONDARY;
@CN_INPUT_FG:black;
@CN_SELECT_FG:@THEME_DIMMED;
@CN_FAV_BTN_BG:lighten(@THEME_SECONDARY,2);