Commit 9fc5b493 authored by unknown's avatar unknown

final ui improve

parent 2673c2f0
Pipeline #3310 passed with stage
in 27 seconds
......@@ -56,3 +56,8 @@ After starting <b>docker-compose</b> service as described above, project is avai
For more reading, visit <b>doc</b> folder, which contains project documentation.
## Project repository
Project is available on GitLab repository on
```https://pajda.fit.vutbr.cz/testos/repview```.
\ No newline at end of file
package P;
import java.io.FileNotFoundException;
import java.io.File;
import java.io.FileReader;
public class Data{
public void loadNonExistingFile() {
this.process();
}
private void process() {
try {
File file = new File("X://file.txt"); /* This cause error */
FileReader fr = new FileReader(file);
} catch (FileNotFoundException e){
this.errorDump(10);
}
}
private int errorDump(int val) {
return val / 0; /* main error */
}
}
\ No newline at end of file
package P;
public class MiddleWare{
public void join() {
this.createData();
}
private void createData() {
Data d = new Data();
d.loadNonExistingFile();
}
}
\ No newline at end of file
package P;
public class Starter{
public static void main(String []args){
Starter s = new Starter();
s.foo();
}
public void foo() {
this.bar();
}
public void bar() {
this.baz();
}
public void baz() {
MiddleWare mid = new MiddleWare();
mid.join();
}
}
\ No newline at end of file
Exception in thread "main" java.lang.ArithmeticException: / by zero
at P.Data.errorDump(Data.java:22)
at P.Data.process(Data.java:18)
at P.Data.loadNonExistingFile(Data.java:10)
at P.MiddleWare.createData(MiddleWare.java:11)
at P.MiddleWare.join(MiddleWare.java:6)
at P.Starter.baz(Starter.java:20)
at P.Starter.bar(Starter.java:15)
at P.Starter.foo(Starter.java:11)
at P.Starter.main(Starter.java:7)
\ No newline at end of file
......@@ -3,7 +3,7 @@
<q-separator :color="separator"/>
<div>
<div class="row">
<div class="col-6 text-h5 text-right history" style="padding-bottom: 11px">
<div class="col-6 text-right history" style="padding-bottom: 1.2vh; font-size: 1.7em">
History
</div>
<div class="col-6 column items-end self-center">
......@@ -78,7 +78,7 @@
<q-item-section class="col-1">
<q-icon name="folder_open" size="18px"/>
</q-item-section>
<q-item-section class="q-ma-none col-10" style="font-size: 14px">
<q-item-section class="q-ma-none col-10" style="font-size: 1em">
{{item.bundle.dir}}
</q-item-section>
<q-item-section class="" style="margin-right: -30px"/>
......@@ -87,7 +87,7 @@
<q-card-section
:class="$q.dark.isActive ? 'card-sec': 'card-sec-white'"
class="q-pl-lg"
style="height: 45px; font-size: 14px; cursor: pointer"
style="height: 45px; font-size: 0.887em; cursor: pointer"
v-on:click="loadFile"
>
<q-icon class="" name="insert_drive_file" size="18px"
......@@ -639,8 +639,8 @@ export default {
return this.$q.dark.isActive ? 'dark' : 'bg-grey-2'
},
activeStyleHeaderBorder () {
const border = this.$q.dark.isActive ? '2px solid green' : '1px solid green'
const color = this.$q.dark.isActive ? '#36c616' : 'green'
const border = this.$q.dark.isActive ? '1px solid #fff' : '1px solid green'
const color = this.$q.dark.isActive ? '#4ed554' : 'green'
return {
color: color,
......
......@@ -3,7 +3,7 @@
<q-separator :color="separator"/>
<div class="" id="rep">
<div class="row">
<div class="text-h5 text-right col-8 report" style="padding-bottom: 11px">
<div class="text-right col-8 report" style="padding-bottom: 1.2vh; font-size: 1.7em">
Report
</div>
<div class="col-4 column items-end self-center">
......@@ -65,7 +65,7 @@
</q-card>
</q-dialog>
<q-separator :color="separator" size="20px" style="height: 1px"/>
<div :style="reportBg" class="text-left " style="font-size: 15px!important;" v-if="report">
<div :style="reportBg" class="text-left " style="font-size: 0.97em!important;" v-if="report">
<div v-if="displayScrollBar">
<span style="white-space: pre;">
<q-scroll-area :style="reportStyle" >
......
......@@ -6,7 +6,7 @@
@ajax-stop="ajaxStop"
@response-data="loadFromUpload"
class=".col-12 .col-md-auto q-pa-none q-ma-none"
style="max-height: 140px!important;"
style="max-height: 14vh!important;"
/>
<q-separator color="black" size="20px" style="height: 1px" v-if="!$q.dark.isActive"/>
<div :style="borderXAxis" class="row q-ma-none window-height">
......
......@@ -25,11 +25,9 @@
<q-tab
:key="item.id"
:name="item.id"
:style="paddingDark"
class=" tab"
no-caps
ripple
style="font-size: 14px"
style="font-size: 0.9em"
v-for="item in source">
<div class="q-ml-xs">
<q-icon class="q-bp-xs" name="folder"/>
......@@ -631,7 +629,7 @@ export default {
*/
setEditorProperties (editor) {
editor.editor.setSize(null, '70vh')
editor.editor.getWrapperElement().style['font-size'] = 14 + 'px'
editor.editor.getWrapperElement().style['font-size'] = 0.875 + 'em'
editor.editor.getWrapperElement().style['font-family'] = 'Roboto", "-apple-system", "Helvetica Neue", Helvetica, Arial, sans-serif'
editor.editor.getWrapperElement().style['border-bottom'] = '1px solid white'
const theme = this.$q.dark.isActive ? 'monokai' : 'default'
......@@ -694,7 +692,7 @@ export default {
return this.$q.dark.isActive ? 'border: 1px solid white' : 'border: 1px solid #0079f5 '
},
paddingDark () {
return this.$q.dark.isActive ? ' padding-top: 12x;' : 'padding-top: 14px;'
return this.$q.dark.isActive ? ' padding-top: 13x;' : 'padding-top: 15px;'
},
headerYellow () {
return this.$q.dark.isActive ? 'text-yellow-6' : 'text-deep-purple-13'
......@@ -733,9 +731,9 @@ export default {
}
.tab {
max-width: 150px;
padding-top: 12px;
font-size: 14px;
/*max-width: 150px;*/
/*padding-top: 12px;*/
/*font-size: 0.2em;*/
}
.dark {
......
<template>
<div :class="backgroundDark" class="q-pt-sm " id="adas">
<div class="row font" id="obalovaci">
<div class="col-10 column justify-end q-pb-sm" style="max-height: 90px">
<div class="col-10 column " style="max-height: 6.1em">
<div class="col-6" style="margin-left: 57px">
<div class="q-pa-none row justify-center">
<div class="col-10 ">
......@@ -27,9 +27,8 @@
class="bg-grey-2 col-12"
dense
label="Choose a tool"
option-label="test"
option-value="test_val"
style="max-width: 250px"
input-style="max-width: 250px; height: inherit"
v-model="tools">
<template v-slot:prepend>
<q-icon class="q-ml-sm"
......@@ -77,6 +76,7 @@
multiple
ref="qfile"
style="max-width: 250px"
input-style="font-size: 0.85em"
v-model="files"
hide-bottom-space
>
......@@ -90,7 +90,7 @@
dense
label="Upload"
outline
style="width: 80px; max-height: 40px"
style="width: 80px; max-height: 35px; margin-top: 10px"
>
<template v-slot:loading>
<q-spinner-gears/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment