Redesign - splosni responsive popravki

admin/survey/classes/mobile/class.MobileSurveyAdmin.php

@@ -1016,19 +1016,19 @@ class MobileSurveyAdmin{
         // Anketa je zaklenjena
         if($row['locked'] == 1){
             echo '<div class="mobile_add_question bottom">';
-            echo '  <span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="return false;">';
+            echo '  <button class="medium blue" onclick="return false;">';
             echo '      <span class="faicon lock_close"></span> ';
-            echo '  </a></span>';
+            echo '  </button>';
             echo '</div>';
 
             return;
         }
 
         echo '<div class="mobile_add_question bottom">';
-        echo '  <span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="mobile_add_question_popup(); return false;">';
+        echo '  <button class="medium blue" onclick="mobile_add_question_popup(); return false;">';
         echo '      <span class="plus">+</span> ';
         echo '      <span>'.$lang['srv_mobile_add_question'].'</span>';
-        echo '  </a></span>';
+        echo '  </button>';
         echo '</div>';
 
 
@@ -1042,9 +1042,7 @@ class MobileSurveyAdmin{
         echo '  <div class="mobile_add_question_item" onClick="mobile_add_question(\'5\');"><span class="faicon nagovor"></span> <span class="item_text">'.$lang['srv_vprasanje_tip_5'].'</span></div>';
         echo '  <div class="mobile_add_question_item" onClick="mobile_add_question(\'6\');"><span class="faicon matrix_32"></span> <span class="item_text">'.$lang['srv_vprasanje_tip_6'].'</span></div>';
 
-        echo '  <span class="buttonwrapper mobile_add_question_button">';
+        echo '  <button class="blue medium mobile_add_question_button" onclick="mobile_add_question_popup_close(); return false;">Zapri</button>';
-        echo '      <a class="ovalbutton ovalbutton_orange" href="#" onclick="mobile_add_question_popup_close(); return false;"><span>Zapri</span></a>';
-        echo '  </span>';
 
         echo '</div>';
     }
@@ -1057,10 +1055,10 @@ class MobileSurveyAdmin{
         echo '<style>.mobile_add_question.bottom{display: none;}</style>';
 
         echo '<div class="mobile_add_question center">';
-        echo '  <span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="mobile_add_question_popup(); return false;">';
+        echo '  <button class="blue medium" onclick="mobile_add_question_popup(); return false;">';
         echo '      <span class="plus">+</span> ';
         echo '      <span>'.$lang['srv_mobile_add_question'].'</span>';
-        echo '  </a></span>';
+        echo '  </button>';
         echo '</div>';
     }
 

resources/sass/admin_new/mobile/basic.scss

@@ -22,12 +22,14 @@ body #main_holder #main{
 
         .layout_left_item{
             width: 100%;
-            margin: 20px 0;
+            margin: 32px 0 0 0;
+
+            box-shadow: none;
         }
 
         .layout_right_item{
             width: 100%;
-            margin: 20px 0;
+            margin: 0;
         }
     }
 
@@ -83,4 +85,23 @@ div.breadcrumbs {
     padding: 15px;
     color: $strong_blue;
     font-weight: 600;
+}
+
+
+button.small, submit.small{
+    min-width: auto;
+    padding: 5px 16px;
+}
+button.medium, submit.medium{
+    min-width: auto;
+    padding: 10px 24px;
+}
+button.large, submit.large{
+    min-width: auto;
+    padding: 12px 32px;
+}
+
+
+.top_note{
+    padding: 8px 16px;
 }

resources/sass/admin_new/mobile/footer.scss

@@ -2,9 +2,27 @@ footer#srv_footer{
     display: flex;
     flex-direction: column;
 
+    height: auto;
+
     margin-top: 0;
