Skip to content

Commit

Permalink
Merge pull request #33 from OpenLXP/origin/django-UI-update
Browse files Browse the repository at this point in the history 
Origin/django UI update
  • Loading branch information
@KarenAJ
KarenAJ authored Feb 29, 2024
2 parents 719b293 + 685f9bd commit 8769617
Show file tree
Hide file tree
Showing 97 changed files with 12,122 additions and 733 deletions.
65 changes: 65 additions & 0 deletions app/core/fixtures/admin_theme_data.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
[
{
"model": "admin_interface.theme",
"pk": 1,
"fields": {
"name": "XSS Configuration Portal",
"active": true,
"title": "XSS Configuration Portal",
"title_color": "#FFFFFF",
"title_visible": true,
"logo": "admin-interface/logo/dodLogo_50.png",
"logo_color": "#FFFFFF",
"logo_max_width": 100,
"logo_max_height": 100,
"logo_visible": true,
"favicon": "admin-interface/favicon/dodLogo_50.png",
"env_name": "",
"env_color": "#077391",
"env_visible_in_header": true,
"env_visible_in_favicon": false,
"language_chooser_active": true,
"language_chooser_control": "default-select",
"language_chooser_display": "name",
"css_header_background_color": "#077391",
"css_header_text_color": "#E7F8FD",
"css_header_link_color": "#FFFFFF",
"css_header_link_hover_color": "#C9F0DD",
"css_module_background_color": "#077391",
"css_module_background_selected_color": "#B9E5F5",
"css_module_text_color": "#FFFFFF",
"css_module_link_color": "#FFFFFF",
"css_module_link_selected_color": "#FFFFFF",
"css_module_link_hover_color": "#C9F0DD",
"css_module_rounded_corners": true,
"css_generic_link_color": "#077391",
"css_generic_link_hover_color": "#09A3CE",
"css_generic_link_active_color": "#05556B",
"css_save_button_background_color": "#077391",
"css_save_button_background_hover_color": "#09A3CE",
"css_save_button_text_color": "#FFFFFF",
"css_delete_button_background_color": "#BA2121",
"css_delete_button_background_hover_color": "#A41515",
"css_delete_button_text_color": "#FFFFFF",
"related_modal_active": true,
"related_modal_background_color": "#000000",
"related_modal_background_opacity": "0.3",
"related_modal_rounded_corners": true,
"related_modal_close_button_visible": true,
"list_filter_highlight": true,
"list_filter_dropdown": true,
"list_filter_sticky": true,
"list_filter_removal_links": false,
"foldable_apps": true,
"show_fieldsets_as_tabs": false,
"show_inlines_as_tabs": false,
"collapsible_stacked_inlines": false,
"collapsible_stacked_inlines_collapsed": true,
"collapsible_tabular_inlines": false,
"collapsible_tabular_inlines_collapsed": true,
"recent_actions_visible": true,
"form_submit_sticky": false,
"form_pagination_sticky": false
}
}
]
Binary file added app/media/admin-interface/favicon/dodLogo_50.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/media/admin-interface/logo/dodLogo_50.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions app/openlxp_xss_project/settings.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
# Application definition

