Commit 0f10cf4c by Dirk Benkert

fixed #182

parent 751d471a
......@@ -3,6 +3,9 @@
## 2.0.14
- added a link to https://www.shadowrun5.net in the header section.
- fixed some typos in the english version.
- fixed buttons in "Combat Summary" box being not clickable.
- fixed condition monitor breaking in print layout.
- fixed condition monitor modifier select boxes.
## 2.0.13
- added custom dropdown for metatype adding subspecies as nested list entries.
......
......@@ -5,7 +5,7 @@
<meta charset="utf-8">
<meta name="format-detection" content="telephone=no">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
<link rel="stylesheet" href="resources/css/app.css?t=1539235371866">
<link rel="stylesheet" href="resources/css/app.css?t=1539236598318">
<link rel="apple-touch-icon" sizes="180x180" href="/projects/shadowrun/charactersheet/dist/resources/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/projects/shadowrun/charactersheet/dist/resources/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/projects/shadowrun/charactersheet/dist/resources/favicon/favicon-16x16.png">
......@@ -15,7 +15,7 @@
<meta name="msapplication-TileColor" content="#da532c">
<meta name="msapplication-config" content="/projects/shadowrun/charactersheet/dist/resources/favicon/browserconfig.xml">
<meta name="theme-color" content="#ffffff">
<script type="text/javascript" src="resources/js/library/require.js?t=1539235371866" data-main="resources/js/app-min.js"></script>
<script type="text/javascript" src="resources/js/library/require.js?t=1539236598318" data-main="resources/js/app-min.js"></script>
<link rel="canonical" href="https://www.shadowrun5.net/docs-en.html">
</head>
<body class="o-bodyspacing" data-language="en">
......
......@@ -5,7 +5,7 @@
<meta charset="utf-8">
<meta name="format-detection" content="telephone=no">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
<link rel="stylesheet" href="resources/css/app.css?t=1539235371879">
<link rel="stylesheet" href="resources/css/app.css?t=1539236598331">
<link rel="apple-touch-icon" sizes="180x180" href="/projects/shadowrun/charactersheet/dist/resources/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/projects/shadowrun/charactersheet/dist/resources/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/projects/shadowrun/charactersheet/dist/resources/favicon/favicon-16x16.png">
......@@ -15,7 +15,7 @@
<meta name="msapplication-TileColor" content="#da532c">
<meta name="msapplication-config" content="/projects/shadowrun/charactersheet/dist/resources/favicon/browserconfig.xml">
<meta name="theme-color" content="#ffffff">
<script type="text/javascript" src="resources/js/library/require.js?t=1539235371879" data-main="resources/js/app-min.js"></script>
<script type="text/javascript" src="resources/js/library/require.js?t=1539236598331" data-main="resources/js/app-min.js"></script>
<link rel="canonical" href="https://www.shadowrun5.net/docs-fr.html">
</head>
<body class="o-bodyspacing" data-language="fr">
......
......@@ -5,7 +5,7 @@
<meta charset="utf-8">
<meta name="format-detection" content="telephone=no">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
<link rel="stylesheet" href="resources/css/app.css?t=1539235371884">
<link rel="stylesheet" href="resources/css/app.css?t=1539236598336">
<link rel="apple-touch-icon" sizes="180x180" href="/projects/shadowrun/charactersheet/dist/resources/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/projects/shadowrun/charactersheet/dist/resources/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/projects/shadowrun/charactersheet/dist/resources/favicon/favicon-16x16.png">
......@@ -15,7 +15,7 @@
<meta name="msapplication-TileColor" content="#da532c">
<meta name="msapplication-config" content="/projects/shadowrun/charactersheet/dist/resources/favicon/browserconfig.xml">
<meta name="theme-color" content="#ffffff">
<script type="text/javascript" src="resources/js/library/require.js?t=1539235371884" data-main="resources/js/app-min.js"></script>
<script type="text/javascript" src="resources/js/library/require.js?t=1539236598336" data-main="resources/js/app-min.js"></script>
<link rel="canonical" href="https://www.shadowrun5.net/docs.html">
</head>
<body class="o-bodyspacing" data-language="de">
......
......@@ -5,7 +5,7 @@
<meta charset="utf-8">
<meta name="format-detection" content="telephone=no">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
<link rel="stylesheet" href="resources/css/app.css?t=1537952862912">
<link rel="stylesheet" href="resources/css/app.css?t=1539236598666">
<link rel="apple-touch-icon" sizes="180x180" href="/projects/shadowrun/charactersheet/dist/resources/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/projects/shadowrun/charactersheet/dist/resources/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/projects/shadowrun/charactersheet/dist/resources/favicon/favicon-16x16.png">
......@@ -15,7 +15,7 @@
<meta name="msapplication-TileColor" content="#da532c">
<meta name="msapplication-config" content="/projects/shadowrun/charactersheet/dist/resources/favicon/browserconfig.xml">
<meta name="theme-color" content="#ffffff">
<script type="text/javascript" src="resources/js/library/require.js?t=1537952862912" data-main="resources/js/app-min.js"></script>
<script type="text/javascript" src="resources/js/library/require.js?t=1539236598666" data-main="resources/js/app-min.js"></script>
<link rel="canonical" href="https://www.shadowrun5.net/roadmap-en.html">
</head>
<body class="o-bodyspacing" data-language="en">
......
......@@ -5,7 +5,7 @@
<meta charset="utf-8">
<meta name="format-detection" content="telephone=no">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
<link rel="stylesheet" href="resources/css/app.css?t=1537952862914">
<link rel="stylesheet" href="resources/css/app.css?t=1539236598671">
<link rel="apple-touch-icon" sizes="180x180" href="/projects/shadowrun/charactersheet/dist/resources/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/projects/shadowrun/charactersheet/dist/resources/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/projects/shadowrun/charactersheet/dist/resources/favicon/favicon-16x16.png">
......@@ -15,7 +15,7 @@
<meta name="msapplication-TileColor" content="#da532c">
<meta name="msapplication-config" content="/projects/shadowrun/charactersheet/dist/resources/favicon/browserconfig.xml">
<meta name="theme-color" content="#ffffff">
<script type="text/javascript" src="resources/js/library/require.js?t=1537952862914" data-main="resources/js/app-min.js"></script>
<script type="text/javascript" src="resources/js/library/require.js?t=1539236598671" data-main="resources/js/app-min.js"></script>
<link rel="canonical" href="https://www.shadowrun5.net/roadmap-fr.html">
</head>
<body class="o-bodyspacing" data-language="fr">
......
......@@ -5,7 +5,7 @@
<meta charset="utf-8">
<meta name="format-detection" content="telephone=no">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
<link rel="stylesheet" href="resources/css/app.css?t=1537952862916">
<link rel="stylesheet" href="resources/css/app.css?t=1539236598675">
<link rel="apple-touch-icon" sizes="180x180" href="/projects/shadowrun/charactersheet/dist/resources/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/projects/shadowrun/charactersheet/dist/resources/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/projects/shadowrun/charactersheet/dist/resources/favicon/favicon-16x16.png">
......@@ -15,7 +15,7 @@
<meta name="msapplication-TileColor" content="#da532c">
<meta name="msapplication-config" content="/projects/shadowrun/charactersheet/dist/resources/favicon/browserconfig.xml">
<meta name="theme-color" content="#ffffff">
<script type="text/javascript" src="resources/js/library/require.js?t=1537952862916" data-main="resources/js/app-min.js"></script>
<script type="text/javascript" src="resources/js/library/require.js?t=1539236598675" data-main="resources/js/app-min.js"></script>
<link rel="canonical" href="https://www.shadowrun5.net/roadmap.html">
</head>
<body class="o-bodyspacing" data-language="de">
......
......@@ -5,7 +5,7 @@
<meta charset="utf-8">
<meta name="format-detection" content="telephone=no">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
<link rel="stylesheet" href="resources/css/app.css?t=1537952862917">
<link rel="stylesheet" href="resources/css/app.css?t=1539236598679">
<link rel="apple-touch-icon" sizes="180x180" href="/projects/shadowrun/charactersheet/dist/resources/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/projects/shadowrun/charactersheet/dist/resources/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/projects/shadowrun/charactersheet/dist/resources/favicon/favicon-16x16.png">
......@@ -15,7 +15,7 @@
<meta name="msapplication-TileColor" content="#da532c">
<meta name="msapplication-config" content="/projects/shadowrun/charactersheet/dist/resources/favicon/browserconfig.xml">
<meta name="theme-color" content="#ffffff">
<script type="text/javascript" src="resources/js/library/require.js?t=1537952862917" data-main="resources/js/app-min.js"></script>
<script type="text/javascript" src="resources/js/library/require.js?t=1539236598679" data-main="resources/js/app-min.js"></script>
<link rel="canonical" href="https://www.shadowrun5.net/terms-en.html">
</head>
<body class="o-bodyspacing" data-language="en">
......
......@@ -5,7 +5,7 @@
<meta charset="utf-8">
<meta name="format-detection" content="telephone=no">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
<link rel="stylesheet" href="resources/css/app.css?t=1537952862919">
<link rel="stylesheet" href="resources/css/app.css?t=1539236598682">
<link rel="apple-touch-icon" sizes="180x180" href="/projects/shadowrun/charactersheet/dist/resources/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/projects/shadowrun/charactersheet/dist/resources/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/projects/shadowrun/charactersheet/dist/resources/favicon/favicon-16x16.png">
......@@ -15,7 +15,7 @@
<meta name="msapplication-TileColor" content="#da532c">
<meta name="msapplication-config" content="/projects/shadowrun/charactersheet/dist/resources/favicon/browserconfig.xml">
<meta name="theme-color" content="#ffffff">
<script type="text/javascript" src="resources/js/library/require.js?t=1537952862919" data-main="resources/js/app-min.js"></script>
<script type="text/javascript" src="resources/js/library/require.js?t=1539236598682" data-main="resources/js/app-min.js"></script>
<link rel="canonical" href="https://www.shadowrun5.net/terms-fr.html">
</head>
<body class="o-bodyspacing" data-language="fr">
......
......@@ -5,7 +5,7 @@
<meta charset="utf-8">
<meta name="format-detection" content="telephone=no">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
<link rel="stylesheet" href="resources/css/app.css?t=1537952862921">
<link rel="stylesheet" href="resources/css/app.css?t=1539236598686">
<link rel="apple-touch-icon" sizes="180x180" href="/projects/shadowrun/charactersheet/dist/resources/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/projects/shadowrun/charactersheet/dist/resources/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/projects/shadowrun/charactersheet/dist/resources/favicon/favicon-16x16.png">
......@@ -15,7 +15,7 @@
<meta name="msapplication-TileColor" content="#da532c">
<meta name="msapplication-config" content="/projects/shadowrun/charactersheet/dist/resources/favicon/browserconfig.xml">
<meta name="theme-color" content="#ffffff">
<script type="text/javascript" src="resources/js/library/require.js?t=1537952862921" data-main="resources/js/app-min.js"></script>
<script type="text/javascript" src="resources/js/library/require.js?t=1539236598686" data-main="resources/js/app-min.js"></script>
<link rel="canonical" href="https://www.shadowrun5.net/terms.html">
</head>
<body class="o-bodyspacing" data-language="de">
......
......@@ -32,13 +32,6 @@
}
}
&__modifier { // element is invisible because of z-index, in edit mode z-index 1 is added to have the element visible
position: absolute;
top: -1px;
margin-left: 2px;
display: none;
}
&__overflow {
label {
padding: 0;
......@@ -58,6 +51,7 @@
.c-buttonlist {
right: 20px;
z-index: 2;
}
}
&__physical {
......@@ -151,6 +145,14 @@
}
}
select.c-condition-monitor__modifier {
position: absolute;
width: 20px;
z-index: 2;
margin-left: 2px;
}
.c-condition-monitor__overflowbox.c-condition-monitor--used {
background-color: @sr-gray;
}
......@@ -175,12 +177,6 @@
.c-page__container--edit {
.c-condition-monitor, .c-condition-monitor-alt {
&__modifier {
z-index: 1;
margin-top: 5px;
display: inline-block;
}
&__physical:hover, &__mental:hover, &__overflow:hover {
.c-buttonlist {
display: block;
......
......@@ -13,13 +13,13 @@ div.o-box(class=boxsize, draggable="true", data-module="modules/Box", data-box="
div.c-condition-monitor__physical.c-condition-monitor__box-container
+addRemoveConditionMonitorBox('.c-condition-monitor__dmgbox', '.c-condition-monitor__physical')
label #{labels.physical}
select.c-condition-monitor__modifier.js-set-physical-modifier
- var values = ["-1", "0", "+1", "+2", "+3", "+4", "+5", "+6", "+7", "+8", "+9", "+10", "+11", "+12"]
each value in values
if value === "0"
option(value=value selected)=value
else
option(value=value)=value
select.c-condition-monitor__modifier.js-set-physical-modifier
- var values = ["-1", "0", "+1", "+2", "+3", "+4", "+5", "+6", "+7", "+8", "+9", "+10", "+11", "+12"]
each value in values
if value === "0"
option(value=value selected)=value
else
option(value=value)=value
- var rows = 1
while rows <= 7
+conditionmonitorPrintRow(rows++)
......@@ -27,13 +27,13 @@ div.o-box(class=boxsize, draggable="true", data-module="modules/Box", data-box="
+addRemoveConditionMonitorBox('.c-condition-monitor__dmgbox', '.c-condition-monitor__mental')
div.c-condition-monitor--align-left
label #{labels.mental}
select.c-condition-monitor__modifier.js-set-mental-modifier
- var values = ["-1", "0", "+1", "+2", "+3", "+4", "+5", "+6", "+7", "+8", "+9", "+10", "+11", "+12"]
each value in values
if value === "0"
option(value=value selected)=value
else
option(value=value)=value
select.c-condition-monitor__modifier.js-set-mental-modifier
- var values = ["-1", "0", "+1", "+2", "+3", "+4", "+5", "+6", "+7", "+8", "+9", "+10", "+11", "+12"]
each value in values
if value === "0"
option(value=value selected)=value
else
option(value=value)=value
- var rows = 1
while rows <= 5
+conditionmonitorPrintRow(rows++)
......
......@@ -12,13 +12,13 @@ div.o-box(class=boxsize, draggable="true", data-module="modules/Box", data-box="
div.c-condition-monitor__physical.c-condition-monitor__box-container
+addRemoveConditionMonitorBox('.c-condition-monitor__dmgbox', '.c-condition-monitor__physical')
label #{labels.physical}
select.c-condition-monitor__modifier.js-set-physical-modifier
- var values = ["-1", "0", "+1", "+2", "+3", "+4", "+5", "+6", "+7", "+8", "+9", "+10", "+11", "+12"]
each value in values
if value === "0"
option(value=value selected)=value
else
option(value=value)=value
select.c-condition-monitor__modifier.js-set-physical-modifier
- var values = ["-1", "0", "+1", "+2", "+3", "+4", "+5", "+6", "+7", "+8", "+9", "+10", "+11", "+12"]
each value in values
if value === "0"
option(value=value selected)=value
else
option(value=value)=value
- var rows = 1
while rows <= 7
+conditionmonitorPrintRow(rows++)
......@@ -26,13 +26,13 @@ div.o-box(class=boxsize, draggable="true", data-module="modules/Box", data-box="
+addRemoveConditionMonitorBox('.c-condition-monitor__dmgbox', '.c-condition-monitor__mental')
div.c-condition-monitor--align-left
label #{labels.mental}
select.c-condition-monitor__modifier.js-set-mental-modifier
- var values = ["-1", "0", "+1", "+2", "+3", "+4", "+5", "+6", "+7", "+8", "+9", "+10", "+11", "+12"]
each value in values
if value === "0"
option(value=value selected)=value
else
option(value=value)=value
select.c-condition-monitor__modifier.js-set-mental-modifier
- var values = ["-1", "0", "+1", "+2", "+3", "+4", "+5", "+6", "+7", "+8", "+9", "+10", "+11", "+12"]
each value in values
if value === "0"
option(value=value selected)=value
else
option(value=value)=value
- var rows = 1
while rows <= 5
+conditionmonitorPrintRow(rows++)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment