diff --git a/kfet/static/kfet/css/index.css b/kfet/static/kfet/css/index.css index 241785ae..65fcfb38 100644 --- a/kfet/static/kfet/css/index.css +++ b/kfet/static/kfet/css/index.css @@ -7,6 +7,10 @@ body { font-family:Roboto; } +body > .container-fluid { + background:#ddd; +} + h1,h2,h3,h4,h5,h6 { font-family:Oswald; } diff --git a/kfet/static/kfet/css/jconfirm-kfet.css b/kfet/static/kfet/css/jconfirm-kfet.css index 8509c274..86c7c42b 100644 --- a/kfet/static/kfet/css/jconfirm-kfet.css +++ b/kfet/static/kfet/css/jconfirm-kfet.css @@ -1,3 +1,7 @@ +.jconfirm-bg.seen { + opacity:1 !important; +} + .jconfirm .jconfirm-box { padding:0; border-radius:0 !important; diff --git a/kfet/static/kfet/css/kpsul.css b/kfet/static/kfet/css/kpsul.css index 3a427c23..3c989fcb 100644 --- a/kfet/static/kfet/css/kpsul.css +++ b/kfet/static/kfet/css/kpsul.css @@ -8,6 +8,10 @@ input[type=number]::-webkit-outer-spin-button { margin: 0; } +#account, #checkout, input, #history, #basket, #basket_rel, #articles_data { + background:#fff; +} + /* * Top row */ @@ -24,7 +28,7 @@ input[type=number]::-webkit-outer-spin-button { /* Account */ #account { - border:1px solid #ddd; + border:1px solid #fff; color:black; height:120px; } @@ -53,7 +57,7 @@ input[type=number]::-webkit-outer-spin-button { border:0; border-radius:0; - background:#ddd; + background:#fff; font-family:'Roboto Mono'; font-size:50px; @@ -115,7 +119,7 @@ input[type=number]::-webkit-outer-spin-button { /* Checkout */ #checkout { - border:1px solid #ddd; + border:1px solid #c8102e; padding:0; height:160px; font-family:'Roboto Mono'; @@ -133,7 +137,8 @@ input[type=number]::-webkit-outer-spin-button { height:50px; padding:0 15px; - background:#ddd; + background:#c8102e; + color:#fff; font-weight:bold; font-size:18px; @@ -145,6 +150,7 @@ input[type=number]::-webkit-outer-spin-button { line-height:25px; font-weight:normal; font-size:14px; + background-color:rgba(255,255,255,0.1); } #checkout_data { @@ -156,24 +162,32 @@ input[type=number]::-webkit-outer-spin-button { */ .row.kpsul_middle { - padding:0 15px; + margin:15px 0; font-family:'Roboto Mono'; color:#000; } .row.kpsul_middle > div { - margin-top:15px; padding:0; + height:100%; } .row.kpsul_middle > div:first-child > div { margin-right:0; } +.row.kpsul_middle > div+div { + margin-top:15px; +} + @media (min-width:768px) { .row.kpsul_middle > div:first-child > div { margin-right:15px } + + .row.kpsul_middle > div { + margin-top:0 !important; + } } /* Special operations */ @@ -188,8 +202,8 @@ input[type=number]::-webkit-outer-spin-button { float:left; - background:#ddd; - color:#000; + background:#c8102e; + color:#FFF; font-size:18px; font-weight:bold; @@ -200,12 +214,12 @@ input[type=number]::-webkit-outer-spin-button { } #operation_deposit:focus, #operation_deposit:hover { - background:#009011; + background:#000; color:#FFF; } #operation_withdraw:focus, #operation_withdraw:hover { - background:#C8102E; + background:#000; color:#FFF; } @@ -219,9 +233,11 @@ input[type=number]::-webkit-outer-spin-button { #article_selection input { height:100%; float:left; - border:1px solid #ddd; + border-left:1px solid #c8102e; + border-right:1px solid #c8102e; border-radius:0; border-top:0; + border-bottom:0; font-size:16px; font-weight:bold; } @@ -231,20 +247,29 @@ input[type=number]::-webkit-outer-spin-button { } #article_autocomplete { - width:95%; + width:90%; padding-left:10px; } #article_number { - width:5%; + width:10%; text-align:center; } +@media (min-width:1200px) { + #article_autocomplete { + width:92% + } + + #article_number { + width:8%; + } +} + /* Article data */ #articles_data { - border:1px solid #ddd; - border-top:0; + border:1px solid #c8102e; overflow:auto; max-height:500px; @@ -265,8 +290,9 @@ input[type=number]::-webkit-outer-spin-button { #articles_data table tr.category { height:35px; - background-color:#ddd; + background-color:#c8102e; font-size:16px; + color:#FFF; font-weight:bold; } @@ -277,13 +303,12 @@ input[type=number]::-webkit-outer-spin-button { /* Second part - Left - bottom */ .kpsul_middle_left_bottom { - height:160px; - margin:15px 0; - border:1px solid #ddd; + margin:15px 0 0; + border:1px solid #c8102e; } .kpsul_middle_left_bottom > div { - height:100%; + height:160px; padding:0; } @@ -292,7 +317,15 @@ input[type=number]::-webkit-outer-spin-button { } #basket_rel { - border-left:1px solid #ddd; + border-top:1px solid #c8102e; + border-left:0; +} + +@media (min-width:768px) { + #basket_rel { + border-left:1px solid #c8102e; + border-top:0; + } } #basket table { @@ -306,29 +339,96 @@ input[type=number]::-webkit-outer-spin-button { #basket tr .amount { width:70px; - padding-right:10px; + padding-right:15px; text-align:right; } #basket tr .number { width:50px; - padding-right:10px; + padding-right:15px; text-align:right; } #basket tr.ui-selected, #basket tr.ui-selecting { - background-color:#C8102E; + background-color:rgba(200,16,46,0.6); color:#FFF; } /* History */ +#history { + overflow:auto; + height:100%; + border:1px solid #c8102e; +} + +#history .day { + height:40px; + line-height:40px; + background-color:#c8102e; + color:#fff; + padding-left:20px; + font-size:16px; + font-weight:bold; +} + +#history .opegroup .general { + height:30px; + line-height:30px; + background-color:#c8102e; + color:#fff; + font-weight:bold; + padding-left:10px; +} + +#history .opegroup .general .trigramme { + padding-left:15px; +} + +#history .opegroup .general .amount { + padding-left:15px; +} + +#history .opegroup .ope { + position:relative; + height:25px; + line-height:24px; + font-size:12px; +} + +#history .opegroup .ope .amountukf { + padding-left:15px; +} + +#history .opegroup .ope span { + display:inline-block; + padding-right:10px; +} + +#history .opegroup .ope .amountukf { + width:75px; + text-align:right; +} + +#history .opegroup .ope .infos1 { + width:60px; + text-align:right; +} + #history div.general.ui-selected, #history div.general.ui-selecting, #history div.ope.ui-selected, #history div.ope.ui-selecting { - background-color:#C8102E; + background-color:rgba(200,16,46,0.6); color:#FFF; } -#history .canceled { - text-decoration:line-through; +#history .ope.canceled { + color:#444; +} + +#history .ope.canceled::before { + position: absolute; + content: ' '; + width:100%; + top: 12px; + border-top: 1px solid rgba(200,16,46,0.5); } diff --git a/kfet/static/kfet/css/kpsul_grid.css b/kfet/static/kfet/css/kpsul_grid.css index e8121f1c..c90924d2 100644 --- a/kfet/static/kfet/css/kpsul_grid.css +++ b/kfet/static/kfet/css/kpsul_grid.css @@ -2,9 +2,8 @@ html { height:100%; } body { height:calc(100% - 50px); } .container-fluid { height:100%; } - .kpsul_middle { height:calc(100% - 175px); } - .kpsul_middle_left_col { height:calc(100% - 15px); } - .kpsul_middle_left_top { height:calc(100% - 190px); min-height:80px; } + .kpsul_middle { height:calc(100% - 205px); } + .kpsul_middle_left_top { height:calc(100% - 175px); min-height:80px; } .kpsul_middle_left { height:100%; } #articles_data { height: calc(100% - 80px); } } diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html index 9ecaf342..e044e415 100644 --- a/kfet/templates/kfet/kpsul.html +++ b/kfet/templates/kfet/kpsul.html @@ -87,7 +87,7 @@ -