1 files changed, 139 insertions, 60 deletions

diff --git a/main/survey/skins/1kaNature.css b/main/survey/skins/1kaNature.css
index 7103d81..61552da 100644
--- a/main/survey/skins/1kaNature.css
+++ b/main/survey/skins/1kaNature.css
@@ -6,13 +6,14 @@
 /*

 	Osnovna tema ankete - 1ka - brez definiranih barv

 */

+/* Barve */

 /* Fonti */

 body {

   margin: 0;

   padding: 0;

-  color: #505050;

+  color: #333333;

   font-size: 100%;

-  font-family: Montserrat, Arial, Sans-Serif !important;

+  font-family: Source Sans Pro, sans-serif !important;

   background: #ffffff;

 }

 

@@ -28,13 +29,15 @@ body.preview, body.testdata {
   position: absolute;

   width: 100%;

   height: 80px;

-  border-bottom: 6px #1e88e5 solid;

+  border-bottom: 2px #1e88e5 solid;

 }

 #outercontainer #container {

   position: relative;

   width: 100%;

   max-width: 1200px;

-  margin: 0px auto 10px;

+  margin: 0px auto;

+  padding: 0 16px;

+  box-sizing: border-box;

 }

 

 /* Warning bar (preview, cookie) */

@@ -69,12 +72,14 @@ body.preview, body.testdata {
 

 /* Header - logo, naslov, progressbar */

 h1 {

-  margin: 0px auto 30px;

-  padding: 120px 0 50px 0;

-  font-size: 28px;

+  margin: 0px auto;

+  padding: 114px 0 32px 0;

+  font-size: 32px;

+  font-weight: 600;

+  line-height: 40px;

   color: #505050;

   text-align: center;

-  border-bottom: 1px solid #ddeffd;

+  border-bottom: 1px solid #E5E5E5;

 }

 

 h1.evalvacija {

@@ -83,10 +88,10 @@ h1.evalvacija {
 

 #logo {

   right: auto;

-  left: 25px;

+  left: 16px;

   top: 13px;

   max-height: 56px !important;

-  background: url("../../../public/img/logo/1ka_slo.svg");

+  background: url("../../../public/img/logo/1ka_logo_slo.svg");

   background-repeat: no-repeat !important;

   background-size: auto 100% !important;

 }

@@ -96,7 +101,19 @@ h1.evalvacija {
 }

 

 #logo.english {

-  background: url("../../../public/img/logo/1ka_eng.svg");

+  background: url("../../../public/img/logo/1ka_logo_eng.svg");

+}

+

+#logo.namestitev {

+  background: url("../../../public/img/logo/1ka_logo_namestitev.svg");

+}

+

+#logo.namestitev.english {

+  background: url("../../../public/img/logo/1ka_logo_installation.svg");

+}

+

+#logo.arnes {

+  background: url("../../../public/img/logo/1ka_logo_arnes.svg");

 }

 

 .header_settings_holder {

@@ -105,11 +122,11 @@ h1.evalvacija {
   left: auto;

 }

 .header_settings_holder .progress_bar span {

-  float: left !important;

-  /* ie6,7 doesnt support inline-block */

+  float: left !important; /* ie6,7 doesnt support inline-block */

   display: block;

   width: 20px;

-  font-size: 11px;

+  font-size: 14px;

+  line-height: 16px;

   color: #6D87AF;

 }

 .header_settings_holder .progress_bar div {

@@ -144,21 +161,38 @@ h1.evalvacija {
   color: #ffa608;

 }

 

+/* Uvod in zakljucek */

+.intro .spremenljivka .naslov,

+.concl .spremenljivka .naslov {

+  margin: 0;

+}

+

+#continue_later input[type=email],

+#return_edit input[type=email] {

+  margin-left: 4px;

+}

+#continue_later button,

+#return_edit button {

+  padding: 7px 20px;

+  margin-left: 4px;

+}