INSTALLED_APPS = [
"admin_interface",
"colorfield",
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
Expand Down
57 changes: 36 additions & 21 deletions app/static/admin/css/autocomplete.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ select.admin-autocomplete {

.select2-container--admin-autocomplete.select2-container--focus .select2-selection,
.select2-container--admin-autocomplete.select2-container--open .select2-selection {
border-color: #999;
border-color: var(--body-quiet-color);
min-height: 30px;
}

Expand All @@ -29,13 +29,13 @@ select.admin-autocomplete {
}

.select2-container--admin-autocomplete .select2-selection--single {
background-color: #fff;
border: 1px solid #ccc;
background-color: var(--body-bg);
border: 1px solid var(--border-color);
border-radius: 4px;
}

.select2-container--admin-autocomplete .select2-selection--single .select2-selection__rendered {
color: #444;
color: var(--body-fg);
line-height: 30px;
}

Expand All @@ -46,7 +46,7 @@ select.admin-autocomplete {
}

.select2-container--admin-autocomplete .select2-selection--single .select2-selection__placeholder {
color: #999;
color: var(--body-quiet-color);
}

.select2-container--admin-autocomplete .select2-selection--single .select2-selection__arrow {
Expand Down Expand Up @@ -80,7 +80,7 @@ select.admin-autocomplete {
}

.select2-container--admin-autocomplete.select2-container--disabled .select2-selection--single {
background-color: #eee;
background-color: var(--darkened-bg);
cursor: default;
}

Expand All @@ -94,8 +94,8 @@ select.admin-autocomplete {
}

.select2-container--admin-autocomplete .select2-selection--multiple {
background-color: white;
border: 1px solid #ccc;
background-color: var(--body-bg);
border: 1px solid var(--border-color);
border-radius: 4px;
cursor: text;
}
Expand All @@ -104,16 +104,18 @@ select.admin-autocomplete {
box-sizing: border-box;
list-style: none;
margin: 0;
padding: 0 5px;
padding: 0 10px 5px 5px;
width: 100%;
display: flex;
flex-wrap: wrap;
}

.select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__rendered li {
list-style: none;
}

.select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__placeholder {
color: #999;
color: var(--body-quiet-color);
margin-top: 5px;
float: left;
}
Expand All @@ -123,11 +125,13 @@ select.admin-autocomplete {
float: right;
font-weight: bold;
margin: 5px;
position: absolute;
right: 0;
}

.select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__choice {
background-color: #e4e4e4;
border: 1px solid #ccc;
background-color: var(--darkened-bg);
border: 1px solid var(--border-color);
border-radius: 4px;
cursor: default;
float: left;
Expand All @@ -137,15 +141,15 @@ select.admin-autocomplete {
}

.select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__choice__remove {
color: #999;
color: var(--body-quiet-color);
cursor: pointer;
display: inline-block;
font-weight: bold;
margin-right: 2px;
}

.select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__choice__remove:hover {
color: #333;
color: var(--body-fg);
}

.select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder, .select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-search--inline {
Expand All @@ -163,12 +167,12 @@ select.admin-autocomplete {
}

.select2-container--admin-autocomplete.select2-container--focus .select2-selection--multiple {
border: solid #999 1px;
border: solid var(--body-quiet-color) 1px;
outline: 0;
}

.select2-container--admin-autocomplete.select2-container--disabled .select2-selection--multiple {
background-color: #eee;
background-color: var(--darkened-bg);
cursor: default;
}

Expand All @@ -186,12 +190,20 @@ select.admin-autocomplete {
border-bottom-right-radius: 0;
}

.select2-container--admin-autocomplete .select2-search--dropdown {
background: var(--darkened-bg);
}

.select2-container--admin-autocomplete .select2-search--dropdown .select2-search__field {
border: 1px solid #ccc;
background: var(--body-bg);
color: var(--body-fg);
border: 1px solid var(--border-color);
border-radius: 4px;
}

.select2-container--admin-autocomplete .select2-search--inline .select2-search__field {
background: transparent;
color: var(--body-fg);
border: none;
outline: 0;
box-shadow: none;
Expand All @@ -201,18 +213,21 @@ select.admin-autocomplete {
.select2-container--admin-autocomplete .select2-results > .select2-results__options {
max-height: 200px;
overflow-y: auto;
color: var(--body-fg);
background: var(--body-bg);
}

.select2-container--admin-autocomplete .select2-results__option[role=group] {
padding: 0;
}

.select2-container--admin-autocomplete .select2-results__option[aria-disabled=true] {
color: #999;
color: var(--body-quiet-color);
}

.select2-container--admin-autocomplete .select2-results__option[aria-selected=true] {
background-color: #ddd;
background-color: var(--selected-bg);
color: var(--body-fg);
}

.select2-container--admin-autocomplete .select2-results__option .select2-results__option {
Expand Down Expand Up @@ -249,8 +264,8 @@ select.admin-autocomplete {
}

.select2-container--admin-autocomplete .select2-results__option--highlighted[aria-selected] {
background-color: #79aec8;
color: white;
background-color: var(--primary);
color: var(--primary-fg);
}

.select2-container--admin-autocomplete .select2-results__group {
Expand Down
Loading

0 comments on commit 8769617

Please sign in to comment.