diff --git a/out/main.js b/out/main.js
index 63fbdfd6388e55681d2b3faafe2ed687409e96b0..c1d00253bfc44fb1dc389e69be693fa45efce33c 100644
--- a/out/main.js
+++ b/out/main.js
@@ -5632,7 +5632,7 @@ var $avh4$elm_color$Color$rgb = F3(
var $author$project$Model$init = function (_v0) {
return _Utils_Tuple2(
{
- activeTooltip: 'Tooltip',
+ activeTooltip: '',
addCharacterIcon: $author$project$Model$DrawingInactive,
bonusDamage: 0,
characterId: 0,
@@ -8580,8 +8580,8 @@ var $author$project$Main$update = F2(
_Utils_update(
model,
{
- activeTooltip: 'Beschreibung',
- mouseInIcon: (tooltip === 'Beschreibung') ? false : true
+ activeTooltip: '',
+ mouseInIcon: (tooltip === '') ? false : true
}),
$elm$core$Platform$Cmd$none);
} else {
@@ -8590,7 +8590,7 @@ var $author$project$Main$update = F2(
model,
{
activeTooltip: tooltip,
- mouseInIcon: (tooltip === 'Beschreibung') ? false : true
+ mouseInIcon: (tooltip === '') ? false : true
}),
$elm$core$Platform$Cmd$none);
}
@@ -8614,7 +8614,7 @@ var $author$project$Main$update = F2(
_Utils_update(
model,
{
- activeTooltip: 'Beschreibung',
+ activeTooltip: '',
objectIconList: A2(
$elm$core$List$filter,
$author$project$Main$isNotId(id),
@@ -8626,7 +8626,7 @@ var $author$project$Main$update = F2(
_Utils_update(
model,
{
- activeTooltip: 'Beschreibung',
+ activeTooltip: '',
characterList: A2(
$elm$core$List$filter,
$author$project$Main$isNotId(id),
@@ -8693,22 +8693,22 @@ var $author$project$About$aboutView = A2(
_List_Nil,
_List_fromArray(
[
- $elm$html$Html$text('\n Die wenigsten Geschichten im Pen & Paper Rollenspiel DSA kommen ohne einen Kampf aus.\n Die Mechanik unterscheidet sich allerdings etwas vom normalen Spielgeschehen.\n '),
+ $elm$html$Html$text('\r\n Die wenigsten Geschichten im Pen & Paper Rollenspiel DSA kommen ohne einen Kampf aus.\r\n Die Mechanik unterscheidet sich allerdings etwas vom normalen Spielgeschehen.\r\n '),
A2($elm$html$Html$br, _List_Nil, _List_Nil),
- $elm$html$Html$text('\n Zur Vorbereitung wird die Reihenfolge der Kämpfenden bestimmt. Dazu wird der die Initiative (INI) ausgewürfelt.\n Der Spielleiter würfelt für alle NSCs.\n '),
+ $elm$html$Html$text('\r\n Zur Vorbereitung wird die Reihenfolge der Kämpfenden bestimmt. Dazu wird der die Initiative (INI) ausgewürfelt.\r\n Der Spielleiter würfelt für alle NSCs.\r\n '),
A2($elm$html$Html$br, _List_Nil, _List_Nil),
- $elm$html$Html$text('\n Dieser Reihenfolge nach dürfen die Charaktere jetzt je einen Gegner angreifen.\n ')
+ $elm$html$Html$text('\r\n Dieser Reihenfolge nach dürfen die Charaktere jetzt je einen Gegner angreifen.\r\n ')
])),
A2(
$elm$html$Html$p,
_List_Nil,
_List_fromArray(
[
- $elm$html$Html$text('\n Um anzugreifen muss zunächst eine Probe mit einem W20 auf den AT-Wert bestanden werden.\n Gleichzeitig wirft der Angegriffene auf PA oder AW. Gelingt die Probe bricht der Angriff an dieser Stelle ab.\n '),
+ $elm$html$Html$text('\r\n Um anzugreifen muss zunächst eine Probe mit einem W20 auf den AT-Wert bestanden werden.\r\n Gleichzeitig wirft der Angegriffene auf PA oder AW. Gelingt die Probe bricht der Angriff an dieser Stelle ab.\r\n '),
A2($elm$html$Html$br, _List_Nil, _List_Nil),
- $elm$html$Html$text('\n War der Angriff erfolgreich und die Verteidigung ein Fehlschlag wird der Schaden berechnet.\n Das ist die Gelegenheit den \"Angriff\"-Button zu klicken.\n Entsprechend der Angabe der Waffe (z.B 1W6+4) wird der Angriffswert erwürfelt.\n Von diesem wird der RS-Wert des Angegriffenen subtrahiert und das Ergebnis von den LeP abgezogen.\n '),
+ $elm$html$Html$text('\r\n War der Angriff erfolgreich und die Verteidigung ein Fehlschlag wird der Schaden berechnet.\r\n Das ist die Gelegenheit den \"Angriff\"-Button zu klicken.\r\n Entsprechend der Angabe der Waffe (z.B 1W6+4) wird der Angriffswert erwürfelt.\r\n Von diesem wird der RS-Wert des Angegriffenen subtrahiert und das Ergebnis von den LeP abgezogen.\r\n '),
A2($elm$html$Html$br, _List_Nil, _List_Nil),
- $elm$html$Html$text('\n Die Berechnung übernimmt der Manager vollständig!\n ')
+ $elm$html$Html$text('\r\n Die Berechnung übernimmt der Manager vollständig!\r\n ')
])),
A2(
$elm$html$Html$p,
@@ -12041,6 +12041,13 @@ var $author$project$FightingTool$body = function (model) {
]));
};
var $author$project$Model$ClearCharacterList = {$: 'ClearCharacterList'};
+var $author$project$Model$Pick = {$: 'Pick'};
+var $rundis$elm_bootstrap$Bootstrap$Form$Textarea$Attrs = function (a) {
+ return {$: 'Attrs', a: a};
+};
+var $rundis$elm_bootstrap$Bootstrap$Form$Textarea$attrs = function (attrs_) {
+ return $rundis$elm_bootstrap$Bootstrap$Form$Textarea$Attrs(attrs_);
+};
var $rundis$elm_bootstrap$Bootstrap$Grid$Column = function (a) {
return {$: 'Column', a: a};
};
@@ -12051,6 +12058,12 @@ var $rundis$elm_bootstrap$Bootstrap$Grid$col = F2(
});
var $rundis$elm_bootstrap$Bootstrap$Form$Textarea$Disabled = {$: 'Disabled'};
var $rundis$elm_bootstrap$Bootstrap$Form$Textarea$disabled = $rundis$elm_bootstrap$Bootstrap$Form$Textarea$Disabled;
+var $rundis$elm_bootstrap$Bootstrap$Table$TableAttr = function (a) {
+ return {$: 'TableAttr', a: a};
+};
+var $rundis$elm_bootstrap$Bootstrap$Table$attr = function (attr_) {
+ return $rundis$elm_bootstrap$Bootstrap$Table$TableAttr(attr_);
+};
var $rundis$elm_bootstrap$Bootstrap$Table$Bordered = {$: 'Bordered'};
var $rundis$elm_bootstrap$Bootstrap$Table$bordered = $rundis$elm_bootstrap$Bootstrap$Table$Bordered;
var $author$project$Model$AddCharacterIcon = function (a) {
@@ -12059,12 +12072,15 @@ var $author$project$Model$AddCharacterIcon = function (a) {
var $author$project$Model$MouseDraw = function (a) {
return {$: 'MouseDraw', a: a};
};
+<<<<<<< HEAD
var $rundis$elm_bootstrap$Bootstrap$Table$RowAttr = function (a) {
return {$: 'RowAttr', a: a};
};
var $rundis$elm_bootstrap$Bootstrap$Table$rowAttr = function (attr_) {
return $rundis$elm_bootstrap$Bootstrap$Table$RowAttr(attr_);
};
+=======
+>>>>>>> style
var $rundis$elm_bootstrap$Bootstrap$Table$Roled = function (a) {
return {$: 'Roled', a: a};
};
@@ -12099,6 +12115,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(
@@ -12141,6 +12159,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(
@@ -12179,10 +12199,13 @@ var $author$project$DungeonMap$characters2rows = F2(
}),
$elm$core$Array$toList(chars));
});
+<<<<<<< HEAD
var $rundis$elm_bootstrap$Bootstrap$Table$Responsive = function (a) {
return {$: 'Responsive', a: a};
};
var $rundis$elm_bootstrap$Bootstrap$Table$responsive = $rundis$elm_bootstrap$Bootstrap$Table$Responsive($elm$core$Maybe$Nothing);
+=======
+>>>>>>> style
var $author$project$DungeonMap$dungeonMap_MonsterList = function (model) {
return A2(
$elm$html$Html$div,
@@ -12195,7 +12218,12 @@ var $author$project$DungeonMap$dungeonMap_MonsterList = function (model) {
$rundis$elm_bootstrap$Bootstrap$Table$table(
{
options: _List_fromArray(
- [$rundis$elm_bootstrap$Bootstrap$Table$hover, $rundis$elm_bootstrap$Bootstrap$Table$bordered, $rundis$elm_bootstrap$Bootstrap$Table$responsive]),
+ [
+ $rundis$elm_bootstrap$Bootstrap$Table$hover,
+ $rundis$elm_bootstrap$Bootstrap$Table$bordered,
+ $rundis$elm_bootstrap$Bootstrap$Table$attr(
+ $elm$html$Html$Attributes$class('map-table'))
+ ]),
tbody: A2(
$rundis$elm_bootstrap$Bootstrap$Table$tbody,
_List_Nil,
@@ -12205,21 +12233,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')
@@ -12230,7 +12270,6 @@ var $author$project$DungeonMap$dungeonMap_MonsterList = function (model) {
};
var $author$project$Model$DragEnter = {$: 'DragEnter'};
var $author$project$Model$DragLeave = {$: 'DragLeave'};
-var $author$project$Model$Pick = {$: 'Pick'};
var $elm$file$File$decoder = _File_decoder;
var $elm$json$Json$Decode$list = _Json_decodeList;
var $elm$json$Json$Decode$oneOrMoreHelp = F2(
@@ -12708,7 +12747,7 @@ var $author$project$DungeonMap$placeIcon = function (s) {
$elm$svg$Svg$Events$onMouseOver(
A2($author$project$Model$HighlightTableRow, id, text)),
$elm$svg$Svg$Events$onMouseOut(
- A2($author$project$Model$HighlightTableRow, 0, 'Beschreibung')),
+ A2($author$project$Model$HighlightTableRow, 0, '')),
$elm$svg$Svg$Events$onClick(
A2($author$project$Model$DeleteIcon, iconType, id))
]),
@@ -12764,7 +12803,7 @@ var $author$project$DungeonMap$placeIcon = function (s) {
$elm$svg$Svg$Events$onMouseOver(
A2($author$project$Model$HighlightTableRow, id, text)),
$elm$svg$Svg$Events$onMouseOut(
- A2($author$project$Model$HighlightTableRow, 0, 'Beschreibung')),
+ A2($author$project$Model$HighlightTableRow, 0, '')),
$elm$svg$Svg$Events$onClick(
A2($author$project$Model$DeleteIcon, iconType, id))
]),
@@ -12789,7 +12828,7 @@ var $author$project$DungeonMap$placeIcon = function (s) {
$elm$svg$Svg$Events$onMouseOver(
$author$project$Model$ToolTipMsg(text)),
$elm$svg$Svg$Events$onMouseOut(
- $author$project$Model$ToolTipMsg('Beschreibung')),
+ $author$project$Model$ToolTipMsg('')),
$elm$svg$Svg$Attributes$class('ObjectIcon'),
$elm$svg$Svg$Events$onClick(
A2($author$project$Model$DeleteIcon, iconType, id))
@@ -12821,7 +12860,7 @@ var $author$project$DungeonMap$placeIcon = function (s) {
$elm$svg$Svg$Events$onMouseOver(
$author$project$Model$ToolTipMsg(text)),
$elm$svg$Svg$Events$onMouseOut(
- $author$project$Model$ToolTipMsg('Beschreibung')),
+ $author$project$Model$ToolTipMsg('')),
$elm$svg$Svg$Attributes$class('ObjectIcon'),
$elm$svg$Svg$Events$onClick(
A2($author$project$Model$DeleteIcon, iconType, id))
@@ -12893,17 +12932,6 @@ var $author$project$DungeonMap$newIconsView = function (addCharacterIcon) {
return _List_Nil;
}
};
-var $rundis$elm_bootstrap$Bootstrap$Button$onClick = function (message) {
- return $rundis$elm_bootstrap$Bootstrap$Button$attrs(
- _List_fromArray(
- [
- A2(
- $elm$html$Html$Events$preventDefaultOn,
- 'click',
- $elm$json$Json$Decode$succeed(
- _Utils_Tuple2(message, true)))
- ]));
-};
var $elm$svg$Svg$svg = $elm$svg$Svg$trustedNode('svg');
var $author$project$DungeonMap$svgIconList = function (model) {
return A3(
@@ -12926,7 +12954,7 @@ var $author$project$DungeonMap$dungeonMap_Svg = function (model) {
A2(
$elm$html$Html$Attributes$style,
'border',
- model.hover ? '6px dashed purple' : '6px dashed #ccc'),
+ model.hover ? '6px dashed purple' : '6px dashed #bfbfbf'),
A2(
$author$project$DungeonMap$hijackOn,
'dragenter',
@@ -12944,16 +12972,6 @@ var $author$project$DungeonMap$dungeonMap_Svg = function (model) {
_List_fromArray(
[
A2(
- $rundis$elm_bootstrap$Bootstrap$Button$button,
- _List_fromArray(
- [
- $rundis$elm_bootstrap$Bootstrap$Button$onClick($author$project$Model$Pick)
- ]),
- _List_fromArray(
- [
- $elm$html$Html$text('Upload Map')
- ])),
- A2(
$elm$html$Html$figure,
_List_fromArray(
[
@@ -12995,9 +13013,6 @@ var $author$project$DungeonMap$dungeonMap_Svg = function (model) {
]))
]));
};
-var $rundis$elm_bootstrap$Bootstrap$Internal$Button$Info = {$: 'Info'};
-var $rundis$elm_bootstrap$Bootstrap$Button$info = $rundis$elm_bootstrap$Bootstrap$Internal$Button$Coloring(
- $rundis$elm_bootstrap$Bootstrap$Internal$Button$Roled($rundis$elm_bootstrap$Bootstrap$Internal$Button$Info));
var $author$project$Model$ChangeIcon = function (a) {
return {$: 'ChangeIcon', a: a};
};
@@ -13247,9 +13262,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'),
@@ -13761,7 +13773,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(
@@ -13774,9 +13789,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(
@@ -13786,7 +13803,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(
@@ -13869,11 +13889,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,
@@ -13881,6 +13910,17 @@ var $author$project$DungeonMap$newObjectIconModal = function (model) {
$rundis$elm_bootstrap$Bootstrap$Modal$config(
$author$project$Model$CloseModal($author$project$Model$ObjectIconModal)))))));
};
+var $rundis$elm_bootstrap$Bootstrap$Button$onClick = function (message) {
+ return $rundis$elm_bootstrap$Bootstrap$Button$attrs(
+ _List_fromArray(
+ [
+ A2(
+ $elm$html$Html$Events$preventDefaultOn,
+ 'click',
+ $elm$json$Json$Decode$succeed(
+ _Utils_Tuple2(message, true)))
+ ]));
+};
var $rundis$elm_bootstrap$Bootstrap$Grid$Internal$Col = {$: 'Col'};
var $rundis$elm_bootstrap$Bootstrap$Grid$Internal$Width = F2(
function (screenSize, columnCount) {
@@ -14790,12 +14830,14 @@ var $rundis$elm_bootstrap$Bootstrap$Grid$Internal$width = F2(
A2($rundis$elm_bootstrap$Bootstrap$Grid$Internal$Width, size, count));
});
var $rundis$elm_bootstrap$Bootstrap$Grid$Col$xs4 = A2($rundis$elm_bootstrap$Bootstrap$Grid$Internal$width, $rundis$elm_bootstrap$Bootstrap$General$Internal$XS, $rundis$elm_bootstrap$Bootstrap$Grid$Internal$Col4);
+var $rundis$elm_bootstrap$Bootstrap$Grid$Internal$Col5 = {$: 'Col5'};
+var $rundis$elm_bootstrap$Bootstrap$Grid$Col$xs5 = A2($rundis$elm_bootstrap$Bootstrap$Grid$Internal$width, $rundis$elm_bootstrap$Bootstrap$General$Internal$XS, $rundis$elm_bootstrap$Bootstrap$Grid$Internal$Col5);
var $author$project$DungeonMap$dungeonMapView = function (model) {
return A2(
$elm$html$Html$section,
_List_fromArray(
[
- $elm$html$Html$Attributes$class('container is-widescreen')
+ $elm$html$Html$Attributes$class('content-box is-widescreen')
]),
_List_fromArray(
[
@@ -14817,12 +14859,18 @@ var $author$project$DungeonMap$dungeonMapView = function (model) {
_List_Nil,
_List_fromArray(
[
+ A2($elm$html$Html$br, _List_Nil, _List_Nil),
$rundis$elm_bootstrap$Bootstrap$Form$Textarea$textarea(
_List_fromArray(
[
$rundis$elm_bootstrap$Bootstrap$Form$Textarea$rows(1),
$rundis$elm_bootstrap$Bootstrap$Form$Textarea$disabled,
- $rundis$elm_bootstrap$Bootstrap$Form$Textarea$value(model.activeTooltip)
+ $rundis$elm_bootstrap$Bootstrap$Form$Textarea$value(model.activeTooltip),
+ $rundis$elm_bootstrap$Bootstrap$Form$Textarea$attrs(
+ _List_fromArray(
+ [
+ $elm$html$Html$Attributes$class('text-area')
+ ]))
])),
A2($elm$html$Html$br, _List_Nil, _List_Nil),
$author$project$DungeonMap$dungeonMap_Svg(model)
@@ -14830,6 +14878,7 @@ var $author$project$DungeonMap$dungeonMapView = function (model) {
A2(
$rundis$elm_bootstrap$Bootstrap$Grid$col,
_List_fromArray(
+<<<<<<< HEAD
[$rundis$elm_bootstrap$Bootstrap$Grid$Col$xs4]),
_List_fromArray(
[
@@ -14848,6 +14897,67 @@ var $author$project$DungeonMap$dungeonMapView = function (model) {
[
$elm$html$Html$text('Clear Map')
])),
+=======
+ [$rundis$elm_bootstrap$Bootstrap$Grid$Col$xs5]),
+ _List_fromArray(
+ [
+ A2(
+ $rundis$elm_bootstrap$Bootstrap$Grid$row,
+ _List_Nil,
+ _List_fromArray(
+ [
+ A2(
+ $rundis$elm_bootstrap$Bootstrap$Grid$col,
+ _List_Nil,
+ _List_fromArray(
+ [
+ A2($elm$html$Html$br, _List_Nil, _List_Nil),
+ $author$project$DungeonMap$dungeonMap_MonsterList(model)
+ ])),
+ A2(
+ $rundis$elm_bootstrap$Bootstrap$Grid$col,
+ _List_fromArray(
+ [$rundis$elm_bootstrap$Bootstrap$Grid$Col$xs4]),
+ _List_fromArray(
+ [
+ A2($elm$html$Html$br, _List_Nil, _List_Nil),
+ A2(
+ $rundis$elm_bootstrap$Bootstrap$Button$button,
+ _List_fromArray(
+ [
+ $rundis$elm_bootstrap$Bootstrap$Button$attrs(
+ _List_fromArray(
+ [
+ $elm$html$Html$Attributes$class('metalButton map-buttons')
+ ])),
+ $rundis$elm_bootstrap$Bootstrap$Button$onClick($author$project$Model$Pick)
+ ]),
+ _List_fromArray(
+ [
+ $elm$html$Html$text('Upload Map')
+ ])),
+ A2(
+ $rundis$elm_bootstrap$Bootstrap$Button$button,
+ _List_fromArray(
+ [
+ $rundis$elm_bootstrap$Bootstrap$Button$attrs(
+ _List_fromArray(
+ [
+ $elm$html$Html$Attributes$class('metalButton map-buttons'),
+ A2($elm$html$Html$Attributes$style, 'margin-top', '5px')
+ ])),
+ $rundis$elm_bootstrap$Bootstrap$Button$onClick($author$project$Model$ClearCharacterList)
+ ]),
+ _List_fromArray(
+ [
+ $elm$html$Html$text('Clear Map')
+ ]))
+ ]))
+ ]))
+ ]))
+ ]))
+ ])),
+>>>>>>> style
$author$project$DungeonMap$newObjectIconModal(model)
]));
};
diff --git a/res/Stysheet.css b/res/Stysheet.css
new file mode 100644
index 0000000000000000000000000000000000000000..3c7f93a0e49894530c22f53efba497897621b742
--- /dev/null
+++ b/res/Stysheet.css
@@ -0,0 +1,136 @@
+html {
+ background-color: #faf2eb;
+}
+
+.wrapper {
+ min-height: 100%;
+ display: grid;
+ grid-template-rows: auto 1fr auto;
+ background-color: #faf2eb;
+}
+
+
+.header {
+ background-image: repeating-linear-gradient(to right bottom, #b87333 , #ce8a4b , #b87333 40% );
+ color: white;
+ text-shadow: 3px 3px 6px #4d3319;
+ text-align: left;
+ padding: 10px;
+ margin-bottom: 1%;
+ font-family: 'Fondamento', cursive;
+ }
+
+.footer {
+ background-color: #e4be9b;
+ color: #666666;
+ text-align: center;
+ padding: 10px;
+ margin-top: 3%;
+}
+
+.body {
+ background-color: #faf2eb;
+ max-width: 100%;
+}
+.colored-header-footer{
+ background-color: #e4be9b;
+}
+
+.textFont {
+ font-family: 'Alegreya', serif;
+}
+
+.grid-container {
+ display: grid;
+ grid-gap: 2%;
+ grid-template-columns: 7% auto;
+ height: 15%;
+}
+
+.item1 {
+ border-left: #8c5826;
+ border-left-style: double;
+ border-width: 5px;
+ height: 75%;
+ width: 100%;
+}
+
+.th {
+ background-color: #e4be9b
+}
+
+.tr {
+ background-color: #faf2eb;
+}
+
+tr:nth-child(even) {background-color: white;}
+
+.metalButton {
+ background-image: repeating-linear-gradient(to right bottom, #acacac , #bfbfbf , #acacac 40% );
+ border-radius: 8px;
+ padding: 8px 28px;
+ color: white !important;
+ text-align: center;
+ text-decoration: none;
+ text-shadow: 2px 2px 5px #404040;
+ font-size: 1rem;
+ }
+
+.metalButton:hover{
+ background-image: repeating-linear-gradient(to right bottom, #acacac , #bfbfbf 10%, #acacac 40% );
+}
+
+
+.MonsterIcon:hover {
+ fill: grey-darker;
+ opacity:0.5;
+ fill-opacity:0.5;
+ width:30px;
+ height:30px;
+ cursor: pointer;
+}
+.PlayerIcon:hover {
+ fill: grey-darker;
+ opacity:0.5;
+ fill-opacity:0.5;
+ width:25px;
+ height:25px;
+ cursor: pointer;
+}
+.ObjectIcon:hover {
+ fill: grey-darker;
+ opacity:0.5;
+ fill-opacity:0.5;
+ width:25px;
+ height:25px;
+ cursor: pointer;
+}
+
+.content-box {
+ margin-right: 20px;
+ margin-left: 20px;
+ padding: 15px;
+}
+
+.text-area {
+ color: #666666 !important;
+ background-color: #e4be9b !important;
+}
+
+.map-buttons {
+ width: 120px;
+}
+
+.map-table {
+ border: 2px solid #bfbfbf !important;
+}
+
+.aboutText {
+ padding-left: 5%;
+ padding-right: 5%;
+}
+
+h1.about {
+ padding-top: 2%;
+ font-variant: small-caps;
+}
\ No newline at end of file
diff --git a/src/DungeonMap.elm b/src/DungeonMap.elm
index 4f97d60a99221d203e11ea28120232cc1036cf58..68e9bf38569478ce9d571c846a4f1f7a2fec5ad6 100644
--- a/src/DungeonMap.elm
+++ b/src/DungeonMap.elm
@@ -27,40 +27,58 @@ import Model exposing (..)
dungeonMapView : Model -> Html Msg
dungeonMapView model =
- Html.section [ class "container is-widescreen" ]
+ Html.section [ class "content-box is-widescreen" ]
[ div [ class "section" ]
[ Grid.row []
[ Grid.col []
- [ Textarea.textarea
+ [ Html.br [] []
+ ,Textarea.textarea
[ Textarea.rows 1
, Textarea.disabled
, Textarea.value model.activeTooltip
+ , Textarea.attrs [ class "text-area" ]
]
, Html.br [] []
, dungeonMap_Svg model
]
- , Grid.col [ Col.xs4 ]
- [ dungeonMap_MonsterList model
+ , Grid.col [ Col.xs5 ]
+ [ Grid.row []
+ [ Grid.col []
+ [ Html.br [] []
+ , dungeonMap_MonsterList model
+ ]
+ , Grid.col [ Col.xs4 ]
+ [ Html.br [] []
+ , Button.button
+ [ Button.attrs [ class "metalButton map-buttons"]
+ , Button.onClick Pick ]
+ [ text "Upload Map" ]
+ , Button.button
+ [ Button.attrs [ class "metalButton map-buttons", style "margin-top" "5px" ]
+ , Button.onClick ClearCharacterList ]
+ [ text "Clear Map" ]
+ ]
+ ]
]
]
]
- , Button.button [ Button.info, Button.onClick ClearCharacterList ] [ text "Clear Map" ]
, newObjectIconModal model
]
dungeonMap_MonsterList : Model -> Html Msg
dungeonMap_MonsterList model =
div [ class "container" ]
- [ Table.table { options = [ Table.hover, Table.bordered, Table.responsive ]
+ [ 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 []
<| characters2rows model.enemy model.highlightedTableRow
}
+
]
characters2rows : Array.Array Character -> Int -> List (Table.Row Msg)
@@ -69,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]
@@ -77,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]
@@ -91,14 +109,13 @@ characters2rows chars highlighted =
dungeonMap_Svg : Model -> Html Msg
dungeonMap_Svg model =
div [ class "container"
- , style "border" (if model.hover then "6px dashed purple" else "6px dashed #ccc")
+ , style "border" (if model.hover then "6px dashed purple" else "6px dashed #bfbfbf")
, hijackOn "dragenter" (Json.Decode.succeed DragEnter)
, hijackOn "dragover" (Json.Decode.succeed DragEnter)
, hijackOn "dragleave" (Json.Decode.succeed DragLeave)
, hijackOn "drop" dropDecoder
]
- [ Button.button [ Button.onClick Pick ] [ text "Upload Map" ]
- , Html.figure [ class "image" ]
+ [ Html.figure [ class "image" ]
[ Svg.svg
([ SvgAtt.width "100%", SvgAtt.viewBox "0 0 800 600", SvgAtt.version "1.1" ]
++ mouseDrawEvents model.addCharacterIcon
@@ -114,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"
@@ -141,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" ]
@@ -196,7 +214,7 @@ placeIcon s =
, SvgAtt.title "MonsterIcon"
, SvgAtt.xlinkHref "res/icons/Enemy.svg"
, Svg.Events.onMouseOver (HighlightTableRow id text)
- , Svg.Events.onMouseOut (HighlightTableRow 0 "Beschreibung")
+ , Svg.Events.onMouseOut (HighlightTableRow 0 "")
, Svg.Events.onClick (DeleteIcon iconType id)
] []
]
@@ -216,7 +234,7 @@ placeIcon s =
, SvgAtt.title "ObjectIcon"
, SvgAtt.xlinkHref "res/icons/Hero.svg"
, Svg.Events.onMouseOver (HighlightTableRow id text)
- , Svg.Events.onMouseOut (HighlightTableRow 0 "Beschreibung")
+ , Svg.Events.onMouseOut (HighlightTableRow 0 "")
, Svg.Events.onClick (DeleteIcon iconType id)
] []
]
@@ -230,7 +248,7 @@ placeIcon s =
, SvgAtt.r "10"
, SvgAtt.style (buildCustomObjectIconStyle color)
, Svg.Events.onMouseOver (ToolTipMsg text)
- , Svg.Events.onMouseOut (ToolTipMsg "Beschreibung")
+ , Svg.Events.onMouseOut (ToolTipMsg "")
, SvgAtt.class "ObjectIcon"
, Svg.Events.onClick (DeleteIcon iconType id)
]
@@ -244,7 +262,7 @@ placeIcon s =
, SvgAtt.y (String.fromFloat (Maybe.withDefault 0 (String.toFloat y) - 11.5))
, SvgAtt.xlinkHref (getIconPath typeID)
, Svg.Events.onMouseOver (ToolTipMsg text)
- , Svg.Events.onMouseOut (ToolTipMsg "Beschreibung")
+ , Svg.Events.onMouseOut (ToolTipMsg "")
, SvgAtt.class "ObjectIcon"
, Svg.Events.onClick (DeleteIcon iconType id)
] []
diff --git a/src/Main.elm b/src/Main.elm
index 8d9839541fadbd10b6abd1a16238eb242166741a..ca650c9f726526f58c50671ab902ce7c9cc77b93 100644
--- a/src/Main.elm
+++ b/src/Main.elm
@@ -271,13 +271,13 @@ update msg model =
ToolTipMsg tooltip ->
case tooltip of
- "" -> ( { model | activeTooltip = "Beschreibung"
- , mouseInIcon = (if tooltip=="Beschreibung" then False else True) }
+ "" -> ( { model | activeTooltip = ""
+ , mouseInIcon = (if tooltip=="" then False else True) }
, Cmd.none
)
_ -> ( { model | activeTooltip = tooltip
- , mouseInIcon = (if tooltip=="Beschreibung" then False else True) }
+ , mouseInIcon = (if tooltip=="" then False else True) }
, Cmd.none
)
@@ -292,7 +292,7 @@ update msg model =
case iconType of
"object" ->
( { model | objectIconList = List.filter (isNotId id) model.objectIconList
- , activeTooltip = "Beschreibung" }
+ , activeTooltip = "" }
, Cmd.none
)
@@ -300,7 +300,7 @@ update msg model =
_ ->
( { model | characterList = List.filter (isNotId id) model.characterList
, highlightedTableRow = 0
- , activeTooltip = "Beschreibung" }
+ , activeTooltip = "" }
, Cmd.none
)
diff --git a/src/Model.elm b/src/Model.elm
index a197647a83c2c06c33f841d9c964d4349976643b..3eae4eaa8f8b0f037154f9b86cb1c321cd41252f 100644
--- a/src/Model.elm
+++ b/src/Model.elm
@@ -80,7 +80,7 @@ init _ =
, colorPicker = ColorPicker.empty
, colour = Color.rgb 255 0 0
, radioCheckedID = 0
- , activeTooltip = "Tooltip"
+ , activeTooltip = ""
, highlightedTableRow = 0
, mouseInIcon = False
}