+    padding: 16px;
 
     .footer_left{
-        margin-bottom: 10px;
+
+        .footer_line:nth-child(1){
+            margin-bottom: 16px;
+        }
+
+        .footer_line:nth-child(2){
+            flex-direction: column;
+
+            .footer_item{
+                margin-bottom: 8px;
+                padding: 0;
+                border: 0;
+            }
+        }
+
+        margin-bottom: 8px;
     }
 }

resources/sass/admin_new/mobile/pages/analysis.scss

@@ -1,8 +1,25 @@
 
 // Tabele
-.analysis_bottom_settings a:first-child{
+.analysis_bottom_settings{
-    display: block;
+    flex-wrap: wrap;
-    margin: 0 0 20px 0 !important;
+
+    .comment_holder{
+        justify-content: center;
+
+        width: 100%;
+        margin: 0 0 16px 0 !important;
+
+        border: 0;
+    }
+}
+
+.div_analiza_icons,
+.div_analiza_scale{
+    opacity: 1 !important;
+}
+
+.analysis_icons_holder{
+    display: none;
 }
 
 

resources/sass/admin_new/mobile/pages/branching.scss

@@ -10,7 +10,16 @@
     li{
         box-sizing: border-box;
         width: 100%;
-        margin: 0 !important;        
+        margin: 0 !important;     
+        padding-left: 0 !important;   
+
+        .pm{
+            margin-left: 0 !important;
+        }
+
+        .pb_page{
+            font-size: 14px !important;
+        }
     }
 
     .spr_edit{
@@ -28,20 +37,15 @@
     }
     
     .empty_vrivanje {
-        padding: 30px 0 !important;
+        padding: 32px 16px !important;
-        margin: 20px 10px 20px 10px !important;
+        margin: 16px 0 !important;
 
         .empty_vrivanje_title{
             display: none;
-
-            margin: 0 20px;
-            font-size: 14px;
         }
-        .empty_vrivanje_subtitle{
+        
+        .empty_vrivanje_buttons{
             display: none;
-
-            margin: 15px 20px 0 15px;
-            font-size: 13px;
         }
 
         .mobile_add_question{
@@ -91,17 +95,16 @@
     display: block;
     position: fixed;
     bottom: 25px;
-    left: calc(50% - 95px);
+    left: calc(50% - 105px);
 
-    width: 190px;
+    width: 210px;
 
-    a{
+    button{
         display: flex !important;
+        align-items: center;
         justify-content: center;
-        padding: 10px 20px 10px !important;
 
-        font-size: 14px;
+        width: 210px;
-        font-weight: 500;
     }
 
     .plus{

resources/sass/admin_new/mobile/pages/data.scss

@@ -1,46 +1,82 @@
 
 .page_data{
 
-    #vnosi_paginacija{
+    .data_table_top_holder{
-        display: flex;
         flex-direction: column;
-        float: none;
+        align-items: flex-start;
 
-        > div{
+        margin-bottom: 32px;
-            margin: 5px 0;
+        padding: 8px;
-        }
 
-        label{
+        .dataFullscreen{
-            margin: 0;
-            padding: 0;
-        }
-    }
-
-    #data_search_filter{
-        display: flex;
-        width: 100%;
-        box-sizing: border-box;
-
-        input{
-            box-sizing: border-box;
-            margin-left: 10px;
             width: 100%;
+            margin: 0 0 16px 0;
+
+            border: 0;
         }
-    }
 
-    .dataSettingsBasic{
+        .dataSettingsBasic{
-        width: 100%;
+            width: 100%;
-        box-sizing: border-box;
+            box-sizing: border-box;
+    
+            margin: 0 0 16px 0;
 
-        margin: 0;
+            border: 0;
-    }
+        }
 
-    #toggleDataCheckboxes{
+        #dataSettingsCheckboxes {
-        display: none;
+            top: 80px;
+            left: 8px;
+        }
+    
+        #data_search_filter{
+            display: flex;
+            width: 100%;
+
+            box-sizing: border-box;
+            margin: 0 0 16px 0;
+
+            border: 0;
+
+            input{
+                box-sizing: border-box;
+                width: 100%;
+            }
+        }
+
+        #vnosi_paginacija{
+            position: relative;
+            display: flex;
+            flex-direction: column;
+
+            width: 100%;
+            margin: 0 0 16px 0;
+            right: 0;
+
+            border: 0;
+        
+            #div_paginacija_vnosov{
+                margin: 0 0 16px 0;
+            }
+
+            #div_paginacija_vprasanj{
+                margin: 0;
+            }
+            
+            label{
+                margin: 0;
+                padding: 0;
+            }
+
+            select{
+                margin: 0 16px 0 8px;
+            }
+        }
     }
 
 
     #div_vnosi_data{
+        margin-bottom: 32px;
 
         #dataTableScroller {
             display: none;
@@ -48,18 +84,17 @@
 
         #tableContainer{
             overflow-y: hidden;
-            padding-bottom: 20px;
         }
     }
 
