Merge pull request #15 from openclassify/mostafa

fatihalp · web-flow · commit 7e2a9232d384 · 2022-05-05T10:34:57.000+03:00
paddle.js moved to site_widget-extension
diff --git a/resources/css/dark_mode.css b/resources/css/dark_mode.css
@@ -102,6 +102,9 @@ body {
 .table td a:hover {
     color: {{ setting_value('visiosoft.theme.defaultadmin::dark_links_hover_active_color')}};
 }
+#Path_21097, #Line_828, #Path_21098 {
+fill: {{ setting_value('visiosoft.theme.defaultadmin::dark_text_color') }} !important;
+}
 .page-info {
     background: {{ setting_value('visiosoft.theme.defaultadmin::dark_background_color')}};
     color: {{ setting_value('visiosoft.theme.defaultadmin::dark_text_color')}} !important;
@@ -408,4 +411,7 @@ color: {{ setting_value('visiosoft.theme.defaultadmin::dark_background_color') }
 }
 .help-icon svg #Path_20512, #Path_20511 {
 fill: {{ setting_value('visiosoft.theme.defaultadmin::dark_text_color') }};
+}
+.progress-end-date {
+color: {{ setting_value('visiosoft.theme.defaultadmin::dark_text_color') }} !important;
 }
diff --git a/resources/css/theme.css b/resources/css/theme.css
@@ -421,7 +421,6 @@ body.expand #topbar .topbar-left .logo span {
     }
 }
 #search {
-    border-bottom: 1px solid #ddd;
     padding-top: 8px;
 }
 .btn-search {
@@ -451,6 +450,10 @@ color: #ddd;
     min-width: 15rem;
 }
 
