Skip to content

Commit

Permalink
tweak font sizing for cross platform uniformity
Browse files Browse the repository at this point in the history
  • Loading branch information
serenackuo committed Sep 1, 2020
1 parent 6d784f3 commit 42bb79e
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 32 deletions.
4 changes: 2 additions & 2 deletions backend/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ function createWindow() {
mainWindow = new BrowserWindow({
width: 1800,
height: 1400,
minWidth: 900,
minHeight: 720,
minWidth: 1500,
minHeight: 1000,
title: 'SeeQR',
show: false,
webPreferences: { nodeIntegration: true, enableRemoteModule: true },
Expand Down
6 changes: 3 additions & 3 deletions frontend/assets/stylesheets/css/components.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
border-radius: 3px;
padding: 5px;
border: none;
font-size: 14px;
font-size: 1em;
outline: none;
}

Expand All @@ -32,7 +32,7 @@
border-radius: 3px;
padding: 5px;
border: none;
font-size: 14px;
font-size: 0.8em;
outline: none;
}

Expand All @@ -57,7 +57,7 @@ table.scroll-box {
background: none;
overflow: scroll;
padding: 5px;
font-size: 14px;
font-size: 1em;
line-height: 1.5em;
}

Expand Down
2 changes: 1 addition & 1 deletion frontend/assets/stylesheets/css/layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
border-radius: 3px;
padding: 10px;
border: none;
font-size: 16px;
font-size: 1em;
font-weight: bold;
color: #2b2d35;
outline: none;
Expand Down
18 changes: 9 additions & 9 deletions frontend/assets/stylesheets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
border-radius: 3px;
padding: 5px;
border: none;
font-size: 14px;
font-size: 1em;
outline: none;
}

Expand All @@ -38,7 +38,7 @@
border-radius: 3px;
padding: 5px;
border: none;
font-size: 14px;
font-size: 0.8em;
outline: none;
}

Expand All @@ -63,7 +63,7 @@ table.scroll-box {
background: none;
overflow: scroll;
padding: 5px;
font-size: 14px;
font-size: 1em;
line-height: 1.5em;
}

Expand Down Expand Up @@ -171,7 +171,7 @@ input *:focus {
border-radius: 3px;
padding: 10px;
border: none;
font-size: 16px;
font-size: 1em;
font-weight: bold;
color: #2b2d35;
outline: none;
Expand Down Expand Up @@ -410,7 +410,7 @@ body {
background-color: #2b2d35;
font-family: "PT Sans", sans-serif;
font-weight: 100;
font-size: 14px;
font-size: 1em;
line-height: 1/5;
color: #c6d2d5;
height: 100%;
Expand All @@ -432,7 +432,7 @@ h4 {
background: none;
overflow: scroll;
padding: 5px;
font-size: 14px;
font-size: 1em;
line-height: 1.5em;
}

Expand All @@ -453,7 +453,7 @@ h4 {
border-radius: 3px;
padding: 5px;
border: none;
font-size: 14px;
font-size: 0.8em;
outline: none;
}

Expand All @@ -464,7 +464,7 @@ h4 {
.delete-query-button {
width: 15px;
background-color: transparent;
font-size: 12px;
font-size: 0.8em;
outline: none;
color: #c6d2d5;
-webkit-box-shadow: none;
Expand All @@ -488,7 +488,7 @@ h4 {
align-content: center;
padding: 10px;
text-decoration: none;
font-family: "PT Mono", monospace;
font-family: 'PT Mono', monospace;
}

.queryItem:hover {
Expand Down
6 changes: 3 additions & 3 deletions frontend/assets/stylesheets/scss/components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
border-radius: 3px;
padding: 5px;
border: none;
font-size: $default-text;
font-size: 1em;
outline: none;
}
button:hover {
Expand All @@ -32,7 +32,7 @@
border-radius: 3px;
padding: 5px;
border: none;
font-size: $default-text;
font-size: 0.8em;
outline: none;
}
button:hover {
Expand Down Expand Up @@ -99,4 +99,4 @@ input {
.input-schema-button {
width: 120px;
margin-bottom: 30px;
}
}
2 changes: 1 addition & 1 deletion frontend/assets/stylesheets/scss/layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
border-radius: 3px;
padding: 10px;
border: none;
font-size: 16px;
font-size: 1em;
font-weight: bold;
color: $background-darkmode;
outline: none;
Expand Down
2 changes: 1 addition & 1 deletion frontend/assets/stylesheets/scss/modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@
display: flex;
flex-direction: row;
justify-content: space-between;
}
}
21 changes: 10 additions & 11 deletions frontend/assets/stylesheets/scss/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ h4 {
background: none;
overflow: scroll;
padding: 5px;
font-size: 14px;
font-size: 1em;
line-height: 1.5em;
}

Expand All @@ -48,37 +48,36 @@ h4 {
flex-direction: column;
}


#add-query-button {
width: 120px;
margin-bottom: 15px;
background-color: #596368;
border-radius: 3px;
padding: 5px;
border: none;
font-size: 14px;
font-size: 0.8em;
outline: none;
}

#add-query-button:hover {
background-color: #c6d2d5;
background-color: #c6d2d5;
}

.delete-query-button {
width: 15px;
background-color: transparent;
font-size: 12px;
font-size: 0.8em;
outline: none;
color: #c6d2d5;
box-shadow: none;
background-repeat:no-repeat;
background-repeat: no-repeat;
border: none;
cursor:pointer;
cursor: pointer;
overflow: hidden;
}

.delete-query-button:hover {
color:rgb(255, 0, 0);
color: rgb(255, 0, 0);
}

.queryItem {
Expand All @@ -89,10 +88,10 @@ h4 {
align-content: center;
padding: 10px;
text-decoration: none;
font-family: "PT Mono", monospace;
font-family: 'PT Mono', monospace;
}

.queryItem:hover {
background-color:#c6d2d5;
background-color: #c6d2d5;
color: #30353a;
}
}
2 changes: 1 addition & 1 deletion frontend/assets/stylesheets/scss/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ $font-stack: 'PT Sans', sans-serif;
$font-input: 'PT Mono', monospace;
$p-weight: 100;
$title-weight: 300;
$default-text: 14px;
$default-text: 1em;

// colors
$background-darkmode: #2b2d35;
Expand Down

0 comments on commit 42bb79e

Please sign in to comment.