diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.html b/Mohem/src/app/eit/eit-list/eit-list.component.html index 51a4ac97..5e2769c7 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.html +++ b/Mohem/src/app/eit/eit-list/eit-list.component.html @@ -1,15 +1,12 @@ - - - - - - {{headerTitle}} - + + + {{headerTitle}} + - + 0 "> @@ -63,9 +60,9 @@ 0 "> - + - + + - + + - + + + + + {{item.SEGMENT_PROMPT}} + + {{item.SEGMENT_VALUE_DSP}} + + + + + - - - - + + + + + + + @@ -115,7 +127,7 @@ - - {{'general, add' | translate}} + \ No newline at end of file diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.scss b/Mohem/src/app/eit/eit-list/eit-list.component.scss index e10a250d..81a31342 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.scss +++ b/Mohem/src/app/eit/eit-list/eit-list.component.scss @@ -9,3 +9,77 @@ h4 { text-align: center; color: #000000; } +.grids{ + border-radius: 20px !important; + background: white; + padding-left: 1px; + padding-right: 1px; + margin: 13px; + padding-top: 0px; + padding-bottom: 3px; + padding-left: 13px; + padding-right: 13px; + border: 1px solid #cac8c8; + } + + .bgcolor { + + color: white; + border-top-right-radius: 19px; + border-top-left-radius: 15px; + padding-top: 1; + padding-bottom: 0; + margin-top: 0; + margin-bottom: 0; + /* border-radius: 12px !important; */ + background: #094875; + border-bottom: 1px solid #a7a4a4; + border-top: 1px solid #cac8c8; + margin-left: -13px; + margin-right: -13px; +} +.colEit{ + border-right: 1px solid #cac8c8; + border-bottom-left-radius: -10px !important; + padding-top: 8px; + padding-bottom: 8px; + margin-left: 18px; + font-size: 12px !important; +} + +.header-div { + + background-color: #22C6B3; + text-transform: capitalize; + height: 160px; + position: relative; + display: block; + margin-bottom: -28px; +} + +.header-toolbar-new{ + --background: #22c6b3; +} + +.addClass{ + background-color: #094875; + width: 80px; + height: 80px; + right: 8%; + position: fixed; + color: white; + bottom: 20%; + border-radius: 50%; + z-index: 999; + -webkit-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); + -moz-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); + box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); +} + +.hrClass{ + border-width: 0; + box-sizing: content-box; + border-bottom: 1px solid #e6e6e6; + background: #fff !important; + height: 1px; +} \ No newline at end of file diff --git a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html index 6bb094f2..3d11570b 100644 --- a/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html +++ b/Mohem/src/app/profile/performance-evaluation/performance-evaluation.component.html @@ -5,7 +5,7 @@ {{ts.trPK('userProfile','performance')}} - + diff --git a/Mohem/src/app/uI-elements/date-time.input.ts b/Mohem/src/app/uI-elements/date-time.input.ts index aa5c15d8..9225c9fc 100644 --- a/Mohem/src/app/uI-elements/date-time.input.ts +++ b/Mohem/src/app/uI-elements/date-time.input.ts @@ -42,8 +42,8 @@ export class DateTimeInput extends UiElement { // timeValue=arrayDate[1]; // } const template = - "" + - " " + this.label + "" + + "" + + " " + this.label + "" + // " " + this.value + "" + "" + // " "+ diff --git a/Mohem/src/app/uI-elements/date.input.ts b/Mohem/src/app/uI-elements/date.input.ts index 9e486e9e..a813416e 100644 --- a/Mohem/src/app/uI-elements/date.input.ts +++ b/Mohem/src/app/uI-elements/date.input.ts @@ -41,8 +41,8 @@ export class DateInput extends UiElement { // " "+ // " "; - "" + - " " + this.label + "" + + "" + + " " + this.label + "" + // " " + this.value + "" + "" + // " "+ diff --git a/Mohem/src/app/uI-elements/number.input.ts b/Mohem/src/app/uI-elements/number.input.ts index da23b7c8..e8b68ee9 100644 --- a/Mohem/src/app/uI-elements/number.input.ts +++ b/Mohem/src/app/uI-elements/number.input.ts @@ -26,8 +26,8 @@ export class NumberInput extends UiElement { // " " + // " "; - "" + - "" + this.label + "" + + " " + + "" + this.label + "" + " " + " "; diff --git a/Mohem/src/app/uI-elements/text-area.input.ts b/Mohem/src/app/uI-elements/text-area.input.ts index 6f724b74..b16fa4f6 100644 --- a/Mohem/src/app/uI-elements/text-area.input.ts +++ b/Mohem/src/app/uI-elements/text-area.input.ts @@ -26,8 +26,8 @@ export class TextAreaInput extends UiElement { // "" + this.value + "" + // " "; - "" + - "" + this.label + "" + + "" + + "" + this.label + "" + "" + this.value + "" + ""; diff --git a/Mohem/src/app/uI-elements/text.input.ts b/Mohem/src/app/uI-elements/text.input.ts index 5a31a96c..9a8632fe 100644 --- a/Mohem/src/app/uI-elements/text.input.ts +++ b/Mohem/src/app/uI-elements/text.input.ts @@ -24,9 +24,9 @@ export class TextInput extends UiElement { if (this.hidden === "N") { this.hidden = "display:none;" } else { this.hidden = "" } const template = // "" + - "" + - " " + this.label + "" + - " " + + "" + + " " + this.label + "" + + " " + " "; return template; diff --git a/Mohem/src/app/uI-elements/time.input.ts b/Mohem/src/app/uI-elements/time.input.ts index 8f20eb5d..001589f0 100644 --- a/Mohem/src/app/uI-elements/time.input.ts +++ b/Mohem/src/app/uI-elements/time.input.ts @@ -32,7 +32,7 @@ export class TimeInput extends UiElement { } const template = "" + - " " + this.label + "" + + " " + this.label + "" + // " "+ " "+this.value+""+ " "; diff --git a/Mohem/src/imgs/addicon.png b/Mohem/src/imgs/addicon.png new file mode 100644 index 00000000..040c628f Binary files /dev/null and b/Mohem/src/imgs/addicon.png differ diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index f4c224f2..1c82e109 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -95,6 +95,8 @@ ion-label{ .btnBack{ background: transparent !important; } + + /***************/ .attachImg{ max-width: 30px; @@ -393,7 +395,160 @@ ion-col.colBold,ion-col.colBold>label{ // padding:0px; // } + + + +.floating-form { + width:320px; +} + +// /**** floating-Lable style start ****/ +// .floating-label { +// position:relative; +// margin-bottom:20px; +// } +// .floating-input , .floating-select { +// font-size:14px; +// padding:4px 4px; +// display:block; +// width:100%; +// height:30px; +// background-color: transparent; +// border:none; +// border-bottom:1px solid #757575; +// } + +// .floating-input:focus , .floating-select:focus { +// outline:none; +// border-bottom:2px solid #5264AE; +// } + +// label { +// color:#999; +// font-size:14px; +// font-weight:normal; +// position:absolute; +// pointer-events:none; +// left:5px; +// top:5px; +// transition:0.2s ease all; +// -moz-transition:0.2s ease all; +// -webkit-transition:0.2s ease all; +// } + +// .floating-input:focus ~ label, .floating-input:not(:placeholder-shown) ~ label { +// top:-18px; +// font-size:14px; +// color:#5264AE; +// } + +// .floating-select:focus ~ label , .floating-select:not([value=""]):valid ~ label { +// top:-18px; +// font-size:14px; +// color:#5264AE; +// } + +// /* active state */ +// .floating-input:focus ~ .bar:before, .floating-input:focus ~ .bar:after, .floating-select:focus ~ .bar:before, .floating-select:focus ~ .bar:after { +// width:50%; +// } + +// *, *:before, *:after { +// -webkit-box-sizing: border-box; +// -moz-box-sizing: border-box; +// box-sizing: border-box; +// } + +// .floating-textarea { +// min-height: 30px; +// max-height: 260px; +// overflow:hidden; +// overflow-x: hidden; +// } + +// /* highlighter */ +// .highlight { +// position:absolute; +// height:50%; +// width:100%; +// top:15%; +// left:0; +// pointer-events:none; +// opacity:0.5; +// } + +// /* active state */ +// .floating-input:focus ~ .highlight , .floating-select:focus ~ .highlight { +// -webkit-animation:inputHighlighter 0.3s ease; +// -moz-animation:inputHighlighter 0.3s ease; +// animation:inputHighlighter 0.3s ease; +// } + +// /* animation */ +// @-webkit-keyframes inputHighlighter { +// from { background:#5264AE; } +// to { width:0; background:transparent; } +// } +// @-moz-keyframes inputHighlighter { +// from { background:#5264AE; } +// to { width:0; background:transparent; } +// } +// @keyframes inputHighlighter { +// from { background:#5264AE; } +// to { width:0; background:transparent; } +// } + +// /**** floating-Lable style end ****/ + + + + + + + + + + + + + + + + + + + + +/*** Body style start ***/ + +// html { +// font-family: "Helvetica Neue", Helvetica, "Noto Sans", sans-serif, Arial, sans-serif; +// font-size: 12px; +// line-height: 1.42857143; +// color: #949494; +// background-color: #ffffff; +// } +/*** Body style end ***/ + + +/*** daniel - Fork me friend - style ***/ +// .floating-credit { position:fixed; bottom:10px;right:10px; color:#aaa; font-size:13px;font-family:arial,sans-serif; } +// .floating-credit a { text-decoration:none; color:#000000; font-weight:bold; } +// .floating-credit a:hover { border-bottom:1px dotted #f8f8f8; } +// .floating-heading { position:fixed; color:#aaa; font-size:20px; font-family:arial,sans-serif; } +/*** daniel - Fork me friend - style ***/ + +/**************************TEST********************888/ + + /*****************dynamic form*******************/ +.dynamicField{ + border-radius: 30px; + border: 1px solid grey!important; + margin-bottom: 20px; +} + + .daynamicForm-Label{ font-size: 16px; // margin-left: 15px; diff --git a/Mohem/src/theme/worklist.scss b/Mohem/src/theme/worklist.scss index ff4399e6..17f43754 100644 --- a/Mohem/src/theme/worklist.scss +++ b/Mohem/src/theme/worklist.scss @@ -340,7 +340,7 @@ ion-item{ --flex:none; } ion-input ,ion-datetime{ -border-bottom: #dedede 1px solid; +// border-bottom: #dedede 1px solid; } .left { .timeline:before{
{{ts.trPK('userProfile','performance')}}