rebase

Author: Anastasia-Nikitina

src/main/kotlin/solve/importer/view/ControlPanel.kt

@@ -19,8 +19,8 @@ import solve.importer.model.FrameAfterPartialParsing
 import solve.main.MainController
 import solve.main.MainView
 import solve.project.controller.ProjectController
-import solve.styles.ControlButtonsSpacing
 import solve.styles.Style
+import solve.styles.Style.ControlButtonsSpacing
 import solve.utils.createAlertForError
 import solve.utils.loadResourcesImage
 import solve.utils.materialfx.ControlButtonWidth

src/main/kotlin/solve/sidepanel/tabs/SidePanelTabsView.kt

@@ -49,20 +49,10 @@ open class SidePanelTabsView : View() {
             styleClass.add(tab.name.lowercase())
             contentDisplay = ContentDisplay.TOP
             style =
-<<<<<<< HEAD
-<<<<<<< HEAD
-                "-fx-font-family: ${Style.font}; -fx-font-weight:700; -fx-font-size: ${Style.buttonFontSize}; -fx-background-radius: 36"
-=======
-                "-fx-font-family: ${Style.font}; -fx-font-weight:700;" +
-                " -fx-font-size: ${Style.buttonFontSize}; -fx-background-radius: 36"
-=======
                 "-fx-font-family: ${Style.Font}; -fx-font-weight:700;" +
                 " -fx-font-size: ${Style.ButtonFontSize}; -fx-background-radius: 36"
->>>>>>> 9318fe2 (Update filter settings dialog design and add a logic)
-
             isFocusTraversable = false
             tooltip(tab.tooltip)
->>>>>>> 020c720 (Tootips shortcuts)
             setPrefSize(72.0, 72.0)
             usePrefSize = true
 

src/main/kotlin/solve/styles/Style.kt

@@ -59,20 +59,10 @@ object Style {
         "-fx-font-family: $Font; -fx-font-weight:700; -fx-font-size: $ButtonFontSize; " +
             "-fx-text-fill: $PrimaryColorLight; -fx-background-radius: 36"
 
-    fun circleForRipple(button: MFXButton) = Circle(button.layoutX + 36.0, button.layoutY + 36.0, 35.0)
-
-<<<<<<< HEAD
-    fun circleForRipple(button: ToggleButton) = Circle(button.layoutX + 36.0, button.layoutY + 36.0,35.0)
-<<<<<<< HEAD
-}
-=======
-}
->>>>>>> 0ab1432 (removed unused)
-=======
-    fun circleForRipple(button: ToggleButton) = Circle(button.layoutX + 36.0, button.layoutY + 36.0, 35.0)
+    const val ControlButtonsSpacing = 10.0
 
     const val HeaderFontSize = "20px"
+    fun circleForRipple(button: MFXButton) = Circle(button.layoutX + 36.0, button.layoutY + 36.0, 35.0)
 
-    const val ControlButtonsSpacing = 10.0
+    fun circleForRipple(button: ToggleButton) = Circle(button.layoutX + 36.0, button.layoutY + 36.0,35.0)
 }
->>>>>>> 3dc5231 (codestyle)