-    #bottom_data_legend{
-        display: block;
-        float: none;
 
-        width: 100%;
+    .data_table_bottom_holder{
-        box-sizing: border-box;
+        flex-direction: column;
 
-        margin: 5px 0 10px 0;
+        .legend_box{
+            width: 100%;
+            margin-bottom: 16px;
+        }
     }
 }
 

resources/sass/admin_new/mobile/pages/my_surveys.scss

@@ -1,6 +1,5 @@
 
 #main #moje_ankete_edit{
-    padding: 20px !important;
 
     #anketa_edit{
         padding: 0 !important;
@@ -11,7 +10,63 @@
         flex-direction: column;
 
         > div{
-            margin: 15px 0 20px 0;
+            margin: 0 0 32px 0;
+        }
+
+        .first_line{
+
+        }
+
+        .second_line{
+            display: flex;
+            flex-direction: column;
+
+            #searchMySurveys{
+                align-self: flex-start;
+                width: 100%;
+
+                margin: 0 0 32px 0;
+                padding: 0;
+
+                form{
+                    display: flex;
+                    justify-content: center;
+
+                    input[type="text"]{
+                        width: 100%;
+                        padding: 5px 0 5px 7px;
+                    }
+                }
+            }
+
+            .pagination.top{
+                max-width: 100%;
+            }
+
+            .filters{
+                display: none;
+            }
+        }
+
+        .div_sl_new{
+
+            // Tabela z mojimi anketami
+            table#surveyList_new{
+                margin: 0;
+
+                td{
+                    display: none;
+        
+                    &:nth-child(1),
+                    &:nth-child(4){
+                        display: table-cell;
+                    }
+                }
+            }
+        }
+
+        .pagination_bottom_holder{
+
         }
 
         #anketa_new_float{
@@ -31,43 +86,8 @@
                 display: block;
             }
         }
-    
-        #sortButton,
-        #filterButton,
-        #folderSwitch{
-            display: none;
-        }
 
-        #searchMySurveys{
+        
-            padding: 0;
-
-            form{
-                display: flex;
-                justify-content: center;
-
-                input[type="text"]{
-                    width: 100%;
-                    padding: 5px 0 5px 7px;
-                }
-            }
-        }
-
-        .div_sl_new {
-            padding: 20px 0;
-        }
-
-        // Tabela z mojimi anketami
-        table#surveyList_new{
-    
-            td{
-                display: none;
-    
-                &:nth-child(3),
-                &:nth-child(6){
-                    display: table-cell;
-                }
-            }
-        }
     }
 
 

resources/sass/admin_new/mobile/popup.scss

@@ -10,4 +10,14 @@
 	left: 10% !important;
 
     box-shadow: 0 0 15px 15px rgba(0,0,0,.34) !important;
+}
+
+
+// Klasicen popup
+.divPopUp{
+    width: 100%;
+    max-width: 100%;
+
+    box-sizing: border-box;
+    margin: 0 16px;
 }