Adjust styles and margins

chstan · Jan 31, 2020 · a94794f · a94794f
1 parent 2a5dbf2
commit a94794f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/daquiri/panels/basic_instrument_panel.py b/daquiri/panels/basic_instrument_panel.py
@@ -191,7 +191,7 @@ def layout(self):
         write_controls = []
 
         if not self.axis.readonly:
-            write_controls = [horizontal('Write', line_edit('', id=f'{self.id}-edit'), button('Set', id=f'{self.id}-set')),]
+            write_controls = [horizontal('Write', line_edit('', id=f'{self.id}-edit'), button('Set', id=f'{self.id}-set', class_name='primary')),]
             if self.joggable:
                 jog_controls = [
                     horizontal('Jog',
@@ -203,7 +203,7 @@ def layout(self):
         return vertical(
             group(
                 'Driver',
-                horizontal('Read', label('Last Value', id=f'{self.id}-last_value'), button('Read', id=f'{self.id}-read')),
+                horizontal('Read', label('Last Value', id=f'{self.id}-last_value'), button('Read', id=f'{self.id}-read', class_name='primary')),
                 *write_controls,
                 *jog_controls,
                 *live_plots,

diff --git a/daquiri/panels/experiment_panel.py b/daquiri/panels/experiment_panel.py
@@ -195,7 +195,7 @@ def move_item_down(*_):
 
             self.update_queue_ui()
 
-        remove_button = button('Remove')
+        remove_button = button('Remove', class_name="warning")
         remove_button.subject.subscribe(remove_this_item)
         copy_button = button('Copy')
         copy_button.subject.subscribe(copy_this_item)
@@ -401,7 +401,7 @@ def layout_queue_content(self):
         with CollectUI(self.queue_ui):
             queue_page = splitter(
                 vertical(
-                    button('Clear Queue', id='clear-queue'),
+                    button('Clear Queue', id='clear-queue', class_name="warning"),
                 ),
                 vertical(
                     id='queue-layout',
@@ -433,27 +433,33 @@ def layout(self):
         with CollectUI(ui):
             vertical(
                 horizontal(
-                    button('Start', id='start'),
-                    button('Add to Q', id='enqueue'),
+                    button('Start', id='start', class_name="primary"),
+                    button('Add to Q', id='enqueue', class_name="primary"),
                     button('Pause', id='pause'),
-                    button('Stop', id='stop'),
+                    button('Stop', id='stop', class_name="warning"),
                     label('Waiting...', id='status-box'),
                     self.layout_timing_group(),
                     min_height=120,
+                    class_name="experiment_header",
+                    spacing=20,
+                    content_margin=(20, 0, 0, 0),
                 ),
                 tabs(*[
                     ['Scan', splitter(
                         vertical(
                             horizontal(
                                 'Use',
                                 combo_box([s.__name__ for s in scan_methods], id='selected_scan_method'),
+                                content_margin=20,
+                                class_name="which_scan",
                             ),
                             tabs(
                                 ['Scans', tabs(
-                                    *self.layout_scan_methods(scan_methods)
+                                    *self.layout_scan_methods(scan_methods),
                                 )],
                                 *self.extra_panels,
                             ),
+                            class_name="scans",
                         ),
                         vertical(
                             '[Data Streams]',

diff --git a/daquiri/panels/instrument_manager.py b/daquiri/panels/instrument_manager.py
@@ -74,10 +74,12 @@ def layout(self):
                 'Instrument Manager',
                 horizontal(
                     vertical(*[button(f'Restart {panel_name}', id=f'restart-{panel_name}')
-                               for panel_name in self.panel_order]),
+                               for panel_name in self.panel_order], spacing=8),
                     vertical(*[led(None, shape=Led.circle, id='indicator-{}'.format(panel_name))
-                               for panel_name in self.panel_order]),
+                               for panel_name in self.panel_order], spacing=8),
+                    spacing=8,
                 ),
+                content_margin=20,
                 widget=self,
             )