Nastya пре 1 година
родитељ
комит
0dbfe78930

+ 3 - 8
SharixAdmin/static/SharixAdmin/img/menu/clock-history.svg

@@ -1,8 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.51496 1.01896C8.34401 1.00635 8.17225 1 8 1V0C8.19685 0 8.39314 0.00726199 8.58852 0.0216722L8.51496 1.01896ZM10.5193 1.46905C10.1985 1.34533 9.86912 1.2454 9.53371 1.17008L9.75282 0.194382C10.1361 0.280463 10.5126 0.394665 10.8792 0.536055L10.5193 1.46905ZM11.889 2.17971C11.7458 2.08402 11.5994 1.99388 11.4503 1.90939L11.9432 1.0393C12.1136 1.13586 12.2809 1.23888 12.4446 1.34824C12.6082 1.4576 12.7674 1.5727 12.9219 1.69322L12.3066 2.48158C12.1715 2.37612 12.0322 2.27541 11.889 2.17971ZM13.7231 3.96934C13.5252 3.68829 13.3068 3.42218 13.0697 3.17321L13.794 2.48368C14.0649 2.76821 14.3145 3.07233 14.5407 3.39353L13.7231 3.96934ZM14.4672 5.32122C14.4012 5.16208 14.3296 5.00583 14.2526 4.85271L15.1458 4.40311C15.2339 4.5781 15.3157 4.75667 15.391 4.93853C15.4664 5.12039 15.5348 5.30453 15.5962 5.49054L14.6467 5.80423C14.5929 5.64147 14.5331 5.48035 14.4672 5.32122ZM14.9979 7.82822C14.9895 7.48455 14.9557 7.14197 14.8969 6.80326L15.8822 6.63231C15.9494 7.01939 15.988 7.41092 15.9976 7.80367L14.9979 7.82822ZM14.8655 9.36563C14.8991 9.1967 14.9264 9.02699 14.9474 8.85687L15.9398 8.97929C15.9159 9.17372 15.8847 9.36766 15.8463 9.56072C15.8079 9.75378 15.7625 9.94489 15.7102 10.1337L14.7464 9.867C14.7922 9.70179 14.8319 9.53457 14.8655 9.36563ZM13.914 11.745C14.0979 11.4546 14.2602 11.151 14.3995 10.8367L15.3137 11.2419C15.1545 11.6011 14.969 11.9481 14.7588 12.28L13.914 11.745ZM12.9497 12.9497C13.0715 12.828 13.1885 12.702 13.3005 12.5722L14.0577 13.2254C13.9297 13.3737 13.796 13.5177 13.6569 13.6569L12.9497 12.9497Z" 
-fill="#0081ff"/>
-<path d="M8 1C6.84885 1 5.71545 1.2839 4.70022 1.82655C3.68499 2.3692 2.81926 3.15386 2.17971 4.11101C1.54017 5.06816 1.14654 6.16827 1.03371 7.31388C0.920876 8.45949 1.09232 9.61525 1.53285 10.6788C1.97337 11.7423 2.66939 12.6808 3.55925 13.4111C4.44911 14.1414 5.50533 14.6409 6.63437 14.8655C7.76341 15.0901 8.93041 15.0327 10.032 14.6986C11.1336 14.3644 12.1358 13.7637 12.9497 12.9497L13.6569 13.6569C12.7266 14.5871 11.5812 15.2736 10.3223 15.6555C9.06332 16.0374 7.72961 16.1029 6.43928 15.8463C5.14895 15.5896 3.94183 15.0187 2.92486 14.1841C1.90788 13.3495 1.11243 12.2769 0.608966 11.0615C0.105504 9.846 -0.0904279 8.52514 0.0385242 7.21586C0.167476 5.90659 0.617333 4.64933 1.34825 3.55544C2.07916 2.46155 3.06857 1.5648 4.22883 0.94463C5.38909 0.324457 6.68439 0 8 0V1Z" 
-fill="#0081ff"/>
-<path d="M7.5 3C7.77614 3 8 3.22386 8 3.5V8.70984L11.2481 10.5659C11.4878 10.7029 11.5711 11.0083 11.4341 11.2481C11.2971 11.4878 10.9917 11.5711 10.7519 11.4341L7.25193 9.43412C7.09615 9.3451 7 9.17943 7 9V3.5C7 3.22386 7.22386 3 7.5 3Z" 
-fill="#0081ff"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path d="M11.44 2C8.87638 2.00731 6.41349 2.99891 4.56 4.77V3C4.56 2.73478 4.45464 2.48043 4.2671 2.29289C4.07957 2.10536 3.82521 2 3.56 2C3.29478 2 3.04043 2.10536 2.85289 2.29289C2.66535 2.48043 2.56 2.73478 2.56 3V7.5C2.56 7.76522 2.66535 8.01957 2.85289 8.20711C3.04043 8.39464 3.29478 8.5 3.56 8.5H8.06C8.32521 8.5 8.57957 8.39464 8.7671 8.20711C8.95464 8.01957 9.06 7.76522 9.06 7.5C9.06 7.23478 8.95464 6.98043 8.7671 6.79289C8.57957 6.60536 8.32521 6.5 8.06 6.5H5.66C6.57171 5.53701 7.7085 4.81576 8.96813 4.40114C10.2277 3.98651 11.5707 3.89152 12.8761 4.1247C14.1816 4.35788 15.4086 4.91193 16.4468 5.73699C17.485 6.56205 18.3018 7.63226 18.8237 8.85133C19.3457 10.0704 19.5564 11.4001 19.4369 12.7208C19.3174 14.0415 18.8715 15.3118 18.1392 16.4174C17.407 17.5231 16.4114 18.4293 15.242 19.0547C14.0726 19.68 12.7661 20.0049 11.44 20C11.1748 20 10.9204 20.1054 10.7329 20.2929C10.5454 20.4804 10.44 20.7348 10.44 21C10.44 21.2652 10.5454 21.5196 10.7329 21.7071C10.9204 21.8946 11.1748 22 11.44 22C14.0922 22 16.6357 20.9464 18.5111 19.0711C20.3864 17.1957 21.44 14.6522 21.44 12C21.44 9.34784 20.3864 6.8043 18.5111 4.92893C16.6357 3.05357 14.0922 2 11.44 2ZM11.44 8C11.1748 8 10.9204 8.10536 10.7329 8.29289C10.5454 8.48043 10.44 8.73478 10.44 9V12C10.44 12.2652 10.5454 12.5196 10.7329 12.7071C10.9204 12.8946 11.1748 13 11.44 13H13.44C13.7052 13 13.9596 12.8946 14.1471 12.7071C14.3346 12.5196 14.44 12.2652 14.44 12C14.44 11.7348 14.3346 11.4804 14.1471 11.2929C13.9596 11.1054 13.7052 11 13.44 11H12.44V9C12.44 8.73478 12.3346 8.48043 12.1471 8.29289C11.9596 8.10536 11.7052 8 11.44 8Z" fill="#479FF8"/>
+</svg>