+#Path_21097, #Line_828, #Path_21098 {
+    fill: {{ setting_value('visiosoft.theme.defaultadmin::primary_color') }} !important;
+}
+
 @media (max-width: 767px) {
     body.expand #search {
         display: none;
diff --git a/resources/img/logout.svg b/resources/img/logout.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="22" height="23" viewBox="0 0 22 23">
+  <g id="logout" transform="translate(-2604 -6913)">
+    <rect id="Rectangle_3992" data-name="Rectangle 3992" width="22" height="23" transform="translate(2604 6913)" fill="#fff" opacity="0"/>
+    <g id="Group_47724" data-name="Group 47724" transform="translate(1455 6815)">
+      <path id="Path_21097" data-name="Path 21097" d="M174.011,96.14a.85.85,0,0,1-.6-1.451l4.043-4.044L173.41,86.6a.85.85,0,0,1,1.2-1.2l4.644,4.645a.85.85,0,0,1,0,1.2l-4.644,4.645A.847.847,0,0,1,174.011,96.14Z" transform="translate(990.363 18.99)" fill="#bababa"/>
+      <path id="Line_828" data-name="Line 828" d="M12.384.85H0A.85.85,0,0,1-.85,0,.85.85,0,0,1,0-.85H12.384a.85.85,0,0,1,.85.85A.85.85,0,0,1,12.384.85Z" transform="translate(1156.63 109.637)" fill="#bababa"/>
+      <path id="Path_21098" data-name="Path 21098" d="M47.078,60.316H40.885a1.737,1.737,0,0,1-1.735-1.735v-17.7a1.737,1.737,0,0,1,1.735-1.735h6.194a.85.85,0,0,1,0,1.7H40.885a.035.035,0,0,0-.035.035v17.7a.035.035,0,0,0,.035.035h6.194a.85.85,0,0,1,0,1.7Z" transform="translate(1111.552 59.903)" fill="#bababa"/>
+    </g>
+  </g>
+</svg>
diff --git a/resources/img/no-avatar.svg b/resources/img/no-avatar.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="42" height="42" viewBox="0 0 42 42">
+  <path id="Path_21105" data-name="Path 21105" d="M23,2A21,21,0,1,0,44,23,21.008,21.008,0,0,0,23,2Zm0,6.3a6.3,6.3,0,1,1-6.3,6.3A6.292,6.292,0,0,1,23,8.3Zm0,29.82a15.121,15.121,0,0,1-12.6-6.762c.063-4.179,8.4-6.468,12.6-6.468,4.179,0,12.537,2.289,12.6,6.468A15.121,15.121,0,0,1,23,38.12Z" transform="translate(-2 -2)" fill="#dbdbdb"/>
+</svg>
diff --git a/resources/img/view_site.svg b/resources/img/view_site.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="22" height="23" viewBox="0 0 22 23">
+  <g id="view_site" transform="translate(-2604 -6883)">
+    <rect id="Rectangle_3993" data-name="Rectangle 3993" width="22" height="23" transform="translate(2604 6883)" fill="#fff" opacity="0"/>
+    <g id="_32._Veiw" data-name="32. Veiw" transform="translate(2605.702 6884.092)">
+      <path id="Path_21097" data-name="Path 21097" d="M19.093,9.853C17.523,6.443,13.975,3,9.583,3S1.643,6.443.073,9.853a.8.8,0,0,0,0,.668c1.57,3.411,5.118,6.853,9.51,6.853s7.94-3.443,9.51-6.853A.8.8,0,0,0,19.093,9.853Zm-9.51,5.924c-3.523,0-6.505-2.837-7.9-5.59C3.078,7.434,6.06,4.6,9.583,4.6s6.505,2.837,7.9,5.59C16.088,12.941,13.106,15.777,9.583,15.777Z" transform="translate(0)" fill="#bababa"/>
+      <path id="Path_21098" data-name="Path 21098" d="M10.993,7a3.993,3.993,0,1,0,3.993,3.993A3.993,3.993,0,0,0,10.993,7Zm0,6.389a2.4,2.4,0,1,1,2.4-2.4A2.4,2.4,0,0,1,10.993,13.389Z" transform="translate(-1.41 -0.806)" fill="#bababa"/>
+    </g>
+  </g>
+</svg>
diff --git a/resources/views/partials/topbar.twig b/resources/views/partials/topbar.twig
@@ -21,18 +21,22 @@
                                 <button class="btn user-action-dropdown dropdown-toggle none-border">
                                     {{ name|raw }}
                                 </button>
-                                {{ img(user().file).width(47).class('rounded-circle')|raw }}
+                                {% if user().file is not empty %}
+                                    {{ img(user().file).width(47).class('rounded-circle')|raw }}
+                                {% else %}
+                                    {{ img('theme::img/no-avatar.svg').width(47).class('rounded-circle')|raw }}
+                                {% endif %}
                             </a>
                             <ul class="dropdown-menu-right dropdown-menu">
                                 <li class="dropdown-item">
                                     <a href="/" target="_blank">
-                                        <i class="fa fa-external-link"></i>
+                                        {{ img('theme::img/view_site.svg').data|raw }}
                                         {{ trans('theme::control_panel.view_site') }}
                                     </a>
                                 </li>
                                 <li class="dropdown-item">
                                     <a href="/admin/logout">
-                                        <i class="fa fa-power-off"></i>
+                                        {{ img('theme::img/logout.svg').data|raw }}
                                         {{ trans('theme::control_panel.logout') }}
                                     </a>
                                 </li>

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,9 @@ body {`
`102`	`102`	`.table td a:hover {`
`103`	`103`	`color: {{ setting_value('visiosoft.theme.defaultadmin::dark_links_hover_active_color')}};`
`104`	`104`	`}`
	`105`	`+#Path_21097, #Line_828, #Path_21098 {`
	`106`	`+fill: {{ setting_value('visiosoft.theme.defaultadmin::dark_text_color') }} !important;`
	`107`	`+}`
`105`	`108`	`.page-info {`
`106`	`109`	`background: {{ setting_value('visiosoft.theme.defaultadmin::dark_background_color')}};`
`107`	`110`	`color: {{ setting_value('visiosoft.theme.defaultadmin::dark_text_color')}} !important;`
`@@ -408,4 +411,7 @@ color: {{ setting_value('visiosoft.theme.defaultadmin::dark_background_color') }`
`408`	`411`	`}`
`409`	`412`	`.help-icon svg #Path_20512, #Path_20511 {`
`410`	`413`	`fill: {{ setting_value('visiosoft.theme.defaultadmin::dark_text_color') }};`
	`414`	`+}`
	`415`	`+.progress-end-date {`
	`416`	`+color: {{ setting_value('visiosoft.theme.defaultadmin::dark_text_color') }} !important;`
`411`	`417`	`}`
Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,6 @@ body.expand #topbar .topbar-left .logo span {`
`421`	`421`	`}`
`422`	`422`	`}`
`423`	`423`	`#search {`
`424`		`- border-bottom: 1px solid #ddd;`
`425`	`424`	`padding-top: 8px;`
`426`	`425`	`}`
`427`	`426`	`.btn-search {`
`@@ -451,6 +450,10 @@ color: #ddd;`
`451`	`450`	`min-width: 15rem;`
`452`	`451`	`}`
`453`	`452`
	`453`	`+#Path_21097, #Line_828, #Path_21098 {`
	`454`	`+ fill: {{ setting_value('visiosoft.theme.defaultadmin::primary_color') }} !important;`
	`455`	`+}`
	`456`	`+`
`454`	`457`	`@media (max-width: 767px) {`
`455`	`458`	`body.expand #search {`
`456`	`459`	`display: none;`