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

Merge pull request #12515 from surajshetty3416/redesign-fixes-2nd-mar

Browse source
This commit is contained in:
Suraj Shetty 2021-03-02 16:10:49 +05:30 • committed by GitHub
commit c40ef217fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frappe/public/icons/timeless/icon-right-arrow.svg
View file

@ -1,3 +0,0 @@
<svg width="6" height="8" viewBox="0 0 6 8" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M1.25 7.5L4.75 4L1.25 0.5" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
Side by side

Before

Width:  |  Height:  |  Size: 206 B

3
frappe/public/scss/common/buttons.scss
View file

@ -78,8 +78,9 @@
.btn.btn-primary {
background-color: var(--primary-color);
color: var(--white);
white-space: nowrap;
--icon-stroke: white;
--icon-stroke: currentColor;
--icon-fill-bg: var(--primary-color);
}

2
frappe/public/scss/desk/breadcrumb.scss
View file

@ -12,7 +12,7 @@
font-size: var(--text-md);
margin-right: 10px;
&:before {
content: url('/assets/frappe/icons/timeless/icon-right-arrow.svg');
content: var(--right-arrow-svg);
display: inline-block;
margin-right: 10px;
}

3
frappe/public/scss/desk/css_variables.scss
View file

@ -50,6 +50,7 @@ $input-height: 28px !default;
// input
--input-height: #{$input-height};
--input-disabled-bg: var(--gray-200);
// timeline
--timeline-item-icon-size: 34px;
@ -60,4 +61,6 @@ $input-height: 28px !default;
// skeleton
--skeleton-bg: var(--gray-100);
--right-arrow-svg: url("data: image/svg+xml;utf8, <svg width='6' height='8' viewBox='0 0 6 8' fill='none' xmlns='http://www.w3.org/2000/svg'><path d='M1.25 7.5L4.75 4L1.25 0.5' stroke='%231F272E' stroke-linecap='round' stroke-linejoin='round'/></svg>");
}

5
frappe/public/scss/desk/dark.scss
View file

@ -72,6 +72,9 @@
--highlight-color: var(--gray-700);
--yellow-highlight-color: var(--yellow-700);
// input
--input-disabled-bg: none;
.frappe-card {
.btn-default {
background-color: var(--bg-color);
@ -142,4 +145,6 @@
// skeleton
--skeleton-bg: var(--gray-800);
--right-arrow-svg: url("data: image/svg+xml;utf8, <svg width='6' height='8' viewBox='0 0 6 8' fill='none' xmlns='http://www.w3.org/2000/svg'><path d='M1.25 7.5L4.75 4L1.25 0.5' stroke='white' stroke-linecap='round' stroke-linejoin='round'/></svg>");
}

5
frappe/public/scss/desk/variables.scss
View file

@ -60,11 +60,12 @@ $link-color: var(--text-color);
// input
$input-bg: var(--control-bg);
$input-placeholder-color: var(--gray-500);
$input-disabled-bg: var(--gray-200);
$input-disabled-bg: var(--input-disabled-bg);
$input-color: var(--text-color);
$input-box-shadow: none;
$input-focus-border-color: var(--gray-500);
$input-border-radius: var(--border-radius);
$input-btn-focus-width: 2px;
// dropdown
$dropdown-color: var(--text-color);
@ -134,9 +135,9 @@ $grid-breakpoints: (
2xl: 1440px
) !default;
@import 'dark';
@import 'typography';
@import '~bootstrap/scss/functions';
@import '~bootstrap/scss/variables';
@import "~bootstrap/scss/mixins";
@import 'css_variables';
@import 'dark';