+ 3 - 8
SharixAdmin/static/SharixAdmin/img/menu/clock-history_w.svg

@@ -1,8 +1,3 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.51496 1.01896C8.34401 1.00635 8.17225 1 8 1V0C8.19685 0 8.39314 0.00726199 8.58852 0.0216722L8.51496 1.01896ZM10.5193 1.46905C10.1985 1.34533 9.86912 1.2454 9.53371 1.17008L9.75282 0.194382C10.1361 0.280463 10.5126 0.394665 10.8792 0.536055L10.5193 1.46905ZM11.889 2.17971C11.7458 2.08402 11.5994 1.99388 11.4503 1.90939L11.9432 1.0393C12.1136 1.13586 12.2809 1.23888 12.4446 1.34824C12.6082 1.4576 12.7674 1.5727 12.9219 1.69322L12.3066 2.48158C12.1715 2.37612 12.0322 2.27541 11.889 2.17971ZM13.7231 3.96934C13.5252 3.68829 13.3068 3.42218 13.0697 3.17321L13.794 2.48368C14.0649 2.76821 14.3145 3.07233 14.5407 3.39353L13.7231 3.96934ZM14.4672 5.32122C14.4012 5.16208 14.3296 5.00583 14.2526 4.85271L15.1458 4.40311C15.2339 4.5781 15.3157 4.75667 15.391 4.93853C15.4664 5.12039 15.5348 5.30453 15.5962 5.49054L14.6467 5.80423C14.5929 5.64147 14.5331 5.48035 14.4672 5.32122ZM14.9979 7.82822C14.9895 7.48455 14.9557 7.14197 14.8969 6.80326L15.8822 6.63231C15.9494 7.01939 15.988 7.41092 15.9976 7.80367L14.9979 7.82822ZM14.8655 9.36563C14.8991 9.1967 14.9264 9.02699 14.9474 8.85687L15.9398 8.97929C15.9159 9.17372 15.8847 9.36766 15.8463 9.56072C15.8079 9.75378 15.7625 9.94489 15.7102 10.1337L14.7464 9.867C14.7922 9.70179 14.8319 9.53457 14.8655 9.36563ZM13.914 11.745C14.0979 11.4546 14.2602 11.151 14.3995 10.8367L15.3137 11.2419C15.1545 11.6011 14.969 11.9481 14.7588 12.28L13.914 11.745ZM12.9497 12.9497C13.0715 12.828 13.1885 12.702 13.3005 12.5722L14.0577 13.2254C13.9297 13.3737 13.796 13.5177 13.6569 13.6569L12.9497 12.9497Z" 
-fill="white"/>
-<path d="M8 1C6.84885 1 5.71545 1.2839 4.70022 1.82655C3.68499 2.3692 2.81926 3.15386 2.17971 4.11101C1.54017 5.06816 1.14654 6.16827 1.03371 7.31388C0.920876 8.45949 1.09232 9.61525 1.53285 10.6788C1.97337 11.7423 2.66939 12.6808 3.55925 13.4111C4.44911 14.1414 5.50533 14.6409 6.63437 14.8655C7.76341 15.0901 8.93041 15.0327 10.032 14.6986C11.1336 14.3644 12.1358 13.7637 12.9497 12.9497L13.6569 13.6569C12.7266 14.5871 11.5812 15.2736 10.3223 15.6555C9.06332 16.0374 7.72961 16.1029 6.43928 15.8463C5.14895 15.5896 3.94183 15.0187 2.92486 14.1841C1.90788 13.3495 1.11243 12.2769 0.608966 11.0615C0.105504 9.846 -0.0904279 8.52514 0.0385242 7.21586C0.167476 5.90659 0.617333 4.64933 1.34825 3.55544C2.07916 2.46155 3.06857 1.5648 4.22883 0.94463C5.38909 0.324457 6.68439 0 8 0V1Z" 
-fill="white"/>
-<path d="M7.5 3C7.77614 3 8 3.22386 8 3.5V8.70984L11.2481 10.5659C11.4878 10.7029 11.5711 11.0083 11.4341 11.2481C11.2971 11.4878 10.9917 11.5711 10.7519 11.4341L7.25193 9.43412C7.09615 9.3451 7 9.17943 7 9V3.5C7 3.22386 7.22386 3 7.5 3Z" 
-fill="white"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path d="M11.44 2C8.87638 2.00731 6.41349 2.99891 4.56 4.77V3C4.56 2.73478 4.45464 2.48043 4.2671 2.29289C4.07957 2.10536 3.82521 2 3.56 2C3.29478 2 3.04043 2.10536 2.85289 2.29289C2.66535 2.48043 2.56 2.73478 2.56 3V7.5C2.56 7.76522 2.66535 8.01957 2.85289 8.20711C3.04043 8.39464 3.29478 8.5 3.56 8.5H8.06C8.32521 8.5 8.57957 8.39464 8.7671 8.20711C8.95464 8.01957 9.06 7.76522 9.06 7.5C9.06 7.23478 8.95464 6.98043 8.7671 6.79289C8.57957 6.60536 8.32521 6.5 8.06 6.5H5.66C6.57171 5.53701 7.7085 4.81576 8.96813 4.40114C10.2277 3.98651 11.5707 3.89152 12.8761 4.1247C14.1816 4.35788 15.4086 4.91193 16.4468 5.73699C17.485 6.56205 18.3018 7.63226 18.8237 8.85133C19.3457 10.0704 19.5564 11.4001 19.4369 12.7208C19.3174 14.0415 18.8715 15.3118 18.1392 16.4174C17.407 17.5231 16.4114 18.4293 15.242 19.0547C14.0726 19.68 12.7661 20.0049 11.44 20C11.1748 20 10.9204 20.1054 10.7329 20.2929C10.5454 20.4804 10.44 20.7348 10.44 21C10.44 21.2652 10.5454 21.5196 10.7329 21.7071C10.9204 21.8946 11.1748 22 11.44 22C14.0922 22 16.6357 20.9464 18.5111 19.0711C20.3864 17.1957 21.44 14.6522 21.44 12C21.44 9.34784 20.3864 6.8043 18.5111 4.92893C16.6357 3.05357 14.0922 2 11.44 2ZM11.44 8C11.1748 8 10.9204 8.10536 10.7329 8.29289C10.5454 8.48043 10.44 8.73478 10.44 9V12C10.44 12.2652 10.5454 12.5196 10.7329 12.7071C10.9204 12.8946 11.1748 13 11.44 13H13.44C13.7052 13 13.9596 12.8946 14.1471 12.7071C14.3346 12.5196 14.44 12.2652 14.44 12C14.44 11.7348 14.3346 11.4804 14.1471 11.2929C13.9596 11.1054 13.7052 11 13.44 11H12.44V9C12.44 8.73478 12.3346 8.48043 12.1471 8.29289C11.9596 8.10536 11.7052 8 11.44 8Z" fill="#FFF"/>
+</svg>

Разлика између датотеке није приказан због своје велике величине
+ 1 - 6
SharixAdmin/static/SharixAdmin/img/menu/credit-card.svg


Разлика између датотеке није приказан због своје велике величине
+ 1 - 6
SharixAdmin/static/SharixAdmin/img/menu/credit-card_w.svg


+ 4 - 1
SharixAdmin/templates/SharixAdmin/index.html

@@ -71,6 +71,7 @@
             </div>
           </div>
         </div>
+        
         <div class="col-9" style="margin-left: 334px; margin-top: 76px; text-decoration: none;" id="rightmainpage">
             <div class="d-flex flex-column p-4" 
             style="
@@ -79,7 +80,9 @@
             border-radius: 15px; 
             background-color:white;
             box-shadow: 4px 5px 40px #cfcfcf; 
-            margin-top: 300x;">
+            margin-top: 300x;
+            padding: 20px 20px 20px 20px;">
+            
             {% block contenthome %}
             {% endblock contenthome%}
         </div>

Неке датотеке нису приказане због велике количине промена