+

 /* Spremenljivke */

 .spremenljivka {

-  margin: 20px 10px 20px 10px;

-  padding: 20px 2px 50px 12px !important;

-  border-bottom: 1px #ddeffd solid;

+  margin: 0;

+  padding: 48px 16px !important;

+  border-bottom: 1px #E5E5E5 solid;

 }

 .spremenljivka .naslov {

-  padding: 5px 0 15px 5px;

-  font-size: 18px;

+  padding: 0 !important;

+  margin: 0 0 24px 0;

+  font-size: 20px;

   font-weight: 600;

 }

 .spremenljivka .naslov .spremenljivka_info {

   font-size: 14px;

   font-weight: 400;

-  padding-top: 7px;

+  padding-top: 8px;

 }

 .spremenljivka .sequence_number {

   background-color: #ddeffd;

@@ -183,6 +217,10 @@ h1.evalvacija {
 .spremenljivka .arrow:hover {

   color: #ffa608;

 }

+.spremenljivka span.reminder {

+  left: 3px;

+  text-indent: 0;

+}

 

 .spremenljivka.limited {

   outline: 1px #F15A24 solid;

@@ -192,55 +230,97 @@ h1.evalvacija {
   outline: 1px #F15A24 solid;

 }

 

+.spremenljivka.tip_1 .variabla,

+.spremenljivka.tip_2 .variabla {

+  display: flex;

+  align-items: center;

+}

+.spremenljivka.tip_1 .variabla.floatLeft,

+.spremenljivka.tip_2 .variabla.floatLeft {

+  margin-right: 16px;

+}

+.spremenljivka.tip_1 .variabla label,

+.spremenljivka.tip_2 .variabla label {

+  display: flex;

+  line-height: 23px;

+}

+.spremenljivka.tip_1 .variabla input[type=text].input_other,

+.spremenljivka.tip_1 .variabla textarea.input_other,

+.spremenljivka.tip_2 .variabla input[type=text].input_other,

+.spremenljivka.tip_2 .variabla textarea.input_other {

+  margin: 0 0 0 8px;

+}

+.spremenljivka.tip_1 .custom_radio_picture,

+.spremenljivka.tip_1 .visual-radio-scale,

+.spremenljivka.tip_2 .custom_radio_picture,

+.spremenljivka.tip_2 .visual-radio-scale {

+  display: inline-block;

+  margin-right: 24px;

+}

+.spremenljivka.tip_1 .custom_radio_picture label,

+.spremenljivka.tip_1 .visual-radio-scale label,

+.spremenljivka.tip_2 .custom_radio_picture label,

+.spremenljivka.tip_2 .visual-radio-scale label {

+  display: inline-block !important;

+}

+

+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {

+  margin-top: 16px;

+}

+

+.variabla.missing:first-of-type {

+  margin-top: 16px;

+}

+

+.spremenljivka .variabla.missing label {

+  padding: 0;

+}

+

 div.variabla,

 td.variabla,

 td.question,

 td.differential,

 .variabla_sum label {

-  font-size: 14px;

+  font-size: 16px;

 }

 

 div.variable_holder {

-  padding: 10px 0 0 0;

+  padding: 0 !important;

+}

+div.variable_holder .variabla {

+  padding: 0;

+  margin-bottom: 16px;

+}

+div.variable_holder .variabla:last-child {

+  margin-bottom: 0;

 }

 div.variable_holder thead,

 div.variable_holder tr.table-header {

   font-weight: normal;

-  font-size: 14px;

+  font-size: 16px;

 }

 div.variable_holder thead td,

 div.variable_holder tr.table-header td {

   padding: 10px 5px;

 }

 

-table.grid_table thead tr td {

-  border-bottom: 2px #42A5F5 solid;

-}

-table.grid_table thead tr.middle_row td {

-  border-top: 2px #42A5F5 solid;

-}

 table.grid_table tbody tr.table-header td {

-  border-bottom: 2px #42A5F5 solid;

   border-top: 2px #42A5F5 solid;

   background-color: #ffffff;

 }

 table.grid_table tbody tr:nth-child(2n+1) {

-  background-color: #ffffff;

+  background-color: #ddeffd;

 }

 table.grid_table tbody tr:nth-child(2n) {

-  background-color: #ddeffd;

+  background-color: #ffffff;

 }

 table.grid_table td {

-  padding: 10px 10px;

-}

-

-span.reminder {

-  left: 3px;

+  padding: 12px 16px;

 }

 

 /* Textboxi, textarea, select */

 input, textarea, select {

-  font-family: Montserrat, Arial, Sans-Serif !important;

+  font-family: Source Sans Pro, sans-serif !important;

 }

 

 input[type=text], textarea, select {

@@ -253,7 +333,6 @@ input[type=text], textarea, select {
 

 /* ranking */

 .dropzone {

-  border-top: 1px #ddeffd solid;

   margin-top: 12px;

   padding-top: 17px;

 }

@@ -273,8 +352,8 @@ table.ranking_table ul {
 .frame_dropping,

 .frame_dropping_hover,

 .frame_moving {

-  font-size: 13px;

-  padding: 7px 10px 9px;

+  font-size: 16px;

+  padding: 8px 12px 14px;

   border: 2px solid #1e88e5;

   background-color: #ffffff;

 }

@@ -298,7 +377,7 @@ div.variable_holder .frame_dropping_hover {
 }

 

 table.ranking_table b {

-  font-size: 13px;

+  font-size: 16px;

   font-weight: 600;

 }

 

@@ -330,7 +409,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 

 /* Slider */

 .grupa .spremenljivka .ui-slider-pips .ui-slider-pip {

-  color: #505050;

+  color: #333333;

 }

 .grupa .spremenljivka .slider.ui-widget-content {

   /*background-color: $color_light !important;*/

@@ -355,7 +434,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 }

 .grupa .spremenljivka .sliderText {

   padding-top: 2px;

-  color: #505050;

+  color: #333333;

   background-color: #42A5F5;

   border: 0;

 }

@@ -384,21 +463,20 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
 

 /* Gumbi na dnu */

 div.buttons {

-  padding: 20px 20px 35px;

-  margin: 0 10px;

+  padding: 64px 0;

+  margin: 0;

 }

 div.buttons input {

   cursor: pointer;

   margin: 8px 10px;

-  /*padding: 7px 11px;*/

-  padding: 10px 20px;

+  padding: 0 32px;

+  height: 40px;

   text-align: center;

-  font-size: 12px;

-  letter-spacing: 1px;

+  font-size: 16px;

   font-weight: 600;

   color: #FFFFFF;

-  border-radius: 20px;

   border: 0;

+  transition: 0.3s;

 }

 div.buttons input.next {

   background-color: #1e88e5;

@@ -420,12 +498,12 @@ div.buttons input.prev:hover, div.buttons input.prev:focus {
 

 /* Footer */

 #footer_survey {

-  padding: 40px;

+  padding: 48px 0 64px 0;

   background-color: #ffffff;

-  border-top: 1px #ddeffd solid;

+  border-top: 1px #E5E5E5 solid;

 }

 #footer_survey p, #footer_survey a, #footer_survey a:visited {

-  color: #505050;

+  color: #333333;

   font-size: 14px;

   line-height: 25px;

   font-weight: 400;

@@ -472,16 +550,16 @@ textarea:focus {
 }

 

 .frame_dropping_titles {

-  width: 240px;

+  width: 244px;

   padding: 5px;

   margin: 0px auto 0px auto;

-  height: 15px;

+  height: 20px;

   text-align: center;

   background-color: #FFFFFF;

   border-top: 2px solid #b9c5d9;

   border-left: 2px solid #b9c5d9;

   border-right: 2px solid #b9c5d9;

-  font-size: 13px;

+  font-size: 16px;

 }

 

 .drag_and_drop_box {

@@ -509,16 +587,17 @@ textarea:focus {
 }

 

 .frame_dropping_titles_box {

-  width: 240px;

+  width: 244px;

   padding: 5px;

   margin: 0px auto 0px auto;

-  height: 15px;

+  height: 20px;

   text-align: center;

   background-color: #FFFFFF;

-  font-size: 13px;

+  font-size: 16px;

 }

 

 .frame_dropping {

+  width: 234px;

   padding: 7px 10px 9px;

 }