From 7f81821208658040e4fa41d598348c4b4da54b81 Mon Sep 17 00:00:00 2001
From: Alexander Kampf <alexander.kampf@student.uni-halle.de>
Date: Sun, 12 Jul 2020 12:09:41 +0200
Subject: [PATCH] last style changes
---
out/main.js | 56 +++++++++++++++++++++++++++++++++++-----------
res/Stysheet.css | 2 +-
src/DungeonMap.elm | 21 ++++++++---------
3 files changed, 55 insertions(+), 24 deletions(-)
diff --git a/out/main.js b/out/main.js
index 435da2f..13925dd 100644
--- a/out/main.js
+++ b/out/main.js
@@ -12118,6 +12118,8 @@ var $author$project$DungeonMap$characters2rows = F2(
_Utils_ap(
_List_fromArray(
[
+ $rundis$elm_bootstrap$Bootstrap$Table$rowAttr(
+ $elm$html$Html$Attributes$class('tr')),
$rundis$elm_bootstrap$Bootstrap$Table$rowAttr(
$author$project$DungeonMap$stopBubbling(
$author$project$Model$AddCharacterIcon(
@@ -12160,6 +12162,8 @@ var $author$project$DungeonMap$characters2rows = F2(
_Utils_ap(
_List_fromArray(
[
+ $rundis$elm_bootstrap$Bootstrap$Table$rowAttr(
+ $elm$html$Html$Attributes$class('tr')),
$rundis$elm_bootstrap$Bootstrap$Table$rowAttr(
$author$project$DungeonMap$stopBubbling(
$author$project$Model$AddCharacterIcon(
@@ -12225,21 +12229,33 @@ var $author$project$DungeonMap$dungeonMap_MonsterList = function (model) {
[
A2(
$rundis$elm_bootstrap$Bootstrap$Table$th,
- _List_Nil,
+ _List_fromArray(
+ [
+ $rundis$elm_bootstrap$Bootstrap$Table$cellAttr(
+ $elm$html$Html$Attributes$class('th'))
+ ]),
_List_fromArray(
[
$elm$html$Html$text('ID')
])),
A2(
$rundis$elm_bootstrap$Bootstrap$Table$th,
- _List_Nil,
+ _List_fromArray(
+ [
+ $rundis$elm_bootstrap$Bootstrap$Table$cellAttr(
+ $elm$html$Html$Attributes$class('th'))
+ ]),
_List_fromArray(
[
$elm$html$Html$text('Name')
])),
A2(
$rundis$elm_bootstrap$Bootstrap$Table$th,
- _List_Nil,
+ _List_fromArray(
+ [
+ $rundis$elm_bootstrap$Bootstrap$Table$cellAttr(
+ $elm$html$Html$Attributes$class('th'))
+ ]),
_List_fromArray(
[
$elm$html$Html$text('LeP')
@@ -13240,9 +13256,6 @@ var $rundis$elm_bootstrap$Bootstrap$Form$Radio$radioList = F2(
$rundis$elm_bootstrap$Bootstrap$Form$Radio$name(groupName))),
radios);
});
-var $rundis$elm_bootstrap$Bootstrap$Internal$Button$Success = {$: 'Success'};
-var $rundis$elm_bootstrap$Bootstrap$Button$success = $rundis$elm_bootstrap$Bootstrap$Internal$Button$Coloring(
- $rundis$elm_bootstrap$Bootstrap$Internal$Button$Roled($rundis$elm_bootstrap$Bootstrap$Internal$Button$Success));
var $simonh1000$elm_colorpicker$ColorPicker$markerAttrs = _List_fromArray(
[
A2($elm$html$Html$Attributes$style, 'position', 'absolute'),
@@ -13754,7 +13767,10 @@ var $author$project$DungeonMap$newObjectIconModal = function (model) {
model.showObjectIconModal,
A3(
$rundis$elm_bootstrap$Bootstrap$Modal$footer,
- _List_Nil,
+ _List_fromArray(
+ [
+ $elm$html$Html$Attributes$class('colored-header-footer')
+ ]),
_List_fromArray(
[
A2(
@@ -13767,9 +13783,11 @@ var $author$project$DungeonMap$newObjectIconModal = function (model) {
$elm$html$Html$Events$onClick(
$author$project$Model$AddCharacterIcon(
$author$project$Model$MouseClick(
- $author$project$DungeonMap$getCharIcon(model.addCharacterIcon))))
+ $author$project$DungeonMap$getCharIcon(model.addCharacterIcon)))),
+ $elm$html$Html$Attributes$class('metalButton map-buttons'),
+ A2($elm$html$Html$Attributes$style, 'margin-top', '5px'),
+ A2($elm$html$Html$Attributes$style, 'width', '140px')
])),
- $rundis$elm_bootstrap$Bootstrap$Button$success,
$rundis$elm_bootstrap$Bootstrap$Button$disabled(!model.radioCheckedID)
]),
_List_fromArray(
@@ -13779,7 +13797,10 @@ var $author$project$DungeonMap$newObjectIconModal = function (model) {
]),
A3(
$rundis$elm_bootstrap$Bootstrap$Modal$body,
- _List_Nil,
+ _List_fromArray(
+ [
+ $elm$html$Html$Attributes$class('body')
+ ]),
_List_fromArray(
[
A2(
@@ -13862,11 +13883,20 @@ var $author$project$DungeonMap$newObjectIconModal = function (model) {
]))
]),
A3(
- $rundis$elm_bootstrap$Bootstrap$Modal$h3,
- _List_Nil,
+ $rundis$elm_bootstrap$Bootstrap$Modal$header,
_List_fromArray(
[
- $elm$html$Html$text('Neues Icon')
+ $elm$html$Html$Attributes$class('colored-header-footer')
+ ]),
+ _List_fromArray(
+ [
+ A2(
+ $elm$html$Html$h3,
+ _List_Nil,
+ _List_fromArray(
+ [
+ $elm$html$Html$text('Neues Icon')
+ ]))
]),
A2(
$rundis$elm_bootstrap$Bootstrap$Modal$hideOnBackdropClick,
diff --git a/res/Stysheet.css b/res/Stysheet.css
index 89d3d61..3c7f93a 100644
--- a/res/Stysheet.css
+++ b/res/Stysheet.css
@@ -69,7 +69,7 @@ tr:nth-child(even) {background-color: white;}
background-image: repeating-linear-gradient(to right bottom, #acacac , #bfbfbf , #acacac 40% );
border-radius: 8px;
padding: 8px 28px;
- color: white;
+ color: white !important;
text-align: center;
text-decoration: none;
text-shadow: 2px 2px 5px #404040;
diff --git a/src/DungeonMap.elm b/src/DungeonMap.elm
index 2419bd0..0f109b1 100644
--- a/src/DungeonMap.elm
+++ b/src/DungeonMap.elm
@@ -70,9 +70,9 @@ dungeonMap_MonsterList model =
div [ class "container" ]
[ Table.table { options = [ Table.hover, Table.bordered, Table.attr (class "map-table") ]
, thead = Table.simpleThead
- [ Table.th [] [ Html.text "ID" ]
- , Table.th [] [ Html.text "Name" ]
- , Table.th [] [ Html.text "LeP" ]
+ [ Table.th [Table.cellAttr <| class "th"] [ Html.text "ID" ]
+ , Table.th [Table.cellAttr <| class "th"] [ Html.text "Name" ]
+ , Table.th [Table.cellAttr <| class "th"] [ Html.text "LeP" ]
]
, tbody =
Table.tbody []
@@ -87,7 +87,7 @@ characters2rows chars highlighted =
(\i c ->
case c of
Enemy name health _ _ _ ->
- Table.tr ([ Table.rowAttr (stopBubbling (AddCharacterIcon (MouseDraw (MonsterIcon (i+1) "-100" "-100" name)))) ]
+ Table.tr ([ Table.rowAttr <| class "tr", Table.rowAttr (stopBubbling (AddCharacterIcon (MouseDraw (MonsterIcon (i+1) "-100" "-100" name)))) ]
++ if highlighted==i+1 then [ Table.rowSecondary ] else [])
[ Table.td [] [Html.text <| String.fromInt (i+1)]
, Table.td [] [Html.text name]
@@ -95,7 +95,7 @@ characters2rows chars highlighted =
]
Hero name health ->
- Table.tr ([ Table.rowAttr (stopBubbling (AddCharacterIcon (MouseDraw (PlayerIcon (i+1) "-100" "-100" name)))) ]
+ Table.tr ([ Table.rowAttr <| class "tr", Table.rowAttr (stopBubbling (AddCharacterIcon (MouseDraw (PlayerIcon (i+1) "-100" "-100" name)))) ]
++ if highlighted==i+1 then [ Table.rowSecondary ] else [])
[ Table.td [] [Html.text <| String.fromInt (i+1)]
, Table.td [] [Html.text name]
@@ -131,8 +131,10 @@ newObjectIconModal : Model -> Html Msg
newObjectIconModal model =
Modal.config (CloseModal ObjectIconModal)
|> Modal.hideOnBackdropClick True
- |> Modal.h3 [] [ text "Neues Icon" ]
- |> Modal.body []
+ |> Modal.header [class "colored-header-footer"]
+ [ Html.h3 [][text "Neues Icon"]
+ ]
+ |> Modal.body [class "body"]
[ div []
[ div []
( Radio.radioList "customradiogroup"
@@ -158,10 +160,9 @@ newObjectIconModal model =
)
]
]
- |> Modal.footer []
+ |> Modal.footer [class "colored-header-footer"]
[ Button.button
- [ Button.attrs [onClick <| AddCharacterIcon (MouseClick (getCharIcon model.addCharacterIcon)) ]
- , Button.success
+ [ Button.attrs [onClick <| AddCharacterIcon (MouseClick (getCharIcon model.addCharacterIcon)), class "metalButton map-buttons", style "margin-top" "5px", style "width" "140px" ]
, Button.disabled (model.radioCheckedID==0)
]
[ text "Icon hinzufügen" ]
--
GitLab