Merge pull request #16 from Blakeinstein/master

unified white style ui design

3 files changed, 100 insertions, 105 deletions

diff --git a/src/main/resources/base/app.qss b/src/main/resources/base/app.qss
index 723bfa3..a733a50 100644
--- a/src/main/resources/base/app.qss
+++ b/src/main/resources/base/app.qss
@@ -1,8 +1,30 @@
+/*
+    background darker = #004646
+    background dark and slighly darker = #007A7A
+    background dark = #006666
+    background normal and slighly darker = #008F8F
+    background normal = #00B8B8
+    background light = #EBFFFF
+    background lighter = #ffffff
+
+    lists background = #006666
+    lists background (alternate) = #008F8F
+    lists backgrounds selection = #00E0E0
+
+    foreground = black
+
+    selection darker = #004646
+    selection dark = #006666
+    selection normal = #008F8F
+    selection inbetween normal and light = #00B8B8 (used to build SpinBoxes)
+    selection light = #00E0E0
+    selection lighter = #D6FFFF 
+*/
 QLineEdit {
     color: #ffffff;
     background-color: #b6b6b6;
     selection-color: black;
-    selection-background-color: #5e90fa;
+    selection-background-color: #00E0E0;
     /* Padding and margin defined */
     border-style: solid;
     border: 1px solid #b6b6b6; /* border top color defined after QAbstractSpinBox, QLineEdit and QComboBox */
@@ -15,86 +37,116 @@ QLineEdit {
 QLineEdit:focus{
     border-color: #7cabf9;
 }
-
-QFrame{
-    background-color: white;
-}
-
-QTabBar {
+tabBarPlus {
     qproperty-drawBase: 0;
     left: 5px;
     background-color: transparent;
+    font-size: 15px;
 }
 
-QTabBar:focus {
+tabBarPlus:focus {
     border: 0px transparent black;
 }
 
-QTabBar::close-button {
+tabBarPlus::close-button {
     padding: 0px;
     margin: 0px;
     border-radius: 2px;
-    background-image: url("src/main/resources/base/ui/close.svg");
+    background-image: url("src/main/resources/base/ui/close.png");
     background-position: center center;
     background-repeat: none;
 }
 
-QTabBar::close-button:hover {
-    background-color: #7cabf9;
+tabBarPlus::close-button:hover {
+    background-color: #006666;
 }
 
-QTabBar::close-button:pressed {
+tabBarPlus::close-button:pressed {
     background-color: #adc5ed;
 }
 
-QTabBar::scroller { /* the width of the scroll buttons */
+tabBarPlus::scroller { /* the width of the scroll buttons */
     width: 20px;
 }
 
-QTabBar::tab:top,
-QTabBar::tab:bottom {
+tabBarPlus::tab:top,
+tabBarPlus::tab:bottom {
     color: black;
     border: 1px solid #b6b6b6;
     border-left-color: #e6e6e6;
     border-right-width: 0px;
     background-color: white;
-    padding:0px 15px;
+    padding:5px 15px;
+    width: 100px;
 }
 
-QTabBar::tab:top:first,
-QTabBar::tab:bottom:first {
+tabBarPlus::tab:top:first,
+tabBarPlus::tab:bottom:first {
     border-top-left-radius: 6px;
     border-bottom-left-radius: 6px;
 }
 
-QTabBar::tab:top:last,
-QTabBar::tab:bottom:last {
+tabBarPlus::tab:top:last,
+tabBarPlus::tab:bottom:last {
     border-top-right-radius: 6px;
     border-bottom-right-radius: 6px;
     border-right-width: 1px;
 }
 
-QTabBar::tab:top:selected,
-QTabBar::tab:bottom:selected {
-    color: black;
-    background-color: qlineargradient(spread:pad, x1:1, y1:0.545, x2:1, y2:0, stop:0 #3874f2, stop:1 #5e90fa);
-    border-color: #3874f2;
+tabBarPlus::tab:top:selected,
+tabBarPlus::tab:bottom:selected {
+    color: white;
+    background-color: qlineargradient(spread:pad, x1:1, y1:0.545, x2:1, y2:0, stop:0 #00b0b0, stop:1 #00BaBa);
+    border-color: #006666;
 }
 
-QTabBar::tab:top:!selected:hover,
-QTabBar::tab:bottom:!selected:hover {
+tabBarPlus::tab:top:!selected:hover,
+tabBarPlus::tab:bottom:!selected:hover {
     color: black;
 }
 
-QTabBar::tab:top:only-one ,
-QTabBar::tab:bottom:only-one {
+tabBarPlus::tab:top:only-one ,
+tabBarPlus::tab:bottom:only-one {
     border: 1px solid #1b3774;
     border-radius: 6px;
 }
-
-QDockWidget {
+fileWindow {
+    border-width: 2px;
+    outline: 0;
     color: white;
     background-color: white;
+}
+fileWindow::title{
+    color: black;
+    border-width: 0px;
+    text-align: center;
+    background-color: white;
+}
+fileWindow::close-button {
+    padding: 0px;
+    margin: 0px;
+    border-radius: 2px;
+    background-image: url("src/main/resources/base/ui/close.png");
+    background-position: center center;
+    background-repeat: none;
+}
+fileWindow::close-button:hover {
+    background-color: #004646;
+}
+
+fileWindow::close-button:pressed {
+    background-color: #adc5ed;
+}
+
+QMainWindow {
+    background-color: white;
+}
+
+QDockWidget#Title {
+    background-color: #004646;
+}
+QDockWidget#Toolbar{
+    background-color: white;
     border: 1px solid #e6e6e6;
 }
 
@@ -123,6 +175,10 @@ QScrollArea{
     border-width: 0px;
 }
 
+QWidget#ToolbarScrollWidget {
+    background-color: white;
+}
+
 QToolButton {
     color: #f2f2f2;
     text-align: center;
@@ -135,7 +191,7 @@ QToolButton {
 QToolButton:hover,
 QToolButton:focus {
     color: black;
-    border: 3px solid #3874f2;
+    border: 3px solid #00BaBa;
 }
 
 QToolButton:disabled,
@@ -146,32 +202,33 @@ QToolButton:disabled:checked {
 }
 
 QToolButton:pressed {
-    border-color: #7cabf9;
+    border-color: #004646;
 }
 
 QToolButton:checked {
-    background-color: #5e90fa;
-    border-color: #3874f2;
+    background-color: #006666;
+    border-color: #004646;
 }
 
 sectionLabel{
-    border-color: gray;
+    border-color: #BBD0E9;
     border-style: solid;
-    border-width: 0px 0px 1px 0px;
+    border-width: 0px 0px 2px 0px;
     padding-bottom: 3px;
     margin-bottom: 3px;
     margin-top: 10px;
     text-align: left;
     font-size: 20px;
+    color: gray;
 }
 
-sectionLabel:first-child{
+sectionLabel:first{
     margin-top: 0px;
 }
 
 customView QPushButton{
-    background: rgba(214, 54, 40, 50%);
-    border: 1px groove white;
+    background-color: rgba(214, 54, 40, 50%);
+    border: 1px dashed white;
     border-radius: 2px;
     font-size: 18px;
     font-weight: Bold;
@@ -179,8 +236,7 @@ customView QPushButton{
     color: rgba(255, 255, 255, 50%);
 }
 customView QPushButton:Hover{
-    background: rgba(214, 54, 40, 90%);
-    color: rgba(255, 255, 255, 90%);            
+    background-color: rgba(214, 54, 40, 90%);  
 }
 
 customTabWidget QPushButton{
@@ -188,7 +244,6 @@ customTabWidget QPushButton{
     padding: 1px;
     border: 0px solid #E6E6E3;
     border-radius: 10px;
-    top: -5px;
 }
 customTabWidget QPushButton:hover{
     background: rgba(230, 230, 227, 60%);
@@ -200,4 +255,4 @@ customTabWidget::pane {
     border-radius: 7px;
     padding: 1px;
     background-color: #E6E6E3;
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/base/ui/close.png b/src/main/resources/base/ui/close.png
new file mode 100644
index 0000000..8771a0b
--- /dev/null
+++ b/src/main/resources/base/ui/close.png
diff --git a/src/main/resources/base/ui/close.svg b/src/main/resources/base/ui/close.svg
deleted file mode 100644
index cb1c174..0000000
--- a/src/main/resources/base/ui/close.svg
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
-   sodipodi:docname="close.svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 10 10"><metadata
-   id="metadata10">
-  <rdf:RDF>
-    <cc:Work
-       rdf:about="">
-      <dc:format>image/svg+xml</dc:format>
-      <dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-    </cc:Work>
-  </rdf:RDF>
-</metadata>
-<defs
-   id="defs8" />
-<sodipodi:namedview
-   inkscape:current-layer="svg4"
-   inkscape:window-maximized="1"
-   inkscape:window-y="-9"
-   inkscape:window-x="-9"
-   inkscape:cy="7.585194"
-   inkscape:cx="2.5623729"
-   inkscape:zoom="42.1"
-   showgrid="false"
-   id="namedview6"
-   inkscape:window-height="1013"
-   inkscape:window-width="1920"
-   inkscape:pageshadow="2"
-   inkscape:pageopacity="0"
-   guidetolerance="10"
-   gridtolerance="10"
-   objecttolerance="10"
-   borderopacity="1"
-   bordercolor="#666666"
-   pagecolor="#ffffff" />
-<text
-   id="text2" />
-2 y=8&gt;×<text
-   id="text837"
-   y="11.016971"
-   x="-2.6576188"
-   style="font-style:normal;font-weight:normal;font-size:18.834px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.470852"
-   xml:space="preserve"><tspan
-     style="stroke-width:0.470852"
-     y="11.016971"
-     x="-2.6576188"
-     id="tspan835"
-     sodipodi:role="line">×</tspan></text>
-</svg>