From 67233cbf1e47054e58f31998d1d22b6273c5bb54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Dietrich?= Date: Tue, 11 Jul 2023 13:16:56 +0200 Subject: [PATCH 01/19] Add checkbox for hiding navigation --- src/elm/Lia/Settings/Types.elm | 2 ++ src/elm/Lia/Settings/Update.elm | 5 +++++ src/elm/Lia/Settings/View.elm | 28 ++++++++++++++++++++++++- src/scss/04_objects/_object.canvas.scss | 4 ++++ 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/src/elm/Lia/Settings/Types.elm b/src/elm/Lia/Settings/Types.elm index 3b8be6159..5e89c0bdf 100644 --- a/src/elm/Lia/Settings/Types.elm +++ b/src/elm/Lia/Settings/Types.elm @@ -32,6 +32,7 @@ type alias Settings = , showQRCode : Bool , tts : TTS , chat : { show : Bool, updates : Bool } + , navigation : Bool } @@ -86,6 +87,7 @@ init hasShareApi mode = { show = False , updates = False } + , navigation = True } diff --git a/src/elm/Lia/Settings/Update.elm b/src/elm/Lia/Settings/Update.elm index 1a8416f24..e8df3e501 100644 --- a/src/elm/Lia/Settings/Update.elm +++ b/src/elm/Lia/Settings/Update.elm @@ -49,6 +49,7 @@ type Toggle | TranslateWithGoogle | Tooltips | PreferBrowserTTS + | Navigation update : @@ -245,6 +246,10 @@ update main msg model = |> Return.val |> Return.batchEvent (Service.TTS.preferBrowser newPreference) + Toggle Navigation -> + { model | navigation = not model.navigation } + |> log Nothing + Toggle TranslateWithGoogle -> { model | translateWithGoogle = diff --git a/src/elm/Lia/Settings/View.elm b/src/elm/Lia/Settings/View.elm index b1b518989..a02c0e455 100644 --- a/src/elm/Lia/Settings/View.elm +++ b/src/elm/Lia/Settings/View.elm @@ -80,6 +80,12 @@ design model = Slides -> "lia-mode--slides" + , Attr.class <| + if model.navigation then + "lia-navigation--visible" + + else + "lia-navigation--hidden" ] @@ -201,10 +207,30 @@ viewModes : (List (Attribute Msg) -> List (Attribute Msg)) -> Lang -> Bool -> Se viewModes grouping lang tabbable settings = [ viewMode grouping lang tabbable Textbook settings.mode "lia-mode-textbook" "icon-book" "mb-1" , viewMode grouping lang tabbable Presentation settings.mode "lia-mode-presentation" "icon-presentation" "mb-1" - , viewMode grouping lang tabbable Slides settings.mode "lia-mode-slides" "icon-slides" "" + , viewMode grouping lang tabbable Slides settings.mode "lia-mode-slides" "icon-slides" "mb-2" + , viewHideNavigation grouping lang tabbable settings ] +viewHideNavigation grouping lang tabbable settings = + Html.label + [ Attr.class "lia-label" + , A11y_Widget.hidden (not tabbable) + ] + [ Html.input + (grouping + [ Attr.class "lia-checkbox" + , Attr.type_ "checkbox" + , Attr.checked (not settings.navigation) + , onClick (Toggle Navigation) + , A11y_Key.tabbable tabbable + ] + ) + [] + , Html.text "Hide Navigation" + ] + + viewMode : (List (Attribute Msg) -> List (Attribute Msg)) -> Lang -> Bool -> Mode -> Mode -> String -> String -> String -> Html Msg viewMode grouping lang tabbable mode activeMode id iconName additionalCSSClass = Html.button diff --git a/src/scss/04_objects/_object.canvas.scss b/src/scss/04_objects/_object.canvas.scss index 7130bd274..a60ad8ee1 100644 --- a/src/scss/04_objects/_object.canvas.scss +++ b/src/scss/04_objects/_object.canvas.scss @@ -153,4 +153,8 @@ $slide-margin-left-textbook: 19rem !default; } } } + + &.lia-navigation--hide { + + } } From f73a21ed7f256d2a81824d28a03a2614a77a2f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Dietrich?= Date: Tue, 11 Jul 2023 14:03:35 +0200 Subject: [PATCH 02/19] First hover styling --- src/scss/04_objects/_object.canvas.scss | 51 ++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/src/scss/04_objects/_object.canvas.scss b/src/scss/04_objects/_object.canvas.scss index a60ad8ee1..0211075e7 100644 --- a/src/scss/04_objects/_object.canvas.scss +++ b/src/scss/04_objects/_object.canvas.scss @@ -154,7 +154,54 @@ $slide-margin-left-textbook: 19rem !default; } } - &.lia-navigation--hide { - + &.lia-navigation--hidden { + .lia-slide { + height: calc(100vh - 14.2rem + 7rem); + } + + .lia-slide { + height: 100vh; + } + + .lia-header { + height: 4px; + padding: 0px; + + .lia-header__left, .lia-header__middle, .lia-header__right { + display: none; + } + } + + .lia-header:hover { + height: 7.8rem; + padding: 1rem 0; + + .lia-header__left, .lia-header__middle, .lia-header__right { + display: block; + } + } + + .lia-slide__footer { + position: absolute; + max-height: 8px; + // padding: 0px; + bottom: 0px; + + + } + + .lia-slide__footer:hover { + position: absolute; + max-height: 400px; + // height: 8.5rem; + // padding: 1rem 0; + bottom: 0px; + + + } + + .lia-slide__container { + margin-top: 0px; + } } } From eba303ebc4fa796c87c4ba865394ba77f281e428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Dietrich?= Date: Tue, 11 Jul 2023 18:43:51 +0200 Subject: [PATCH 03/19] Header styled --- src/scss/04_objects/_object.canvas.scss | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/scss/04_objects/_object.canvas.scss b/src/scss/04_objects/_object.canvas.scss index 0211075e7..e2884ee1c 100644 --- a/src/scss/04_objects/_object.canvas.scss +++ b/src/scss/04_objects/_object.canvas.scss @@ -155,6 +155,10 @@ $slide-margin-left-textbook: 19rem !default; } &.lia-navigation--hidden { + .lia-slide__content { + margin: 0 2rem; + } + .lia-slide { height: calc(100vh - 14.2rem + 7rem); } @@ -164,8 +168,8 @@ $slide-margin-left-textbook: 19rem !default; } .lia-header { - height: 4px; - padding: 0px; + max-height: 4px; + padding: unset; .lia-header__left, .lia-header__middle, .lia-header__right { display: none; @@ -173,17 +177,19 @@ $slide-margin-left-textbook: 19rem !default; } .lia-header:hover { - height: 7.8rem; + max-height: unset; padding: 1rem 0; .lia-header__left, .lia-header__middle, .lia-header__right { display: block; } } + + .lia-slide__footer { - position: absolute; - max-height: 8px; + position: sticky; + max-height: 8px; // padding: 0px; bottom: 0px; @@ -191,8 +197,8 @@ $slide-margin-left-textbook: 19rem !default; } .lia-slide__footer:hover { - position: absolute; - max-height: 400px; + position: sticky; + max-height: 400px; // height: 8.5rem; // padding: 1rem 0; bottom: 0px; From ad584e7779fb765f3ea6d3184bec9bf64754aebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Dietrich?= Date: Tue, 11 Jul 2023 20:45:23 +0200 Subject: [PATCH 04/19] footnote hover not working for slides --- src/scss/04_objects/_object.canvas.scss | 40 ++++++++++++++----------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/src/scss/04_objects/_object.canvas.scss b/src/scss/04_objects/_object.canvas.scss index e2884ee1c..1f9dfae27 100644 --- a/src/scss/04_objects/_object.canvas.scss +++ b/src/scss/04_objects/_object.canvas.scss @@ -158,10 +158,6 @@ $slide-margin-left-textbook: 19rem !default; .lia-slide__content { margin: 0 2rem; } - - .lia-slide { - height: calc(100vh - 14.2rem + 7rem); - } .lia-slide { height: 100vh; @@ -185,26 +181,36 @@ $slide-margin-left-textbook: 19rem !default; } } - - .lia-slide__footer { - position: sticky; + position: fixed; max-height: 8px; - // padding: 0px; + //padding: 0px; bottom: 0px; - - + z-index: 100; } - + .lia-slide__footer:hover { - position: sticky; - max-height: 400px; - // height: 8.5rem; - // padding: 1rem 0; + position: unset; + max-height: unset; + //padding: 1rem 0; + bottom: unset; + } + + + .lia-notes { + position: fixed; + max-height: 8px; + //padding: 0px; bottom: 0px; - - + z-index: 100; } + + .lia-notes:hover { + position: unset; + max-height: unset; + //padding: 1rem 0; + bottom: unset; + } .lia-slide__container { margin-top: 0px; From 8d23f7a0ec23e20bf7630ff4de53d9f83a85d8cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Dietrich?= Date: Wed, 12 Jul 2023 21:14:01 +0200 Subject: [PATCH 05/19] Add breakpoint for notes --- src/scss/04_objects/_object.canvas.scss | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/scss/04_objects/_object.canvas.scss b/src/scss/04_objects/_object.canvas.scss index 1f9dfae27..f25577dff 100644 --- a/src/scss/04_objects/_object.canvas.scss +++ b/src/scss/04_objects/_object.canvas.scss @@ -196,21 +196,14 @@ $slide-margin-left-textbook: 19rem !default; bottom: unset; } - - .lia-notes { - position: fixed; - max-height: 8px; - //padding: 0px; - bottom: 0px; - z-index: 100; + @include breakpoint("lg", "max") { + .lia-notes { + //position: fixed; + max-height: 4px; + //padding: 0px; + bottom: 0px; + } } - - .lia-notes:hover { - position: unset; - max-height: unset; - //padding: 1rem 0; - bottom: unset; - } .lia-slide__container { margin-top: 0px; From 346e5632bc2846441f2889a063bf31292495ed47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Dietrich?= Date: Wed, 12 Jul 2023 23:11:19 +0200 Subject: [PATCH 06/19] resize support menu on fullscreen --- src/elm/Lia/Settings/Update.elm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/elm/Lia/Settings/Update.elm b/src/elm/Lia/Settings/Update.elm index e8df3e501..245140d80 100644 --- a/src/elm/Lia/Settings/Update.elm +++ b/src/elm/Lia/Settings/Update.elm @@ -247,7 +247,15 @@ update main msg model = |> Return.batchEvent (Service.TTS.preferBrowser newPreference) Toggle Navigation -> - { model | navigation = not model.navigation } + { model + | navigation = not model.navigation + , support_menu = + if model.navigation then + False + + else + model.support_menu + } |> log Nothing Toggle TranslateWithGoogle -> From 03c25cbeb3e0d6192bfa929edab0f1b62505fde9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Dietrich?= Date: Thu, 13 Jul 2023 18:00:15 +0200 Subject: [PATCH 07/19] no hover, does not work with touch --- src/scss/04_objects/_object.canvas.scss | 43 +++++++++---------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/src/scss/04_objects/_object.canvas.scss b/src/scss/04_objects/_object.canvas.scss index f25577dff..a9ba4faf8 100644 --- a/src/scss/04_objects/_object.canvas.scss +++ b/src/scss/04_objects/_object.canvas.scss @@ -162,38 +162,27 @@ $slide-margin-left-textbook: 19rem !default; .lia-slide { height: 100vh; } - - .lia-header { - max-height: 4px; - padding: unset; - - .lia-header__left, .lia-header__middle, .lia-header__right { - display: none; - } + + #lia-btn-toc { + //transform: translate(2.2rem, -50%); + top: 0.8rem; + padding: 0; } - - .lia-header:hover { - max-height: unset; - padding: 1rem 0; - - .lia-header__left, .lia-header__middle, .lia-header__right { - display: block; + + .lia-toc--closed { + & #lia-btn-toc { + transform: translate(2.5rem, -50%); } } - .lia-slide__footer { - position: fixed; - max-height: 8px; - //padding: 0px; - bottom: 0px; - z-index: 100; + .lia-toc--open { + & #lia-btn-toc { + transform: translate(0rem, -50%); + } } - - .lia-slide__footer:hover { - position: unset; - max-height: unset; - //padding: 1rem 0; - bottom: unset; + + .lia-header, .lia-slide__footer { + display: none; } @include breakpoint("lg", "max") { From 20a64ce97de06f131b8b4177b32081e8a0583bbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Dietrich?= Date: Thu, 13 Jul 2023 18:01:07 +0200 Subject: [PATCH 08/19] Change hide navigation to button --- src/elm/Lia/Settings/View.elm | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/elm/Lia/Settings/View.elm b/src/elm/Lia/Settings/View.elm index a02c0e455..f2fa76292 100644 --- a/src/elm/Lia/Settings/View.elm +++ b/src/elm/Lia/Settings/View.elm @@ -1,5 +1,6 @@ module Lia.Settings.View exposing ( btnIndex + , btnNavigation , btnSupport , design , header @@ -208,25 +209,29 @@ viewModes grouping lang tabbable settings = [ viewMode grouping lang tabbable Textbook settings.mode "lia-mode-textbook" "icon-book" "mb-1" , viewMode grouping lang tabbable Presentation settings.mode "lia-mode-presentation" "icon-presentation" "mb-1" , viewMode grouping lang tabbable Slides settings.mode "lia-mode-slides" "icon-slides" "mb-2" - , viewHideNavigation grouping lang tabbable settings + , btnNavigation (Just grouping) lang tabbable ] -viewHideNavigation grouping lang tabbable settings = +btnNavigation : Maybe (List (Attribute Msg) -> List (Attribute Msg)) -> Lang -> Bool -> Html Msg +btnNavigation grouping lang tabbable = Html.label [ Attr.class "lia-label" , A11y_Widget.hidden (not tabbable) ] - [ Html.input - (grouping - [ Attr.class "lia-checkbox" - , Attr.type_ "checkbox" - , Attr.checked (not settings.navigation) - , onClick (Toggle Navigation) - , A11y_Key.tabbable tabbable - ] + [ btnIcon + { title = "Hide Navigation" + , tabbable = tabbable + , icon = "icon-slides" + , msg = Just (Toggle Navigation) + } + (case grouping of + Just grp -> + grp [ Attr.class "lia-btn--transparent" ] + + _ -> + [ Attr.id "lia-btn-nav", Attr.class "lia-btn--transparent" ] ) - [] , Html.text "Hide Navigation" ] From d7559f7642ad2494fa0ad5d67f4adf7711a22246 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Dietrich?= Date: Mon, 17 Jul 2023 11:17:00 +0200 Subject: [PATCH 09/19] Base navigation added --- src/assets/fonts/icon/_icons.scss | 157 ++++++++++++------------ src/assets/fonts/icon/fonts/icon.eot | Bin 13992 -> 14048 bytes src/assets/fonts/icon/fonts/icon.svg | 151 ++++++++++++----------- src/assets/fonts/icon/fonts/icon.ttf | Bin 13840 -> 13896 bytes src/assets/fonts/icon/fonts/icon.woff | Bin 8208 -> 8188 bytes src/assets/fonts/icon/fonts/icon.woff2 | Bin 6800 -> 6776 bytes src/assets/fonts/icon/icons.css | 148 +++++++++++----------- src/assets/icons/beaker.svg | 5 - src/elm/Lia/Settings/Update.elm | 10 +- src/elm/Lia/Settings/View.elm | 46 +++---- src/scss/04_objects/_object.canvas.scss | 80 ++++++++---- 11 files changed, 317 insertions(+), 280 deletions(-) delete mode 100644 src/assets/icons/beaker.svg diff --git a/src/assets/fonts/icon/_icons.scss b/src/assets/fonts/icon/_icons.scss index 538b1542e..7a1fc1364 100644 --- a/src/assets/fonts/icon/_icons.scss +++ b/src/assets/fonts/icon/_icons.scss @@ -240,362 +240,367 @@ $icon-barchart: "\EA05"; content: $icon-barchart } -$icon-beaker: "\EA06"; -.icon-beaker:before { - content: $icon-beaker -} - -$icon-book: "\EA07"; +$icon-book: "\EA06"; .icon-book:before { content: $icon-book } -$icon-boxplot: "\EA08"; +$icon-boxplot: "\EA07"; .icon-boxplot:before { content: $icon-boxplot } -$icon-chat-close: "\EA09"; +$icon-chat-close: "\EA08"; .icon-chat-close:before { content: $icon-chat-close } -$icon-chat-new: "\EA0A"; +$icon-chat-new: "\EA09"; .icon-chat-new:before { content: $icon-chat-new } -$icon-chat-open: "\EA0B"; +$icon-chat-open: "\EA0A"; .icon-chat-open:before { content: $icon-chat-open } -$icon-check: "\EA0C"; +$icon-check: "\EA0B"; .icon-check:before { content: $icon-check } -$icon-chevron-double-left: "\EA0D"; +$icon-chevron-double-left: "\EA0C"; .icon-chevron-double-left:before { content: $icon-chevron-double-left } -$icon-chevron-double-right: "\EA0E"; +$icon-chevron-double-right: "\EA0D"; .icon-chevron-double-right:before { content: $icon-chevron-double-right } -$icon-chevron-down: "\EA0F"; +$icon-chevron-down: "\EA0E"; .icon-chevron-down:before { content: $icon-chevron-down } -$icon-chevron-left: "\EA10"; +$icon-chevron-left: "\EA0F"; .icon-chevron-left:before { content: $icon-chevron-left } -$icon-chevron-right: "\EA11"; +$icon-chevron-right: "\EA10"; .icon-chevron-right:before { content: $icon-chevron-right } -$icon-chevron-up: "\EA12"; +$icon-chevron-up: "\EA11"; .icon-chevron-up:before { content: $icon-chevron-up } -$icon-class-off: "\EA13"; +$icon-class-off: "\EA12"; .icon-class-off:before { content: $icon-class-off } -$icon-class-on: "\EA14"; +$icon-class-on: "\EA13"; .icon-class-on:before { content: $icon-class-on } -$icon-clock: "\EA15"; +$icon-clock: "\EA14"; .icon-clock:before { content: $icon-clock } -$icon-close: "\EA16"; +$icon-close: "\EA15"; .icon-close:before { content: $icon-close } -$icon-code: "\EA17"; +$icon-code: "\EA16"; .icon-code:before { content: $icon-code } -$icon-compile-circle: "\EA18"; +$icon-compile-circle: "\EA17"; .icon-compile-circle:before { content: $icon-compile-circle } -$icon-darkmode: "\EA19"; +$icon-darkmode: "\EA18"; .icon-darkmode:before { content: $icon-darkmode } -$icon-download: "\EA1A"; +$icon-download: "\EA19"; .icon-download:before { content: $icon-download } -$icon-edrys: "\EA1B"; +$icon-edrys: "\EA1A"; .icon-edrys:before { content: $icon-edrys } -$icon-end-left: "\EA1C"; +$icon-end-left: "\EA1B"; .icon-end-left:before { content: $icon-end-left } -$icon-end-right: "\EA1D"; +$icon-end-right: "\EA1C"; .icon-end-right:before { content: $icon-end-right } -$icon-funnel: "\EA1E"; +$icon-funnel: "\EA1D"; .icon-funnel:before { content: $icon-funnel } -$icon-graph: "\EA1F"; +$icon-graph: "\EA1E"; .icon-graph:before { content: $icon-graph } -$icon-grid: "\EA20"; +$icon-grid: "\EA1F"; .icon-grid:before { content: $icon-grid } -$icon-gundb: "\EA21"; +$icon-gundb: "\EA20"; .icon-gundb:before { content: $icon-gundb } -$icon-heatmap: "\EA22"; +$icon-heatmap: "\EA21"; .icon-heatmap:before { content: $icon-heatmap } -$icon-hint: "\EA23"; +$icon-hint: "\EA22"; .icon-hint:before { content: $icon-hint } -$icon-info: "\EA24"; +$icon-info: "\EA23"; .icon-info:before { content: $icon-info } -$icon-jitsi: "\EA25"; +$icon-jitsi: "\EA24"; .icon-jitsi:before { content: $icon-jitsi } -$icon-lightmode: "\EA26"; +$icon-lightmode: "\EA25"; .icon-lightmode:before { content: $icon-lightmode } -$icon-lineplot: "\EA27"; +$icon-lineplot: "\EA26"; .icon-lineplot:before { content: $icon-lineplot } -$icon-list-1: "\EA28"; +$icon-list-1: "\EA27"; .icon-list-1:before { content: $icon-list-1 } -$icon-list-2: "\EA29"; +$icon-list-2: "\EA28"; .icon-list-2:before { content: $icon-list-2 } -$icon-list-3: "\EA2A"; +$icon-list-3: "\EA29"; .icon-list-3:before { content: $icon-list-3 } -$icon-login: "\EA2B"; +$icon-login: "\EA2A"; .icon-login:before { content: $icon-login } -$icon-mail: "\EA2C"; +$icon-mail: "\EA2B"; .icon-mail:before { content: $icon-mail } -$icon-map: "\EA2D"; +$icon-map: "\EA2C"; .icon-map:before { content: $icon-map } -$icon-matrix: "\EA2E"; +$icon-matrix: "\EA2D"; .icon-matrix:before { content: $icon-matrix } -$icon-minus: "\EA2F"; +$icon-minus: "\EA2E"; .icon-minus:before { content: $icon-minus } -$icon-more: "\EA30"; +$icon-more: "\EA2F"; .icon-more:before { content: $icon-more } -$icon-parallel: "\EA31"; +$icon-navigation-hide: "\EA30"; +.icon-navigation-hide:before { + content: $icon-navigation-hide +} + +$icon-navigation-show: "\EA31"; +.icon-navigation-show:before { + content: $icon-navigation-show +} + +$icon-parallel: "\EA32"; .icon-parallel:before { content: $icon-parallel } -$icon-pencil: "\EA32"; +$icon-pencil: "\EA33"; .icon-pencil:before { content: $icon-pencil } -$icon-person: "\EA33"; +$icon-person: "\EA34"; .icon-person:before { content: $icon-person } -$icon-piechart: "\EA34"; +$icon-piechart: "\EA35"; .icon-piechart:before { content: $icon-piechart } -$icon-play-circle: "\EA35"; +$icon-play-circle: "\EA36"; .icon-play-circle:before { content: $icon-play-circle } -$icon-plus: "\EA36"; +$icon-plus: "\EA37"; .icon-plus:before { content: $icon-plus } -$icon-presentation: "\EA37"; +$icon-presentation: "\EA38"; .icon-presentation:before { content: $icon-presentation } -$icon-pubnub: "\EA38"; +$icon-pubnub: "\EA39"; .icon-pubnub:before { content: $icon-pubnub } -$icon-radar: "\EA39"; +$icon-radar: "\EA3A"; .icon-radar:before { content: $icon-radar } -$icon-refresh: "\EA3A"; +$icon-refresh: "\EA3B"; .icon-refresh:before { content: $icon-refresh } -$icon-resolve: "\EA3B"; +$icon-resolve: "\EA3C"; .icon-resolve:before { content: $icon-resolve } -$icon-sankey: "\EA3C"; +$icon-sankey: "\EA3D"; .icon-sankey:before { content: $icon-sankey } -$icon-scatterplot: "\EA3D"; +$icon-scatterplot: "\EA3E"; .icon-scatterplot:before { content: $icon-scatterplot } -$icon-search: "\EA3E"; +$icon-search: "\EA3F"; .icon-search:before { content: $icon-search } -$icon-send: "\EA3F"; +$icon-send: "\EA40"; .icon-send:before { content: $icon-send } -$icon-settings: "\EA40"; +$icon-settings: "\EA41"; .icon-settings:before { content: $icon-settings } -$icon-slides: "\EA41"; +$icon-slides: "\EA42"; .icon-slides:before { content: $icon-slides } -$icon-social: "\EA42"; +$icon-social: "\EA43"; .icon-social:before { content: $icon-social } -$icon-sort-asc: "\EA43"; +$icon-sort-asc: "\EA44"; .icon-sort-asc:before { content: $icon-sort-asc } -$icon-sort-desc: "\EA44"; +$icon-sort-desc: "\EA45"; .icon-sort-desc:before { content: $icon-sort-desc } -$icon-sound-off: "\EA45"; +$icon-sound-off: "\EA46"; .icon-sound-off:before { content: $icon-sound-off } -$icon-sound-on: "\EA46"; +$icon-sound-on: "\EA47"; .icon-sound-on:before { content: $icon-sound-on } -$icon-stop-circle: "\EA47"; +$icon-stop-circle: "\EA48"; .icon-stop-circle:before { content: $icon-stop-circle } -$icon-sync: "\EA48"; +$icon-sync: "\EA49"; .icon-sync:before { content: $icon-sync } -$icon-table: "\EA49"; +$icon-table: "\EA4A"; .icon-table:before { content: $icon-table } -$icon-trash: "\EA4A"; +$icon-trash: "\EA4B"; .icon-trash:before { content: $icon-trash } -$icon-warning: "\EA4B"; +$icon-warning: "\EA4C"; .icon-warning:before { content: $icon-warning } -$icon-zoom-out: "\EA4C"; +$icon-zoom-out: "\EA4D"; .icon-zoom-out:before { content: $icon-zoom-out } -$icon-zoom: "\EA4D"; +$icon-zoom: "\EA4E"; .icon-zoom:before { content: $icon-zoom } diff --git a/src/assets/fonts/icon/fonts/icon.eot b/src/assets/fonts/icon/fonts/icon.eot index 3c8c70b4a1adec5e48ed9b064cd42e2b58981399..245b763629efd71ee2ce771bbbde4d2b1113b340 100644 GIT binary patch delta 717 zcmaJ;T}V@L6hG&G?{)Lu&AYp$v`dKB(#%pKzanNz4<$j<2NCL}F1mRK`%oNZAE<;v z4-v_Io1+$iNKuR?GD0GH2oYHXzW6dmgvJONMV}9|GePR91Hb?I{+)C9FNAU-A=eJj zGb?oPOEbC7+3uT@2>`qc00V;|eI!}`BM89N00{HL!R!9_Q>quB+yFRy-|*=}weN0U zq}m*z-Jk%s!_JYtOgLnOqT_Mg`AU2r37%kNP&c|p^8nTr$|pkl_y`8@DCPE(UlZ0t zz70(+dj@d)Cj~c0B4g3!7s@8Ui5xBAGyCyiT`wRN6FPGLP@Hi5xSutZowja#{+l+=P`}z zSYV9pWA*GLo93)sH+PAf;#PUaSM$&Lw|rI*g$W^D7PNRQ%huZR6|qtDiiUVkjES$s ztYnj}NMR`^ElXM3XMC2>1cHid#S0iK z`qA$$&bi52!&Y?%wlW#aWT^c=937P!acF-z+~_aPp?{CW0(n(Ut7__@mR0E2CR*YQ n`%Ja9Ej7?Ogf((lzZw|Uqk%}c$p{Sj{`JR<$Tjn2+cv@w;e8zpHM8(l^5>1HGS(n`Td(2J-p zB(M)bWJrYiPL`zh|uZ@$eJ?jsn1qPF3mKnf`GBfGY(MChqh+>N4c2qX32!K-KeXMoIfVJpDu5 z4MHSK0j|grv8?FpK9XcZ}X;_Y^hr z&38h42M}1NV4<(~VSoI(*8mV&rY2go6qZ-E0}`3w@sH2nwp{uRGNSBX|=Rv4DHb$pS3KQml&&vSscHH^NPF zUwDa+@wfPGK@_|~tFR>OiL<&P-Cuo&q?hhWFQggitF$JA?3J&{ujKdgn(?ABYn(71 zm?EZDQ`$UjUbTppM$4>a+gf2gm9Q>azuQ`DY1^b|Aeaq3}7;(_PUP}AJ ztXKqK$PnC6MZ>vDoM!abV7L)$LvB}n#N~FCh;A;_h;`u_R_-^W(~G!S8Xp)Ph{p#K zO;KN!>|`j28^L7I6S`a(NCtyR?5}S~91@7-;q=TT3qslHgB40v#zH3p$&O@z)|20p j8eI9$zI7XY#$;_yi-zlTVn;^l&OFGg;WTPHb=&^{!!4v| diff --git a/src/assets/fonts/icon/fonts/icon.svg b/src/assets/fonts/icon/fonts/icon.svg index 043b82d18..229af8e88 100644 --- a/src/assets/fonts/icon/fonts/icon.svg +++ b/src/assets/fonts/icon/fonts/icon.svg @@ -22,221 +22,224 @@ - - + + diff --git a/src/assets/fonts/icon/fonts/icon.ttf b/src/assets/fonts/icon/fonts/icon.ttf index 05478caf754e9142cd91c9ad345239009224982f..ea5889cb1153aa9e1c3a0a9476eaba7c5ae0f6c3 100644 GIT binary patch delta 722 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 delta 7832 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 diff --git a/src/assets/fonts/icon/icons.css b/src/assets/fonts/icon/icons.css index a8acb59f2..85901c523 100644 --- a/src/assets/fonts/icon/icons.css +++ b/src/assets/fonts/icon/icons.css @@ -235,294 +235,298 @@ content: "\EA05" } -.icon-beaker:before { +.icon-book:before { content: "\EA06" } -.icon-book:before { +.icon-boxplot:before { content: "\EA07" } -.icon-boxplot:before { +.icon-chat-close:before { content: "\EA08" } -.icon-chat-close:before { +.icon-chat-new:before { content: "\EA09" } -.icon-chat-new:before { +.icon-chat-open:before { content: "\EA0A" } -.icon-chat-open:before { +.icon-check:before { content: "\EA0B" } -.icon-check:before { +.icon-chevron-double-left:before { content: "\EA0C" } -.icon-chevron-double-left:before { +.icon-chevron-double-right:before { content: "\EA0D" } -.icon-chevron-double-right:before { +.icon-chevron-down:before { content: "\EA0E" } -.icon-chevron-down:before { +.icon-chevron-left:before { content: "\EA0F" } -.icon-chevron-left:before { +.icon-chevron-right:before { content: "\EA10" } -.icon-chevron-right:before { +.icon-chevron-up:before { content: "\EA11" } -.icon-chevron-up:before { +.icon-class-off:before { content: "\EA12" } -.icon-class-off:before { +.icon-class-on:before { content: "\EA13" } -.icon-class-on:before { +.icon-clock:before { content: "\EA14" } -.icon-clock:before { +.icon-close:before { content: "\EA15" } -.icon-close:before { +.icon-code:before { content: "\EA16" } -.icon-code:before { +.icon-compile-circle:before { content: "\EA17" } -.icon-compile-circle:before { +.icon-darkmode:before { content: "\EA18" } -.icon-darkmode:before { +.icon-download:before { content: "\EA19" } -.icon-download:before { +.icon-edrys:before { content: "\EA1A" } -.icon-edrys:before { +.icon-end-left:before { content: "\EA1B" } -.icon-end-left:before { +.icon-end-right:before { content: "\EA1C" } -.icon-end-right:before { +.icon-funnel:before { content: "\EA1D" } -.icon-funnel:before { +.icon-graph:before { content: "\EA1E" } -.icon-graph:before { +.icon-grid:before { content: "\EA1F" } -.icon-grid:before { +.icon-gundb:before { content: "\EA20" } -.icon-gundb:before { +.icon-heatmap:before { content: "\EA21" } -.icon-heatmap:before { +.icon-hint:before { content: "\EA22" } -.icon-hint:before { +.icon-info:before { content: "\EA23" } -.icon-info:before { +.icon-jitsi:before { content: "\EA24" } -.icon-jitsi:before { +.icon-lightmode:before { content: "\EA25" } -.icon-lightmode:before { +.icon-lineplot:before { content: "\EA26" } -.icon-lineplot:before { +.icon-list-1:before { content: "\EA27" } -.icon-list-1:before { +.icon-list-2:before { content: "\EA28" } -.icon-list-2:before { +.icon-list-3:before { content: "\EA29" } -.icon-list-3:before { +.icon-login:before { content: "\EA2A" } -.icon-login:before { +.icon-mail:before { content: "\EA2B" } -.icon-mail:before { +.icon-map:before { content: "\EA2C" } -.icon-map:before { +.icon-matrix:before { content: "\EA2D" } -.icon-matrix:before { +.icon-minus:before { content: "\EA2E" } -.icon-minus:before { +.icon-more:before { content: "\EA2F" } -.icon-more:before { +.icon-navigation-hide:before { content: "\EA30" } -.icon-parallel:before { +.icon-navigation-show:before { content: "\EA31" } -.icon-pencil:before { +.icon-parallel:before { content: "\EA32" } -.icon-person:before { +.icon-pencil:before { content: "\EA33" } -.icon-piechart:before { +.icon-person:before { content: "\EA34" } -.icon-play-circle:before { +.icon-piechart:before { content: "\EA35" } -.icon-plus:before { +.icon-play-circle:before { content: "\EA36" } -.icon-presentation:before { +.icon-plus:before { content: "\EA37" } -.icon-pubnub:before { +.icon-presentation:before { content: "\EA38" } -.icon-radar:before { +.icon-pubnub:before { content: "\EA39" } -.icon-refresh:before { +.icon-radar:before { content: "\EA3A" } -.icon-resolve:before { +.icon-refresh:before { content: "\EA3B" } -.icon-sankey:before { +.icon-resolve:before { content: "\EA3C" } -.icon-scatterplot:before { +.icon-sankey:before { content: "\EA3D" } -.icon-search:before { +.icon-scatterplot:before { content: "\EA3E" } -.icon-send:before { +.icon-search:before { content: "\EA3F" } -.icon-settings:before { +.icon-send:before { content: "\EA40" } -.icon-slides:before { +.icon-settings:before { content: "\EA41" } -.icon-social:before { +.icon-slides:before { content: "\EA42" } -.icon-sort-asc:before { +.icon-social:before { content: "\EA43" } -.icon-sort-desc:before { +.icon-sort-asc:before { content: "\EA44" } -.icon-sound-off:before { +.icon-sort-desc:before { content: "\EA45" } -.icon-sound-on:before { +.icon-sound-off:before { content: "\EA46" } -.icon-stop-circle:before { +.icon-sound-on:before { content: "\EA47" } -.icon-sync:before { +.icon-stop-circle:before { content: "\EA48" } -.icon-table:before { +.icon-sync:before { content: "\EA49" } -.icon-trash:before { +.icon-table:before { content: "\EA4A" } -.icon-warning:before { +.icon-trash:before { content: "\EA4B" } -.icon-zoom-out:before { +.icon-warning:before { content: "\EA4C" } -.icon-zoom:before { +.icon-zoom-out:before { content: "\EA4D" } +.icon-zoom:before { + content: "\EA4E" +} + @font-face { font-family: "icon"; diff --git a/src/assets/icons/beaker.svg b/src/assets/icons/beaker.svg deleted file mode 100644 index eb27e9ca0..000000000 --- a/src/assets/icons/beaker.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/elm/Lia/Settings/Update.elm b/src/elm/Lia/Settings/Update.elm index 245140d80..e8df3e501 100644 --- a/src/elm/Lia/Settings/Update.elm +++ b/src/elm/Lia/Settings/Update.elm @@ -247,15 +247,7 @@ update main msg model = |> Return.batchEvent (Service.TTS.preferBrowser newPreference) Toggle Navigation -> - { model - | navigation = not model.navigation - , support_menu = - if model.navigation then - False - - else - model.support_menu - } + { model | navigation = not model.navigation } |> log Nothing Toggle TranslateWithGoogle -> diff --git a/src/elm/Lia/Settings/View.elm b/src/elm/Lia/Settings/View.elm index f2fa76292..0b63bf67e 100644 --- a/src/elm/Lia/Settings/View.elm +++ b/src/elm/Lia/Settings/View.elm @@ -1,6 +1,5 @@ module Lia.Settings.View exposing ( btnIndex - , btnNavigation , btnSupport , design , header @@ -209,30 +208,35 @@ viewModes grouping lang tabbable settings = [ viewMode grouping lang tabbable Textbook settings.mode "lia-mode-textbook" "icon-book" "mb-1" , viewMode grouping lang tabbable Presentation settings.mode "lia-mode-presentation" "icon-presentation" "mb-1" , viewMode grouping lang tabbable Slides settings.mode "lia-mode-slides" "icon-slides" "mb-2" - , btnNavigation (Just grouping) lang tabbable + , btnNavigation grouping lang tabbable settings.navigation ] -btnNavigation : Maybe (List (Attribute Msg) -> List (Attribute Msg)) -> Lang -> Bool -> Html Msg -btnNavigation grouping lang tabbable = - Html.label - [ Attr.class "lia-label" - , A11y_Widget.hidden (not tabbable) - ] - [ btnIcon - { title = "Hide Navigation" - , tabbable = tabbable - , icon = "icon-slides" - , msg = Just (Toggle Navigation) - } - (case grouping of - Just grp -> - grp [ Attr.class "lia-btn--transparent" ] +btnNavigation : (List (Attribute Msg) -> List (Attribute Msg)) -> Lang -> Bool -> Bool -> Html Msg +btnNavigation grouping lang tabbable navigation = + Html.button + (grouping + [ Attr.class <| "lia-btn lia-btn--transparent " + , onClick (Toggle Navigation) + , A11y_Key.onKeyDown [ A11y_Key.enter (Toggle Navigation) ] + , A11y_Key.tabbable tabbable + , A11y_Widget.hidden (not tabbable) + , A11y_Role.menuItem + ] + ) + [ Html.i + [ A11y_Widget.hidden True + , Attr.class <| + "lia-btn__icon icon " + ++ (if navigation then + "icon-navigation-hide" - _ -> - [ Attr.id "lia-btn-nav", Attr.class "lia-btn--transparent" ] - ) - , Html.text "Hide Navigation" + else + "icon-navigation-show" + ) + ] + [] + , Html.span [ Attr.class "lia-btn__text" ] [ Html.text "Navigation" ] ] diff --git a/src/scss/04_objects/_object.canvas.scss b/src/scss/04_objects/_object.canvas.scss index a9ba4faf8..a4711cc08 100644 --- a/src/scss/04_objects/_object.canvas.scss +++ b/src/scss/04_objects/_object.canvas.scss @@ -29,7 +29,7 @@ $slide-margin-left-textbook: 19rem !default; width: 100vw; overflow-x: hidden; - @include breakpoint("sm", "max") { + @include breakpoint('sm', 'max') { /* push support-menu-toggler to the right if toc is open, prevent that buttons overlay each other */ &.lia-toc--visible #lia-btn-support { @@ -52,7 +52,7 @@ $slide-margin-left-textbook: 19rem !default; } } - @include breakpoint("sm") { + @include breakpoint('sm') { &.lia-toc--visible { left: $toc-width-desktop; width: calc(100% - #{$toc-width-desktop}); @@ -76,14 +76,14 @@ $slide-margin-left-textbook: 19rem !default; } } - @include breakpoint("md") { + @include breakpoint('md') { &.lia-toc--visible.lia-mode--presentation .lia-slide__content, &.lia-toc--visible.lia-mode--textbook .lia-slide__content { //width: auto; } } - @include breakpoint("lg") { + @include breakpoint('lg') { flex-direction: row; &.lia-support--visible { @@ -98,7 +98,7 @@ $slide-margin-left-textbook: 19rem !default; height: calc(100vh - 14.2rem + 7rem); } - @include breakpoint("lg") { + @include breakpoint('lg') { .lia-header { right: $notes-width-desktop; } @@ -116,11 +116,11 @@ $slide-margin-left-textbook: 19rem !default; max-width: calc(71.1rem + #{$slide-margin-left-textbook} + 3rem); padding-left: 3rem !important; - @include breakpoint("sm") { + @include breakpoint('sm') { margin: 1.25rem 0 2rem; } - @include breakpoint("md") { + @include breakpoint('md') { margin: 4.5rem 0 2rem; } } @@ -130,7 +130,7 @@ $slide-margin-left-textbook: 19rem !default; justify-content: center; } - @include breakpoint("md") { + @include breakpoint('md') { .lia-slide__content { padding-left: $slide-margin-left-textbook; } @@ -147,7 +147,7 @@ $slide-margin-left-textbook: 19rem !default; max-width: 124.6rem; } - @include breakpoint("lg") { + @include breakpoint('lg') { .lia-slide__content { // margin-left: calc(#{$slide-margin-left-presentation} - 3rem); } @@ -155,17 +155,24 @@ $slide-margin-left-textbook: 19rem !default; } &.lia-navigation--hidden { - .lia-slide__content { - margin: 0 2rem; - } - .lia-slide { height: 100vh; + + &__container { + margin-top: 0px; + } + + &__content { + margin: 0 2rem; + } + + &__footer { + display: none; + } } #lia-btn-toc { - //transform: translate(2.2rem, -50%); - top: 0.8rem; + top: 1.8rem; padding: 0; } @@ -180,12 +187,43 @@ $slide-margin-left-textbook: 19rem !default; transform: translate(0rem, -50%); } } - - .lia-header, .lia-slide__footer { - display: none; + + .lia-header { + flex-direction: column; + height: 5.8rem; + margin: 0; + position: absolute; + right: 1.8rem; + left: unset; + z-index: 100; + top: 0px; + width: 2rem; + } + + .lia-support-menu { + &__nav { + flex-direction: column; + } + + @include breakpoint('md', 'min') { + &__submenu { + right: 3rem; + top: 2rem; + } + + &__item { + padding: 0px; + + button { + // Styles for buttons within any level of sub-children + padding-right: 0px; + padding-left: 0px; + } + } + } } - @include breakpoint("lg", "max") { + @include breakpoint('lg', 'max') { .lia-notes { //position: fixed; max-height: 4px; @@ -193,9 +231,5 @@ $slide-margin-left-textbook: 19rem !default; bottom: 0px; } } - - .lia-slide__container { - margin-top: 0px; - } } } From fce572adbd517f1fddd62e454a2a33a67d5b4436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Dietrich?= Date: Mon, 17 Jul 2023 14:27:03 +0200 Subject: [PATCH 10/19] settings working in small view --- src/scss/04_objects/_object.canvas.scss | 42 ++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/src/scss/04_objects/_object.canvas.scss b/src/scss/04_objects/_object.canvas.scss index a4711cc08..2bbaa38bc 100644 --- a/src/scss/04_objects/_object.canvas.scss +++ b/src/scss/04_objects/_object.canvas.scss @@ -47,7 +47,7 @@ $slide-margin-left-textbook: 19rem !default; &.lia-toc--visible.lia-support--visible { #lia-btn-toc, #lia-btn-support { - transform: translate(-3rem, -50%); + transform: translate(-3rem, -50%) !important; } } } @@ -176,6 +176,12 @@ $slide-margin-left-textbook: 19rem !default; padding: 0; } + &.lia-toc--hidden.lia-support--visible { + #lia-btn-toc { + display: none; + } + } + .lia-toc--closed { & #lia-btn-toc { transform: translate(2.5rem, -50%); @@ -198,6 +204,11 @@ $slide-margin-left-textbook: 19rem !default; z-index: 100; top: 0px; width: 2rem; + border-bottom: unset; + + @include breakpoint('md', 'max') { + top: 2rem; + } } .lia-support-menu { @@ -205,6 +216,35 @@ $slide-margin-left-textbook: 19rem !default; flex-direction: column; } + &--open { + .lia-support-menu__toggler { + transform: translate(0.25rem, -50%); + z-index: 1000; + } + + #lia-btn-toc { + transform: translate(0rem, -50%); + } + } + + &--closed { + .lia-support-menu__toggler { + transform: translate(-4rem, -50%); + } + } + + &__toggler { + top: 1.8rem; + right: 2rem; + padding: 0; + + button { + // Styles for buttons within any level of sub-children + padding-right: 0px; + padding-left: 0px; + } + } + @include breakpoint('md', 'min') { &__submenu { right: 3rem; From f4efc17682f1200d2ce1e5e5e7433af3c7370d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Dietrich?= Date: Mon, 17 Jul 2023 14:27:25 +0200 Subject: [PATCH 11/19] Add new icons --- src/assets/icons/navigation-hide.svg | 17 +++++++++++++++++ src/assets/icons/navigation-show.svg | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 src/assets/icons/navigation-hide.svg create mode 100644 src/assets/icons/navigation-show.svg diff --git a/src/assets/icons/navigation-hide.svg b/src/assets/icons/navigation-hide.svg new file mode 100644 index 000000000..44a1002f3 --- /dev/null +++ b/src/assets/icons/navigation-hide.svg @@ -0,0 +1,17 @@ + + + + + diff --git a/src/assets/icons/navigation-show.svg b/src/assets/icons/navigation-show.svg new file mode 100644 index 000000000..4ab58f89a --- /dev/null +++ b/src/assets/icons/navigation-show.svg @@ -0,0 +1,17 @@ + + + + + From a432fb0e5cf38e4686971410ce7302d7b5a90f17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Dietrich?= Date: Mon, 17 Jul 2023 17:18:56 +0200 Subject: [PATCH 12/19] Add navigation buttons next prev --- src/scss/04_objects/_object.canvas.scss | 26 ++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/src/scss/04_objects/_object.canvas.scss b/src/scss/04_objects/_object.canvas.scss index 2bbaa38bc..bc2725389 100644 --- a/src/scss/04_objects/_object.canvas.scss +++ b/src/scss/04_objects/_object.canvas.scss @@ -165,10 +165,30 @@ $slide-margin-left-textbook: 19rem !default; &__content { margin: 0 2rem; } + } - &__footer { - display: none; - } + #lia-btn-prev, + #lia-btn-next { + position: absolute; + color: rgb(var(--color-highlight)); + bottom: 0.25rem; + } + + #lia-btn-prev { + left: 0; + } + + #lia-btn-next { + right: 0.8rem; + } + + .lia-pagination { + margin-bottom: 0px; + } + + .lia-pagination__current, + .lia-responsive-voice { + display: none; } #lia-btn-toc { From 62207e6ea16ac56c378ab570802b64da0bc6c3e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Dietrich?= Date: Mon, 17 Jul 2023 21:18:39 +0200 Subject: [PATCH 13/19] Add notes to small screens --- src/scss/04_objects/_object.canvas.scss | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/scss/04_objects/_object.canvas.scss b/src/scss/04_objects/_object.canvas.scss index bc2725389..885ad8caf 100644 --- a/src/scss/04_objects/_object.canvas.scss +++ b/src/scss/04_objects/_object.canvas.scss @@ -156,8 +156,6 @@ $slide-margin-left-textbook: 19rem !default; &.lia-navigation--hidden { .lia-slide { - height: 100vh; - &__container { margin-top: 0px; } @@ -167,6 +165,19 @@ $slide-margin-left-textbook: 19rem !default; } } + .lia-mode--slides { + .lia-slide { + height: 70vh !important; + } + } + + .lia-canvas.lia-mode--textbook, + .lia-canvas.lia-mode--presentation { + .lia-slide { + height: 100vh; + } + } + #lia-btn-prev, #lia-btn-next { position: absolute; @@ -282,14 +293,5 @@ $slide-margin-left-textbook: 19rem !default; } } } - - @include breakpoint('lg', 'max') { - .lia-notes { - //position: fixed; - max-height: 4px; - //padding: 0px; - bottom: 0px; - } - } } } From d93c96f75abd18d6f1f6432b1bd30e861892fa9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Dietrich?= Date: Thu, 27 Jul 2023 11:09:43 +0200 Subject: [PATCH 14/19] optimized/minimized menu --- src/scss/04_objects/_object.canvas.scss | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/scss/04_objects/_object.canvas.scss b/src/scss/04_objects/_object.canvas.scss index 885ad8caf..c499efe67 100644 --- a/src/scss/04_objects/_object.canvas.scss +++ b/src/scss/04_objects/_object.canvas.scss @@ -276,6 +276,19 @@ $slide-margin-left-textbook: 19rem !default; } } + &__item { + > button { + // Styles for buttons within any level of sub-children + font-size: 1.4rem; + color: rgba(var(--color-highlight), 0.75); + + &:hover { + font-size: 2.4rem; + color: unset; + } + } + } + @include breakpoint('md', 'min') { &__submenu { right: 3rem; From 06abdc451eef1cbf90badb50c7cde4c14c463e51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Dietrich?= Date: Thu, 27 Jul 2023 13:03:21 +0200 Subject: [PATCH 15/19] fix: closing button background toc --- src/scss/04_objects/_object.canvas.scss | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/scss/04_objects/_object.canvas.scss b/src/scss/04_objects/_object.canvas.scss index c499efe67..06255fc74 100644 --- a/src/scss/04_objects/_object.canvas.scss +++ b/src/scss/04_objects/_object.canvas.scss @@ -221,7 +221,18 @@ $slide-margin-left-textbook: 19rem !default; .lia-toc--open { & #lia-btn-toc { - transform: translate(0rem, -50%); + transform: translate(-0.5rem, -50%); + + @include breakpoint('sm', 'min') { + background-color: rgb(var(--color-background)) !important; + } + height: 2.2rem; + display: inline; + > i { + padding: 0px; + bottom: 0.575rem; + position: relative; + } } } From a61456ba1a5bedb29482021aa4e8735da846420a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Dietrich?= Date: Thu, 19 Oct 2023 10:42:21 +0200 Subject: [PATCH 16/19] fix: lia-toc button color on default theme --- src/scss/04_objects/_object.canvas.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/scss/04_objects/_object.canvas.scss b/src/scss/04_objects/_object.canvas.scss index 729ea7e86..1bc8994ff 100644 --- a/src/scss/04_objects/_object.canvas.scss +++ b/src/scss/04_objects/_object.canvas.scss @@ -243,9 +243,12 @@ $slide-margin-left-textbook: 19rem !default; & #lia-btn-toc { transform: translate(-0.5rem, -50%); - @include breakpoint('sm', 'min') { - background-color: rgb(var(--color-background)) !important; + color: rgb(var(--color-background)); + + html.lia-theme-default & { + color: rgb(var(--color-highlight)); } + height: 2.2rem; display: inline; > i { From 3ae0d70fb30c1b3aba4cfc04d92a6b307eaf194d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Dietrich?= Date: Mon, 19 Aug 2024 14:17:53 +0200 Subject: [PATCH 17/19] chore: improved minify:js that handles failures --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 98317347e..91a11225c 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "watch:webcomponent": "npx parcel serve src/entry/webcomponent/index.html --open", "build:webcomponent": "npm run clean && npx parcel build --no-source-maps src/entry/webcomponent/index.ts && rm dist/README.md", "build:webcomponentPublic": "npm run clean && npx parcel build --no-source-maps --public-url https://liascript.github.io/webcomponent/ src/entry/webcomponent/index.ts && rm dist/README.md", - "minify:js": "find dist -name \"*.js\" -print0 | xargs -0 -P 4 -I {} sh -c 'before=$(wc -c < {}); minify {} > {}.min && after=$(wc -c < {}.min); if [ ${after} -lt ${before} ]; then mv {}.min {}; reduction=$((${before}-${after})); percent=$(awk \"BEGIN {printf \\\"%.2f\\\", ${reduction}/${before}*100}\"); echo \"{} reduced from ${before} to ${after} bytes (${percent}% reduction)\"; else rm {}.min; echo \"{} no reduction achieved, file size unchanged\"; fi'" + "minify:js": "find dist -name \"*.js\" -print0 | xargs -0 -P 4 -I {} sh -c 'before=$(wc -c < {}); if npx minify {} > {}.min 2>/dev/null; then after=$(wc -c < {}.min); if [ ${after} -lt ${before} ]; then mv {}.min {}; reduction=$((${before}-${after})); percent=$(awk \"BEGIN {printf \\\"%.2f\\\", ${reduction}/${before}*100}\"); echo \"{} reduced from ${before} to ${after} bytes (${percent}% reduction)\"; else rm {}.min; echo \"{} no reduction achieved, file size unchanged\"; fi; else echo \"{} minification failed, skipping\"; fi'" }, "devDependencies": { "@convergencelabs/ace-collab-ext": "^0.6.0", From 21c5cd5d0dbab77fd8b65878e31fc5c7f420baea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Dietrich?= Date: Fri, 23 Aug 2024 08:34:59 +0200 Subject: [PATCH 18/19] fix: Relative links to URL with line-break --- src/elm/Lia/Markdown/Inline/Stringify.elm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/elm/Lia/Markdown/Inline/Stringify.elm b/src/elm/Lia/Markdown/Inline/Stringify.elm index b208b1852..44458a98d 100644 --- a/src/elm/Lia/Markdown/Inline/Stringify.elm +++ b/src/elm/Lia/Markdown/Inline/Stringify.elm @@ -83,6 +83,9 @@ inline2string config inline = IHTML (HTML.Node _ _ x) _ -> stringify_ config x + IHTML (HTML.InnerHtml "
") _ -> + " " + Container x _ -> stringify_ config x From 5c3dcd5c12347e51ecc1c85f3b74d6534156fd3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Dietrich?= Date: Tue, 29 Oct 2024 13:16:18 +0100 Subject: [PATCH 19/19] fix(Sass): missing breakpoints after update --- src/scss/04_objects/_object.canvas.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/scss/04_objects/_object.canvas.scss b/src/scss/04_objects/_object.canvas.scss index 19203f3ad..4fe35836a 100644 --- a/src/scss/04_objects/_object.canvas.scss +++ b/src/scss/04_objects/_object.canvas.scss @@ -1,5 +1,5 @@ -@use "../00_settings/settings.global"; -@use "../01_tools/tools.breakpoints"; +@use '../00_settings/settings.global'; +@use '../01_tools/tools.breakpoints'; /* -------------------------------------------------- Layout Settings @@ -274,7 +274,7 @@ $slide-margin-left-textbook: 19rem !default; width: 2rem; border-bottom: unset; - @include breakpoint('md', 'max') { + @include tools.breakpoint('md', 'max') { top: 2rem; } } @@ -326,7 +326,7 @@ $slide-margin-left-textbook: 19rem !default; } } - @include breakpoint('md', 'min') { + @include tools.breakpoint('md', 'min') { &__submenu { right: 3rem; top: 2rem;