diff --git a/src/Creator/version4/css/main7.css b/src/Creator/version4/css/main7.css index 06e2fbe3..0a347eed 100644 --- a/src/Creator/version4/css/main7.css +++ b/src/Creator/version4/css/main7.css @@ -16,18 +16,6 @@ body { line-height: 1.4; } -::-moz-selection { - background: #b3d4fc; - text-shadow: none; -} - -/* -::selection { - background: #b3d4fc; - text-shadow: none; -} -*/ - hr { display: block; height: 1px; @@ -92,7 +80,7 @@ span.SW{ top: 1em; padding-right: 1em; opacity: 1; - background-position-y: -60px; + background-position: 0px -60px; } span.RW{ @@ -105,7 +93,6 @@ span.RW{ top: 1em; padding-right: 1em; opacity: 1; - background-position-y: -0px; } span.PAN{ @@ -118,7 +105,7 @@ span.PAN{ top: 1em; padding-right: 1em; opacity: 1; - background-position-y: -30px; + background-position: 0px -30px; } span.GC{ @@ -131,7 +118,7 @@ span.GC{ top: 1em; padding-right: 1em; opacity: 1; - background-position-y: -90px; + background-position: 0px -90px; } span.TH{ @@ -144,7 +131,7 @@ span.TH{ top: 1em; padding-right: 1em; opacity: 1; - background-position-y: -120px; + background-position: 0px -120px; } span.EP{ @@ -157,19 +144,27 @@ span.EP{ top: 1em; padding-right: 1em; opacity: 1; - background-position-y: -150px; + background-position: 0px -150px; } +/* SECONDAY, TERTIARY and QUATERNARY panels */ +section.panel { + position: relative; + float: left; + height: 100%; + /*background-color: rgba(242, 242, 242, .2);*/ + overflow: auto; + margin-left: 1px; + width: 21em; +} /*PRIMARY ///////////////////////////////////////////////////////////////////////////////////////////////////*/ #primary{ position: relative; float: left; height: 100%; - /*background-color: rgba(242, 242, 242, .2);*/ width: 20em; z-index: 2; - margin-right: 1px; } @@ -178,10 +173,10 @@ span.EP{ width: 20em; min-width: 20em; height:100%; - overflow-y: auto; + overflow-y: auto; list-style: none; } - + #main-nav ul{ position: relative; margin: 0; @@ -285,15 +280,6 @@ span.EP{ /*SECONDARY ///////////////////////////////////////////////////////////////////////////////////////////////////*/ - -#secondary{ - position: relative; - float: left; - height: 100%; - /*background-color: rgba(242, 242, 242, .2);*/ - overflow: auto; -} - #secondary .mainlist{ padding: 0; margin: 0; @@ -382,10 +368,6 @@ span.EP{ } /*aptitudes*/ -#aptitudes{ - width: 20em; -} - #aptitudes label{ padding-left: 1em; display: block; @@ -418,10 +400,6 @@ span.EP{ /*backgrounds*/ -#backgrounds{ - width: 20em; -} - #backgrounds label{ padding-left: 1em; display: block; @@ -461,10 +439,6 @@ span.EP{ } /*factions*/ -#factions{ - width: 20em; -} - #factions label{ padding-left: 1em; display: block; @@ -480,10 +454,6 @@ span.EP{ } /* motivations */ -#motivation{ - width: 20em; -} - #motivation label{ padding-left: 1em; display: block; @@ -550,10 +520,6 @@ span.EP{ /*reputations*/ -#reputations{ - width: 20em; -} - #reputations label{ padding-left: 1em; display: block; @@ -579,10 +545,6 @@ span.EP{ /*positive traits*/ -#postraits{ - width: 20em; -} - #postraits label{ padding-left: 1em; display: block; @@ -598,10 +560,6 @@ span.EP{ } /*negative traits*/ -#negtraits{ - width: 20em; -} - #negtraits label{ padding-left: 1em; display: block; @@ -617,10 +575,6 @@ span.EP{ } /*psy sleigths*/ -#psyS{ - width: 20em; -} - #psyS label{ padding-left: 1em; display: block; @@ -636,11 +590,6 @@ span.EP{ } /*active and knowledge skill*/ - -#enterSkill{ - width: 21em;/*Jige*/ -} - #enterSkill input{ width: 9em; } @@ -671,7 +620,6 @@ span.EP{ #knoSklDiv { font-family: 'Lato', sans-serif; - width: 21em; /*Jige*/ } #knoSklDiv .icone{ @@ -699,9 +647,7 @@ span.EP{ #actSklDiv { font-family: 'Lato', sans-serif; - width: 21em; -} - +} #actSklDiv .icone{ display: block; @@ -818,6 +764,10 @@ span.EP{ z-index: 1000; } +.spezInt { + width: 97%; +} + .costInfo { font-size: x-small; display: block; @@ -862,10 +812,6 @@ span.EP{ /*morphs*/ -#morphs{ - width: 20em; -} - #morphs label{ padding-left: 1em; display: block; @@ -996,10 +942,6 @@ span.EP{ /* credits */ -#credits{ - width: 20em; -} - #credits label{ padding-left: 1em; display: block; @@ -1056,10 +998,6 @@ span.EP{ } /* stats */ -#stats{ - width: 20em; -} - #stats label{ padding-left: 1em; display: block; @@ -1129,10 +1067,6 @@ span.EP{ /*Ai and softgear*/ -#soft{ - width: 20em; -} - #soft label{ padding-left: 1em; display: block; @@ -1201,16 +1135,6 @@ span.EP{ /*TERTIARY ///////////////////////////////////////////////////////////////////////////////////////////////////*/ -#tertiary{ - position: relative; - float: left; - height: 100%; - /*background-color: rgba(242, 242, 242, .2);*/ - margin-left: 1px; - overflow: auto; -} - - #tertiary .mainlist{ padding: 0; margin: 0; @@ -1230,10 +1154,6 @@ span.EP{ border-bottom: 1px solid rgba(148,155,153,.8); } -#bmdList{ - width: 20em; -} - .listSection{ font-size: x-small; background-color: rgba(202,194,194,0.61); @@ -1435,7 +1355,6 @@ span.EP{ #tertiary_infos{ visibility: hidden; - width: 20em; color: hsl(200,10%,40%); background-color: rgba(242, 242, 242, .8); border-top: 1px solid rgba(245, 245, 245, .8); @@ -1443,10 +1362,6 @@ span.EP{ padding: 1em; } -#morph-settings{ - width: 20em; -} - #morph-settings label{ float: left; padding-left: 1em; @@ -1471,10 +1386,6 @@ span.EP{ text-align: left; } -#morphPostraits{ - width: 20em; -} - #morphPostraits label{ padding-left: 1em; display: block; @@ -1487,16 +1398,11 @@ span.EP{ background-color: rgba(254, 254, 254, .85); } -#morphNegtraits{ - width: 20em; -} - #morphNegtraits label{ padding-left: 1em; display: block; line-height:3em; padding-right: 1em; - } #morphNegtraits li:hover{ @@ -1505,16 +1411,11 @@ span.EP{ } -ul#implants{ - width: 20em; -} - ul#implants label{ padding-left: 1em; display: block; line-height:3em; padding-right: 1em; - } ul#implants li:hover{ @@ -1522,10 +1423,6 @@ ul#implants li:hover{ background-color: rgba(254, 254, 254, .85); } -#gears{ - width: 20em; -} - #gears label{ padding-left: 1em; display: block; @@ -1539,16 +1436,11 @@ ul#implants li:hover{ background-color: rgba(254, 254, 254, .85); } -#statWithMorph{ - width: 20em; -} - #statWithMorph label{ padding-left: 1em; display: block; line-height:3em; padding-right: 1em; - } #statWithMorph li:hover{ @@ -1556,31 +1448,14 @@ ul#implants li:hover{ background-color: rgba(254, 254, 254, .85); } -#aptsWithMorph{ - width: 20em; -} - #aptsWithMorph label{ padding-left: 1em; display: block; line-height:3em; padding-right: 1em; - -} - - -/*QUTERNARY ///////////////////////////////////////////////////////////////////////////////////////////////////*/ - -#quaternary{ - position: relative; - float: left; - height: 100%; - /*background-color: rgba(242, 242, 242, .2);*/ - margin-left: 1px; - overflow: auto; - } +/*QUTERNARY ///////////////////////////////////////////////////////////////////////////////////////////////////*/ #quaternary .mainlist{ padding: 0; margin: 0; @@ -1602,7 +1477,6 @@ ul#implants li:hover{ #quaternary_infos{ visibility: hidden; - width: 20em; color: hsl(200,10%,40%); background-color: rgba(242, 242, 242, .8); border-top: 1px solid rgba(245, 245, 245, .8); @@ -1610,10 +1484,6 @@ ul#implants li:hover{ padding: 1em; } -#bmdList{ - width: 20em; -} - .listSection{ font-size: x-small; background-color: rgba(202,194,194,0.61); @@ -1655,7 +1525,6 @@ ul#implants li:hover{ padding-bottom: 1em; } - .bmChoice{ font-size: x-small; color: hsl(200,10%,40%); @@ -1665,6 +1534,7 @@ ul#implants li:hover{ line-height:3em; padding-right: 1em; } + .bmChoiceInput{ font-size: x-small; color: hsl(200,10%,40%); @@ -1724,7 +1594,6 @@ ul#implants li:hover{ -ms-transition: opacity .3s ease .2s; -o-transition: opacity .3s ease .2s; transition: opacity .3s ease .2s; - } .iconebmSimpleRemChoice:hover{ @@ -1748,7 +1617,6 @@ ul#implants li:hover{ -ms-transition: opacity .3s ease .2s; -o-transition: opacity .3s ease .2s; transition: opacity .3s ease .2s; - } .iconebmChoice:hover{ @@ -1772,7 +1640,6 @@ ul#implants li:hover{ -ms-transition: opacity .3s ease .2s; -o-transition: opacity .3s ease .2s; transition: opacity .3s ease .2s; - } .iconebmRemChoice:hover{ @@ -1843,7 +1710,7 @@ ul#implants li:hover{ margin:0; background-color: rgba(242, 242, 242, .8); width: 120px; - height:140px; + height:200px; border-bottom: 1px solid rgba(148,155,153,.6); border-top: 1px solid rgba(245, 245, 245, .6); font-size:1.25em; @@ -2449,12 +2316,6 @@ ul#implants li:hover{ clear: both; } -/* -.clearfix { - *zoom: 1; -} -*/ - input#saveName { width: 296px; } diff --git a/src/Creator/version4/index.php b/src/Creator/version4/index.php index 6e8e40fd..8a0c71c8 100644 --- a/src/Creator/version4/index.php +++ b/src/Creator/version4/index.php @@ -162,13 +162,13 @@ -
+
-
+
-
+
@@ -176,7 +176,9 @@ AP
RP
CR
- RZ
+ ASR
+ KSR
+ RZ
diff --git a/src/Creator/version4/other/armorDegatsLayer.php b/src/Creator/version4/other/armorDegatsLayer.php index 3b18476c..6ae38925 100644 --- a/src/Creator/version4/other/armorDegatsLayer.php +++ b/src/Creator/version4/other/armorDegatsLayer.php @@ -16,10 +16,10 @@ function getADHtml($gear){ echo " "; echo ""; echo "
  • "; - echo " "; + echo " "; echo "
  • "; echo "
  • "; - echo " "; + echo " "; echo "
  • "; } } diff --git a/src/Creator/version4/popup-contents/about.php b/src/Creator/version4/popup-contents/about.php index 8e3085d3..623e9857 100644 --- a/src/Creator/version4/popup-contents/about.php +++ b/src/Creator/version4/popup-contents/about.php @@ -10,7 +10,7 @@ Eclipse Phase Character Creator
    - Version 1.2.0 (09.2014) + Version 1.2.1 (07.2015)

    A character creator for the
    Eclipse Phase role-playing game.

    @@ -23,6 +23,8 @@ Russell Bewley
    + Stoo Goof
    + Derek Payne
    Cédric Reinhardt
    Jigé Pont
    Olivier Murith
    diff --git a/src/Creator/version4/popup-contents/load.php b/src/Creator/version4/popup-contents/load.php index 3a937bf2..f2d16d45 100644 --- a/src/Creator/version4/popup-contents/load.php +++ b/src/Creator/version4/popup-contents/load.php @@ -24,11 +24,11 @@ Check if you want to continue on creation mode.

    - I have earn Rez points. + I have earned Rez points.

    - I have earn Reputation points. + I have earned Reputation points.

    - I have earn Credits. + I have earned Credits.

    diff --git a/src/Creator/version4/popup-contents/reset.php b/src/Creator/version4/popup-contents/reset.php index 9845c270..1ac9c9aa 100644 --- a/src/Creator/version4/popup-contents/reset.php +++ b/src/Creator/version4/popup-contents/reset.php @@ -27,7 +27,7 @@