Merge pull request #14 from oetiker/caption-2

design updates
ITISFoundation · Jun 26, 2018 · 9676832 · 9676832
2 parents 7b3b4ae + 18ba4f1
commit 9676832
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 26 deletions.
diff --git a/Manifest.json b/Manifest.json
@@ -14,7 +14,7 @@
         "email": "[email protected]"
       }
     ],
-    "version" : "0.0.6",
+    "version" : "0.0.7",
     "qooxdoo-range": "6.0.0-alpha-20180529 - 6.x"
   },
 

diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "build": "qx compile --target=source"
   },
   "name": "qx-osparc-theme",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "repository": {
     "type": "git",
     "url": "git://github.com/ITISFoundation/qx-osparc-theme.git"

diff --git a/source/class/osparc/theme/osparcdark/Appearance.js b/source/class/osparc/theme/osparcdark/Appearance.js
@@ -1284,7 +1284,7 @@ qx.Theme.define("osparc.theme.osparcdark.Appearance", {
           }
           else {
             // empty icon
-            icon = osparc.theme.osparcdark.Image.URLS["blank"];
+            icon = osparc.theme.osparcdark.Image.URLS["checkbox-blank"];
           }
 
           return {
@@ -1305,22 +1305,12 @@ qx.Theme.define("osparc.theme.osparcdark.Appearance", {
 
         decorator += states.invalid && !states.disabled ? "-invalid" : "";
 
-        var padding;
-        // Checked
-        if (states.checked) {
-          padding = 2;
-          // Undetermined
-        }
-        else if (states.undetermined) {
-          padding = [4, 2];
-        }
-
         return {
           decorator:       decorator,
-          width:           12,
-          height:          12,
-          padding:         padding,
-          backgroundColor: "white"
+          //width:           16,
+          //height:          16,
+          padding:         0
+          // backgroundColor: "white"
         };
       }
     },
@@ -1811,6 +1801,7 @@ qx.Theme.define("osparc.theme.osparcdark.Appearance", {
             cursor:      "default",
             font:        states.active ? "bold" : "default",
             marginRight: 20,
+            marginLeft: 4,
             alignY:      "middle"
           };
         }
@@ -1896,7 +1887,8 @@ qx.Theme.define("osparc.theme.osparcdark.Appearance", {
         alias: "window/captionbar", // redirect kids
         style: function(states) {
           return {
-            padding:         1
+            padding:         [0,3,0,3],
+            minHeight:       20
           };
         }
       },
@@ -1905,6 +1897,7 @@ qx.Theme.define("osparc.theme.osparcdark.Appearance", {
         include: "window/title",
         style: function(states) {
           return {
+            marginLeft: 2,
             font:         "small"
           };
         }
@@ -2093,7 +2086,7 @@ qx.Theme.define("osparc.theme.osparcdark.Appearance", {
           return {
             decorator:       "progressbar",
             padding:         1,
-            backgroundColor: "white",
+            backgroundColor: "background",
             width:           200,
             height:          20
           };

diff --git a/source/class/osparc/theme/osparcdark/Decoration.js b/source/class/osparc/theme/osparcdark/Decoration.js
@@ -1186,7 +1186,6 @@ qx.Theme.define("osparc.theme.osparcdark.Decoration",
           {
             style:
               {
-                backgroundColor: "#FFF",
                 width:           1,
                 color:           "border-separator"
               }
@@ -1236,7 +1235,6 @@ qx.Theme.define("osparc.theme.osparcdark.Decoration",
           {
             style:
               {
-                width: 1,
                 color: "button-border"
               }
           },

diff --git a/source/class/osparc/theme/osparcdark/Font.js b/source/class/osparc/theme/osparcdark/Font.js
@@ -75,7 +75,7 @@ qx.Theme.define("osparc.theme.osparcdark.Font", {
 
     "small":
       {
-        size: 11,
+        size: 12,
         family: ["sans-serif"],
         color: "text",
         sources: [
@@ -91,7 +91,7 @@ qx.Theme.define("osparc.theme.osparcdark.Font", {
 
     "monospace":
       {
-        size: 11,
+        size: 13,
         family: ["monospace"],
         color: "text",
         sources: [

diff --git a/source/class/osparc/theme/osparcdark/Image.js b/source/class/osparc/theme/osparcdark/Image.js
@@ -42,8 +42,9 @@ qx.Class.define("osparc.theme.osparcdark.Image",
       "blank" : "qx/static/blank.png",
 
       // checkbox
-      "checkbox-checked" : "decoration/checkbox/checked.png",
-      "checkbox-undetermined" : "decoration/checkbox/undetermined.png",
+      "checkbox-checked" : "@MaterialIcons/check_box/15",
+      "checkbox-blank" : "@MaterialIcons/check_box_outline_blank/15",
+      "checkbox-undetermined" : "@MaterialIcons/indeterminate_check_box/15",
 
       // window
       "window-minimize" : "@MaterialIcons/keyboard_arrow_down",

diff --git a/source/class/widgetbrowser/pages/Window.js b/source/class/widgetbrowser/pages/Window.js
@@ -125,7 +125,7 @@ qx.Class.define("widgetbrowser.pages.Window",
 
 
     __createWindow2 : function() {
-      var win = new qx.ui.window.Window("Second Window", "icon/16/apps/internet-feed-reader.png");
+      var win = new qx.ui.window.Window("Window with window-small-cap appearance");//, "icon/16/apps/internet-feed-reader.png");
       win.setLayout(new qx.ui.layout.VBox(10));
       win.setStatus("Application is ready");
       win.setAppearance("window-small-cap");