diff --git a/admin/themes/clear/css/components/general.css b/admin/themes/clear/css/components/general.css new file mode 100644 index 000000000..e69de29bb diff --git a/admin/themes/default/template/header.tpl b/admin/themes/default/template/header.tpl index 89a9c3cb6..925b4b596 100644 --- a/admin/themes/default/template/header.tpl +++ b/admin/themes/default/template/header.tpl @@ -21,6 +21,7 @@ {if $theme.load_css} {combine_css path="admin/themes/`$theme.id`/theme.css" order=-10} + {combine_css path="admin/themes/`$theme.id`/css/components/general.css" order=-9} {* Temporary solution *} {/if} {if !empty($theme.local_head)} {include file=$theme.local_head load_css=$theme.load_css} diff --git a/admin/themes/default/template/plugins_new.tpl b/admin/themes/default/template/plugins_new.tpl index ee7236f45..cf6d3cf3a 100644 --- a/admin/themes/default/template/plugins_new.tpl +++ b/admin/themes/default/template/plugins_new.tpl @@ -11,8 +11,6 @@ {combine_script id='pluginsNew' load='footer' require='jquery.ui.effect-blind,jquery.sort' path='admin/themes/default/js/plugins_new.js'} {combine_css path="themes/default/js/plugins/jquery-confirm.min.css"} -{combine_css path="admin/themes/default/css/components/general.css"} - {footer_script} const str_confirm_msg = "{"Yes, I am sure"|@translate}"; const str_cancel_msg = "{"No, I have chaged my mind"|@translate}"; diff --git a/admin/themes/default/template/updates_ext.tpl b/admin/themes/default/template/updates_ext.tpl index cc3a9acab..8702c7af4 100644 --- a/admin/themes/default/template/updates_ext.tpl +++ b/admin/themes/default/template/updates_ext.tpl @@ -1,7 +1,6 @@ {combine_script id='jquery.ajaxmanager' load='footer' require='jquery' path='themes/default/js/plugins/jquery.ajaxmanager.js'} {combine_script id='jquery.jgrowl' load='footer' require='jquery' path='themes/default/js/plugins/jquery.jgrowl_minimized.js'} {combine_css path="themes/default/js/plugins/jquery.jgrowl.css"} -{combine_css path="admin/themes/default/css/components/general.css"} {footer_script require='jquery.ui.effect-blind,jquery.ajaxmanager,jquery.jgrowl'} var pwg_token = '{$PWG_TOKEN}'; diff --git a/admin/themes/default/template/user_list.tpl b/admin/themes/default/template/user_list.tpl index 7c16e1917..4dbaeb83d 100644 --- a/admin/themes/default/template/user_list.tpl +++ b/admin/themes/default/template/user_list.tpl @@ -13,8 +13,6 @@ {combine_script id='jquery.tipTip' load='header' path='themes/default/js/plugins/jquery.tipTip.minified.js'} -{combine_css path="admin/themes/default/css/components/general.css"} - {combine_css path="admin/themes/default/fontello/css/animation.css" order=10} {* order 10 is required, see issue 1080 *} {footer_script} diff --git a/admin/themes/roma/css/components/general.css b/admin/themes/roma/css/components/general.css new file mode 100644 index 000000000..b489b6e96 --- /dev/null +++ b/admin/themes/roma/css/components/general.css @@ -0,0 +1,194 @@ +/* ------------- +Head Buttons +------------- + +.head-button-1 + +or + +.head-button-2 + +*/ + +.head-button-1, .head-button-2 { + position: relative; + padding: 10px; + border-radius: 5px; + font-weight: bold; + display: flex; + align-items: baseline; + cursor: pointer; + margin-right: 10px; +} + +.head-button-1:active, .head-button-2:active { + box-shadow: none; + transform: translateY(2px); +} + +.head-button-1 { + color: white; + background: #ffa646; + box-shadow: 0px 2px #bb7932; +} + +.head-button-1:hover { + background: #ff7700; +} + +.head-button-2 { + background: #fafafa; + box-shadow: 0px 2px #00000024; +} + +.head-button-2:hover { + background: #eee; +} + +/* ------------- +Advanced filter +------------- + +.advanced-filter-btn.icon-filter(.advanced-filter-open) +... +.advanced-filter(.advanced-filter-open) + .advanced-filter-header + .advanced-filter-title + .advanced-filter-close.icon-cancel + .advanced-filter-container + .advanced-filter-item + .advanced-filter-item-label + .advanced-filter-item-container + // Put here your filter + ... +*/ + +.advanced-filter-btn { + width: 70px; + z-index: 2; + position: relative; + cursor: pointer; + padding: 10px; + text-align: center; + font-weight: bold; + background-color: #F3F3F3; +} + +.advanced-filter-btn::before { /* Change icon size */ + font-size: 14px; +} + +.advanced-filter-btn.advanced-filter-open::after { + content: ""; + display: block; + width: 100%; + height: 16px; + background-color: inherit; + bottom: -16px; + left: 0; + position: absolute; +} + +.advanced-filter { + display: none; + padding: 15px; + font-size: 1em; + flex-direction: column; + + background-color: #F3F3F3; +} + +.advanced-filter.advanced-filter-open { + display: flex; +} + +.advanced-filter-header { + display: flex; + justify-content: space-between; + margin-bottom: 10px; +} + +.advanced-filter-title { + font-weight: bold; + + color: #3e3e3e; +} + +.advanced-filter-close { + font-size: 1.8em; + color: #C5C5C5; + cursor: pointer; +} + +.advanced-filter-close:hover { + color: #ff7700; +} + +.advanced-filter-container { + display: flex; +} + +.advanced-filter-item:not(:last-child) { + margin-right: 30px; +} + +.advanced-filter-item-label { + text-align: left; + display: flex; + margin-bottom: 5px; + + color:#3e3e3e; +} + +.advanced-filter-item-container { + position: relative; + text-align: left; + width: 100%; +} + +/* Set Margin if the last element is a slider */ +.advanced-filter-item:last-child .advanced-filter-item-container .slider-bar-wrapper { + margin-right: 10px; +} + +/* ------------- +Advanced filter Select +------------- + +.advanced-filter-select-container + select.advanced-filter-select + +or (generated by selectize.js) + +.advanced-filter-item-container + .selectize-control + .selectize-input +*/ + +.user-action-select-container::before, .advanced-filter-select-container::before { + content: '\e835'; font-size: 14px; position: absolute; font-family: "fontello"; color: #6E6E6E; pointer-events: none; +} + +.advanced-filter-select-container::before { + top: 8px; right:10px +} + +.advanced-filter-select { + display: block; + border: solid 1px #D4D4D4; + padding: 8px 10px; + height: 34px; + background: white; +} + +.advanced-filter-item-container .selectize-control .selectize-input { + border: solid 1px #D4D4D4 !important; + padding: 8px 10px !important; + height: 34px; + background: white !important; + box-shadow: none !important; +} + +.advanced-filter-item-container .selectize-control .selectize-input .item { + padding-right: 0 !important; +} \ No newline at end of file