theming should be fine now
This commit is contained in:
Gwendolyn
parent
281e3495ef
commit
2548d62776
29 changed files with 1149 additions and 568 deletions
|
|
@ -417,10 +417,16 @@ def create_editor_form(editor_model):
|
|||
'report_help_text', 'enter_description', 'level_change_description', 'base_mapdata_accessible',
|
||||
'label_settings', 'label_override', 'min_zoom', 'max_zoom', 'font_size',
|
||||
'allow_levels', 'allow_spaces', 'allow_areas', 'allow_pois', 'allow_dynamic_locations',
|
||||
'left', 'top', 'right', 'bottom', 'public',
|
||||
'import_tag', 'import_block_data', 'import_block_geom',
|
||||
'left', 'top', 'right', 'bottom', 'import_tag', 'import_block_data', 'import_block_geom',
|
||||
'public', 'high_contrast', 'funky', 'randomize_primary_color', 'color_logo',
|
||||
'color_css_initial', 'color_css_primary', 'color_css_secondary', 'color_css_tertiary',
|
||||
'color_css_quaternary', 'color_css_quinary', 'color_css_header_background',
|
||||
'color_css_header_text', 'color_css_header_text_hover',
|
||||
'color_css_shadow', 'color_css_overlay_background', 'color_css_grid',
|
||||
'color_css_modal_backdrop', 'color_css_route_dots_shadow', 'extra_css',
|
||||
'color_background', 'color_wall_fill', 'color_wall_border', 'color_door_fill',
|
||||
'color_ground_fill', 'color_obstacles_default_fill', 'color_obstacles_default_border', ]
|
||||
'color_ground_fill', 'color_obstacles_default_fill', 'color_obstacles_default_border',
|
||||
]
|
||||
field_names = [field.name for field in editor_model._meta.get_fields() if not field.one_to_many]
|
||||
existing_fields = [name for name in possible_fields if name in field_names]
|
||||
|
||||
|
|
|
|||
|
|
@ -1,32 +1,3 @@
|
|||
//noinspection CssInvalidFunction
|
||||
@if primary_color() != "" {
|
||||
$color-primary: primary_color() !global;
|
||||
$color-header-primary: primary_color() !global;
|
||||
}
|
||||
//noinspection CssInvalidFunction
|
||||
@if header_background_color() != "" {
|
||||
$color-header-background: header_background_color() !global;
|
||||
}
|
||||
//noinspection CssInvalidFunction
|
||||
@if header_text_color() != "" {
|
||||
$color-header-text: header_text_color() !global;
|
||||
}
|
||||
//noinspection CssInvalidFunction
|
||||
@if header_text_hover_color() != "" {
|
||||
$color-header-text-hover: header_text_hover_color() !global;
|
||||
}
|
||||
|
||||
$color-initial: #fff !default
|
||||
$color-primary: #9b4dca !default
|
||||
$color-secondary: #606c76 !default
|
||||
$color-header-background: #ffffff !default;
|
||||
$color-header-primary: $color-secondary !default;
|
||||
$color-header-text: $color-primary !default;
|
||||
$color-header-text-hover: $color-secondary !default;
|
||||
|
||||
$color-test: $color-primary;
|
||||
|
||||
|
||||
/* bootstrap overrides so it looks like the rest of the site */
|
||||
body {
|
||||
font-size:16px;
|
||||
|
|
@ -62,40 +33,40 @@ body {
|
|||
display: inline-block;
|
||||
}
|
||||
.navbar-default, .navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus, .navbar-default .navbar-collapse {
|
||||
background-color: $color-header-background;
|
||||
background-color: var(--color-header-background);
|
||||
}
|
||||
.navbar-default .navbar-toggle {
|
||||
border-color: $color-header-text;
|
||||
border-color: var(--color-header-text);
|
||||
}
|
||||
.navbar-default .navbar-brand, .navbar-default .navbar-brand:hover, .navbar-default .navbar-brand:focus {
|
||||
color: $color-header-primary;
|
||||
color: var(--color-primary);
|
||||
}
|
||||
.navbar-default .navbar-nav > li > a {
|
||||
color: $color-header-text;
|
||||
color: var(--color-header-text);
|
||||
}
|
||||
.navbar-default .navbar-nav > li > a:hover,
|
||||
.navbar-default .navbar-nav > li > a:focus{
|
||||
color: $color-header-text-hover;
|
||||
color: var(--color-header-text-hover);
|
||||
}
|
||||
.navbar-collapse {
|
||||
border-width: 0;
|
||||
}
|
||||
a, a.list-group-item, a.list-group-item:hover, a.list-group-item:focus {
|
||||
color: $color-primary;
|
||||
color: var(--color-primary);
|
||||
}
|
||||
a:hover, a:focus {
|
||||
color: $color-secondary;
|
||||
color: var(--color-secondary);
|
||||
}
|
||||
.badge {
|
||||
background-color: $color-primary;
|
||||
background-color: var(--color-primary);
|
||||
}
|
||||
.btn-primary, .btn-primary:hover, .btn-primary:focus, .btn-group.open .dropdown-toggle.btn-primary {
|
||||
background-color: $color-primary;
|
||||
border-color: darken($color-primary, 5%);
|
||||
background-color: var(--color-primary);
|
||||
border-color:color-mix(in oklab, var(--color-primary), black 5%);
|
||||
}
|
||||
.btn-primary:active:hover, .btn-primary.active:hover, .open > .dropdown-toggle.btn-primary:hover, .btn-primary:active:focus, .btn-primary.active:focus, .open > .dropdown-toggle.btn-primary:focus, .btn-primary:active.focus, .btn-primary.active.focus, .open > .dropdown-toggle.btn-primary.focus {
|
||||
background-color: darken($color-primary, 17%);
|
||||
border-color: darken($color-primary, 30%);
|
||||
.btn-primary:active, .btn-primary.active, .btn-primary:active:hover, .btn-primary.active:hover, .open > .dropdown-toggle.btn-primary:hover, .btn-primary:active:focus, .btn-primary.active:focus, .open > .dropdown-toggle.btn-primary:focus, .btn-primary:active.focus, .btn-primary.active.focus, .open > .dropdown-toggle.btn-primary.focus {
|
||||
background-color:color-mix(in oklab, var(--color-primary), black 17%);
|
||||
border-color: color-mix(in oklab, var(--color-primary), black 30%);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -13,13 +13,22 @@
|
|||
{% if favicon_package %}
|
||||
<link rel="apple-touch-icon" sizes="180x180" href="{% static 'favicon_package/apple-touch-icon.png' %}">
|
||||
<link rel="manifest" href="{% static 'favicon_package/site.webmanifest' %}">
|
||||
<link rel="mask-icon" href="{% static 'favicon_package/safari-pinned-tab.svg' %}" color="{{ colors.safari_mask_icon_color }}">
|
||||
<link rel="mask-icon" href="{% static 'favicon_package/safari-pinned-tab.svg' %}" color="{{ primary_color }}">
|
||||
<meta name="apple-mobile-web-app-title" content="c3nav">
|
||||
<meta name="application-name" content="c3nav">
|
||||
<meta name="msapplication-TileColor" content="{{ colors.msapplication_tile_color }}">
|
||||
<meta name="msapplication-TileColor" content="{{ primary_color }}">
|
||||
<meta name="msapplication-config" content="{% static 'favicon_package/browserconfig.xml' %}">
|
||||
{% endif %}
|
||||
<meta name="theme-color" content="{{ colors.header_background_color }}">
|
||||
<meta name="theme-color" media="(prefers-color-scheme: light)" content="{{ active_theme.theme_color_light }}" />
|
||||
<meta name="theme-color" media="(prefers-color-scheme: dark)" content="{{ active_theme.theme_color_dark }}" />
|
||||
{% if randomize_primary_color %}
|
||||
<style id="c3nav-theme-randomized-primary-color">
|
||||
:root {
|
||||
--color-primary: {{ primary_color }}
|
||||
}
|
||||
</style>
|
||||
{% endif %}
|
||||
<style>{{ active_theme.css }}</style>
|
||||
{% compress css %}
|
||||
<link href="{% static 'fonts/fonts.css' %}" rel="stylesheet">
|
||||
<link href="{% static 'bootstrap/css/bootstrap.css' %}" rel="stylesheet">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue