diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.css b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.css index e457854ed..821273699 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.css +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.css @@ -1,132 +1,259 @@ .welcome { - padding: 1px 12px 20px; - background: #fff; + height: 100%; + overflow: auto; +} +.welCard{ + background-color: #EFF2F3; + height: calc(100% - 50px); + overflow: auto; + padding-bottom: 30px; +} +.welTab { + display: flex; + justify-content: space-between; + align-items: center; + /* position: relative; */ + background: #fff; + padding: 1px 12px 0px; + font-size: 14px; + line-height: 40px; +} + +.welTab div { + padding: 0 5px; + position: relative; +} + +.welTab div:after { + content: ''; + position: absolute; + left: 0; + right: 0; + bottom: 3px; + height: 2px; +} + +.welTab div.active { + color: #0C86D8; +} + +.welTab div.active:after { + background-color: #0C86D8; +} + +.welBox { + display: none; + /* background: #fff; */ + /* padding: 0px 12px 20px; */ +} +.welbox2{ + padding: 0px 12px 0px; + background-color: #fff; +} +.welBox.active { + display: block; } .welT { - font-size: 16px; - margin-bottom: 10px; - line-height: 26px; -} - - .welT i { - width: 26px; - height: 26px; - line-height: 24px; - border: 1px solid #efefef; - border-radius: 4px; - float: right; - text-align: center; - color: #999; - } + padding: 10px 0; + font-weight: bold; + font-size: 16px; + line-height: 26px; +} + +.welT2 { + height: 46px; + line-height: 46px; + font-size: 16px; + margin: 0 -12px; + padding: 0 12px; + background-color: #EFF2F3; +} + +.welT i { + width: 26px; + height: 26px; + line-height: 24px; + border: 1px solid #efefef; + border-radius: 4px; + float: right; + text-align: center; + color: #999; +} .welLine { - height: 1px; - background: #efefef; - margin: 10px -12px; + height: 7px; + background-color: #EFF2F3; + /* margin: 10px -12px; */ } .welText { - overflow: hidden; - font-size: 14px; - margin-top: 5px; + overflow: hidden; + font-size: 14px; + margin-top: 8px; + line-height: 0; } - .welText span { - float: right; - width: 60%; - text-align: right; - } +.welText div { + width: 58px; + display: inline-block; + line-height: 20px; + text-align: justify; + text-align-last: justify; +} + +.welText div:after { + overflow: hidden; + width: 100%; + content: ''; +} + +.welText span { + float: right; + width: 60%; + text-align: right; + line-height: 20px; +} + +.welInputBox { + margin: 0 -12px; +} .welInput { - overflow: hidden; - font-size: 14px; - margin-top: 10px; -} - - .welInput span { - float: left; - width: 26%; - text-align: right; - line-height: 30px; - } - - .welInput input { - display: block; - margin-left: 28%; - width: 72%; - border: 1px solid #efefef; - border-radius: 4px; - height: 30px; - line-height: 28px; - padding: 0 10px; - margin-bottom: 0; - } + overflow: hidden; + font-size: 14px; + /* margin-top: 10px; */ + height: 46px; + padding: 8px 12px; + border-top: 1px solid #EFF2F3; +} +.welInput:first-child { + border: 0; +} + +.welInput span { + float: left; + width: 70px; + text-align: right; + line-height: 30px; + text-align: justify; + text-align-last: justify; +} + +.welInput span:after { + overflow: hidden; + width: 100%; + content: ''; +} + +.welInput .welInputs { + display: block; + margin-left: 80px; + width: calc(100% - 80px); + border: 0px solid #efefef; + border-radius: 4px; + height: 30px; + line-height: 28px; + padding: 0 10px; + margin-bottom: 0; + text-align: right; +} +.welInput .lr-picker { + line-height: 30px; +} .welCon { - padding: 10px; - border: 1px solid #efefef; - margin-top: 18px; - border-radius: 4px; - position: relative; + margin-top: 18px; + position: relative; + margin: 0 -12px; } .welDel { - position: absolute; - top: -8px; - left: -8px; - background: #fff; -} - - .welDel i { - text-align: center; - width: 26px; - height: 26px; - display: block; - line-height: 24px; - border: 1px solid #efefef; - border-radius: 50%; - } + background: #EFF2F3; + padding: 5px 12px 10px; + text-align: right; +} -.welImgAdd { - text-align: center; - line-height: 0; +.welDel i,.welAdd i { + text-align: center; + width: 26px; + height: 26px; + line-height: 24px; + border: 2px solid #0C86D8; + border-radius: 3px; + background: #ffff; + color: #0C86D8; +} + +.welAdd{ + background: #EFF2F3; + margin: 0 -12px; + padding: 5px 12px; + font-size: 14px; + color: #0C86D8; } #files { - opacity: 0; - -webkit-opacity: 0; - z-index: 9; - display: none; + opacity: 0; + -webkit-opacity: 0; + z-index: 9; + display: none; } #welImgBtn { - display: block; - width: 110px; - height: 30px; - text-align: center; - line-height: 26px; - border: 2px solid #efefef; - border-radius: 4px; - font-size: 14px; - color: #999; - margin: 10px auto; - cursor: pointer; -} -.welImgAdd{ - min-height:110px; -} -#PhotoImg { - width: 110px; - height:110px; -} - -.btnBox{ - margin-top:20px; - text-align:center; + display: block; + width: 110px; + height: 30px; + text-align: center; + line-height: 26px; + border: 2px solid #efefef; + border-radius: 4px; + font-size: 14px; + color: #999; + margin: 10px auto; + cursor: pointer; +} + +.welImgAdd { + width: 225px; + margin: 60px auto; + border: 1px solid #0C86D8; + border-radius: 6px; + overflow: hidden; + line-height: 0; +} + +.welImgAdd img { + width: 100%; } + +/* #PhotoImg { + width: 110px; + height: 110px; +} */ +.welImgInfo { + width: 260px; + margin: 0 auto; + color: #888888; +} + +.welImgInfoT { + font-size: 16px; + font-weight: bold; +} + +.welImgInfoTxt { + font-size: 14px; + margin-top: 10px; +} +.btnBox { + margin-top: 20px; + text-align: center; +} + #saveBtn { - margin: auto; - margin-top: 25px; - width: 92%; -} \ No newline at end of file + margin: auto; + margin-top: 25px; + width: 92%; + border-radius: 6px; +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html index bbd9a4eee..78f79d8f9 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html +++ b/Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/welcome/welcome.html @@ -1,157 +1,196 @@ -