Darragh Burke %!s(int64=5) %!d(string=hai) anos
pai
achega
fa888eab84

+ 13 - 14
inspector/src/components/actionTabs/tabs/propertyGrids/materials/textures/textureEditor.scss

@@ -79,6 +79,7 @@
                 }
                 }
                 label {
                 label {
                     margin-left: 15px;
                     margin-left: 15px;
+                    font-size: 15px;
                     color: #afafaf;
                     color: #afafaf;
                     input {
                     input {
                         width: 40px;
                         width: 40px;
@@ -86,8 +87,10 @@
                         background-color: #000000;
                         background-color: #000000;
                         color: #ffffff;
                         color: #ffffff;
                         border: 0;
                         border: 0;
-                        padding-left: 4px;
                         font-size: 12px;
                         font-size: 12px;
+                        text-align: center;
+                        font-family: 'acumin-pro-condensed';
+                        font-size: 15px;
                     }
                     }
         
         
                     &:last-of-type {
                     &:last-of-type {
@@ -110,6 +113,9 @@
             &:first-of-type {
             &:first-of-type {
                 margin-left: 15px;
                 margin-left: 15px;
             }
             }
+            &:last-of-type {
+                padding-right: 15px;
+            }
             width: 45px;
             width: 45px;
             color: #afafaf;
             color: #afafaf;
             display: flex;
             display: flex;
@@ -119,6 +125,7 @@
                 width: 30px;
                 width: 30px;
                 color: white;
                 color: white;
             }
             }
+            font-size: 15px;
         }
         }
     }
     }
     
     
@@ -161,11 +168,6 @@
             }
             }
         }
         }
 
 
-        #color-picker {
-            position: absolute;
-            margin-left: 40px;
-        }
-
         #color {
         #color {
             margin-top: 8px;
             margin-top: 8px;
             #active-color-bg {
             #active-color-bg {
@@ -187,14 +189,7 @@
                 border-radius: 50%;
                 border-radius: 50%;
             }
             }
         }
         }
-        .color-picker-cover {
-            position: fixed;
-            top: 0;
-            left: 0;
-            right: 0;
-            bottom: 0;
-        }
-        .color-picker {
+        #color-picker {
             position: absolute;
             position: absolute;
             margin-left: 40px;
             margin-left: 40px;
         }
         }
@@ -222,6 +217,10 @@
             &:hover {
             &:hover {
                 cursor: pointer;
                 cursor: pointer;
             }
             }
+
+            &:last-of-type {
+                border-bottom: none;
+            }
         }
         }
         user-select: none;
         user-select: none;
     }
     }

+ 1 - 1
inspector/src/components/actionTabs/tabs/propertyGrids/materials/textures/toolBar.tsx

@@ -74,7 +74,7 @@ export class ToolBar extends React.Component<IToolBarProps, IToolBarState> {
             </div>
             </div>
             {
             {
                 this.props.pickerOpen &&
                 this.props.pickerOpen &&
-                <div className='color-picker' ref={this.props.pickerRef}>
+                <div id='color-picker' ref={this.props.pickerRef}>
                     <SketchPicker color={this.computeRGBAColor()}  onChange={color => this.props.setMetadata({color: color.hex, alpha: color.rgb.a})}/>
                     <SketchPicker color={this.computeRGBAColor()}  onChange={color => this.props.setMetadata({color: color.hex, alpha: color.rgb.a})}/>
                 </div>
                 </div>
             }
             }