vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into rebrand-ui

Browse source
This commit is contained in:
prssanna 2020-12-29 17:00:48 +05:30
commit 094e727186
5 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frappe/public/js/frappe/form/templates/timeline_message_box.html
View file

@ -2,7 +2,6 @@
<span class="flex justify-between">
<span class="text-color flex">
{% if (doc.comment_type && doc.comment_type == "Comment") { %}
{% console.log(doc) %}
<span>
{{ doc.user_full_name || frappe.user.full_name(doc.owner) }} {{ __("commented") }}
<span class="text-muted margin-left">

2
frappe/public/scss/website/index.scss
View file

@ -92,7 +92,7 @@
.breadcrumb {
padding: 0;
font-size: $font-size-sm;
background-color: white;
background-color: $breadcrumb-bg;
}
a.card {

1
frappe/public/scss/website/navbar.scss
View file

@ -1,5 +1,6 @@
.navbar-light {
border-bottom: 1px solid $border-color;
background: $navbar-bg;
}
.navbar-brand {

2
frappe/public/scss/website/variables.scss
View file

@ -18,6 +18,8 @@ $body-color: $gray-700 !default;
$text-muted: $gray-600 !default;
$border-color: $gray-300 !default;
$headings-color: $gray-900 !default;
$breadcrumb-bg: transparent !default;
$navbar-bg: white !default;
$container-max-widths: (
sm: 540px,

2
frappe/templates/base.html
View file

@ -58,7 +58,7 @@
window.socketio_port = {{ (frappe.socketio_port or 'null') }};
</script>
</head>
<body frappe-session-status="{{ 'logged-in' if frappe.session.user != 'Guest' else 'logged-out'}}" data-path="{{ path | e }}" {%- if template and template.endswith('.md') %} frappe-content-type="markdown" {% endif -%} class="bg-light">
<body frappe-session-status="{{ 'logged-in' if frappe.session.user != 'Guest' else 'logged-out'}}" data-path="{{ path | e }}" {%- if template and template.endswith('.md') %} frappe-content-type="markdown" {% endif -%} class="bg-light {{ body_class or ''}}">
{%- block banner -%}
{% include "templates/includes/banner_extension.html" ignore missing %}