src/CacheSim/Model.elm

@@ -17,6 +17,5 @@ type Msg
     | UseHierarchy (Maybe CacheModelHierarchy)
     | Access (List Int)
     | ChangeAccessInput String
-    | AccessViewCancel
     | AccessViewForward
     | AccessViewBack

src/CacheSim/Update.elm

@@ -60,14 +60,6 @@ updateAccess li m =
     in
         (newModel, cmd)
 
-updateAccessViewCancel : Model -> (Model, Cmd Msg)
-updateAccessViewCancel m =
-    let
-        newModel = { m | accessView = Nothing }
-        cmd = Cmd.none
-    in
-        (newModel, cmd)
-
 updateAccessViewForward : Model -> (Model, Cmd Msg)
 updateAccessViewForward m =
     let

src/CacheSim/View.elm

@@ -22,9 +22,6 @@ disabledButton attrs = button (attrs ++ [ disabled True ])
 dangerButton : String -> Msg -> Html Msg
 dangerButton s m = button [ onClick m, class "btn-danger" ] s
 
-infoButton : String -> Msg -> Html Msg
-infoButton s m = button [ onClick m, class "btn-info" ] s
-
 primaryButton : String -> Msg -> Html Msg
 primaryButton s m = button [ onClick m, class "btn-primary" ] s
 
@@ -42,10 +39,7 @@ resultButton = maybeButton << Result.toMaybe
 
 -- Button wrapper (button group)
 buttonWrapper : List (Html Msg) -> Html Msg
-buttonWrapper = div [ classList [("btn-group", True), ("mb-3", True), ("mr-3", True) ] ]
-
-buttonToolbar : List (List (Html Msg)) -> Html Msg
-buttonToolbar ll = div [ class "btn-toolbar" ] <| List.map buttonWrapper ll
+buttonWrapper = div [ classList [("btn-group", True), ("mb-3", True) ] ]
 
 -- Input with a label
 labeledInput : String -> String -> (String -> Msg) -> Html Msg
@@ -108,8 +102,8 @@ viewRawCacheModelHierarchy rcmh =
                 Ok _ -> viewError True ""
                 Err e -> viewError False e
         
-        newButton = infoButton "Add level" CreateRawModel
-        useButton = resultButton checkedResult [ class "btn-info" ] "Start simulation" (UseHierarchy << Just) 
+        newButton = primaryButton "Add level" CreateRawModel
+        useButton = resultButton checkedResult [ class "btn-primary" ] "Start simulation" (UseHierarchy << Just) 
     in
         div []
             [ h2 [] [ text "Cache hierarchy" ]
@@ -169,9 +163,9 @@ viewAccessView m av =
     div []
         [ h2 [] [ text "Access Simulation" ]
         , p [] [ text ("Simulating access of address " ++ String.fromInt av.blockAddr) ]
-        , buttonToolbar
-            [ [ infoButton "Back" AccessViewBack, infoButton "Forward" AccessViewForward ]
-            , [ dangerButton "Stop" AccessViewCancel ]
+        , buttonWrapper
+            [ primaryButton "Back" AccessViewBack
+            , primaryButton "Forward" AccessViewForward
             ]
         , h3 [] [ text "Access event log" ]
         , viewAccessLog av
@@ -222,12 +216,12 @@ viewAccessInput m =
             case parseResult of
                 Ok is -> if is == [] then Err "Please enter at least one number." else Ok is
                 Err e -> Err <| parseErrorToString e
-        accessButton = resultButton checkedResult [ class "btn-info" ] "Access address" Access
+        accessButton = resultButton checkedResult [ class "btn-primary" ] "Access address" Access
         errorHtml =
             case checkedResult of
                 Ok _ -> viewError True ""
                 Err e -> viewError False e
-        editHierarchyButton = button [ onClick (UseHierarchy Nothing), class "btn-dark" ] "Edit hierarchy"
+        editHierarchyButton = secondaryButton "Edit hierarchy" (UseHierarchy Nothing)
     in
         div []
             [ h2 [] [ text "Run access simulation" ]

src/Main.elm

@@ -35,7 +35,6 @@ update msg m =
         UseHierarchy cmh -> updateUseHierarchy cmh m
         Access i -> updateAccess i m
         ChangeAccessInput s -> ({ m | accessInput = s }, Cmd.none)
-        AccessViewCancel -> updateAccessViewCancel m
         AccessViewForward -> updateAccessViewForward m
         AccessViewBack -> updateAccessViewBack m
 

static/scss/style.scss

@@ -1,7 +1,3 @@
 .btn-group {
     width: min-content;
 }
-
-.btn:focus {
-    box-shadow: none;
-}