From 54ebf5b9b5e337f2dbe4efeeb82e5bff37bd298c Mon Sep 17 00:00:00 2001 From: prssanna Date: Fri, 12 Feb 2021 10:45:00 +0530 Subject: [PATCH] refactor: remove styles from desk.less --- frappe/public/less/desk.less | 275 ++++++++++---------------- frappe/public/scss/common/global.scss | 25 +++ frappe/public/scss/desk/global.scss | 49 ++++- frappe/public/scss/desk/slides.scss | 24 +++ 4 files changed, 197 insertions(+), 176 deletions(-) diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less index 61e93b5be5..db59f8d51e 100644 --- a/frappe/public/less/desk.less +++ b/frappe/public/less/desk.less @@ -327,9 +327,9 @@ // } // } -.search-result { - margin-bottom: 24px; -} +// .search-result { +// margin-bottom: 24px; +// } // .search-dialog { // .modal-dialog { @@ -572,146 +572,127 @@ // } // Will not be required after commonifying lists with empty state -.multiselect-empty-state{ - min-height: 300px; - display: flex; - align-items: center; - justify-content: center; - height: 100%; -} +// .multiselect-empty-state{ +// min-height: 300px; +// display: flex; +// align-items: center; +// justify-content: center; +// height: 100%; +// } // Slides -.slides-wrapper { - &:focus { - outline: none; - } +// .slides-wrapper { + // &:focus { + // outline: none; + // } - .fa-circle { - font-size: 10px; - margin: 0px 2px; - &.active { - color: #5e64ff; - } - &.link { - cursor: pointer; - } - } - .slide-wrapper { - &:focus { - outline: none; - } - } - .form { - margin-top: 30px; - .form-layout { - margin-top: 0px; - margin-bottom: 0px; - } - .form-section { - padding: 0px 7px; - border: none; - } - } - .add-more { - margin-bottom: 30px; - } - .lead { - margin-top: 20px; - font-weight: 500; - } - .success-state { - margin-bottom: 20px; - } - .next-steps-links { - .title { - text-transform: uppercase; - color: #8D99A6; - font-size: 11px; - } + // .fa-circle { + // font-size: 10px; + // margin: 0px 2px; + // &.active { + // color: #5e64ff; + // } + // &.link { + // cursor: pointer; + // } + // } - } - .btn-primary { - font-weight: bold; - } - .slide-footer { - margin: 15px 0px; - padding: 0px 7px; + // .form { + // margin-top: 30px; + // .form-layout { + // margin-top: 0px; + // margin-bottom: 0px; + // } + // .form-section { + // padding: 0px 7px; + // border: none; + // } + // } - .btn:not(:last-child) { - margin-right: 3px; - } - a.make-btn.disabled { - background-color: #b1bdca; - color: #fff; - border-color: #b1bdca; - } - } -} + // .next-steps-links { + // .title { + // text-transform: uppercase; + // color: #8D99A6; + // font-size: 11px; + // } + + // } + // .btn-primary { + // font-weight: bold; + // } + // .slide-footer { + // margin: 15px 0px; + // padding: 0px 7px; + + // .btn:not(:last-child) { + // margin-right: 3px; + // } + + // a.make-btn.disabled { + // background-color: #b1bdca; + // color: #fff; + // border-color: #b1bdca; + // } + // } +// } // Onboarding Dialog -.onboarding-dialog { +// .onboarding-dialog { - .slide-body { - margin-right: auto; - margin-left: auto; - } +// .slide-body { +// margin-right: auto; +// margin-left: auto; +// } - .slides-wrapper { - padding-left: 10px; - padding-right: 10px; - } +// .slides-wrapper { +// padding-left: 10px; +// padding-right: 10px; +// } - .modal-content { - border: 1px solid #d1d8dd; - box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.1); - } +// .modal-content { +// border: 1px solid #d1d8dd; +// box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.1); +// } - .modal-backdrop { - background-color: #ffffff; - } +// .modal-backdrop { +// background-color: #ffffff; +// } - .modal-backdrop.in { - opacity: 1; - } +// .modal-backdrop.in { +// opacity: 1; +// } - .modal-dialog { - height: 80%; - max-width: none; - } +// .modal-dialog { +// height: 80%; +// max-width: none; +// } - .onboarding-icon { - color: @text-muted; - margin-right: 5px; - } +// .onboarding-icon { +// color: @text-muted; +// margin-right: 5px; +// } - .modal-content .slide-container { - height: auto; - min-height: 100%; - bottom: 0; - } +// .modal-content .slide-container { +// height: auto; +// min-height: 100%; +// bottom: 0; +// } - img { - max-height: 175px; - width: auto; - } +// img { +// max-height: 175px; +// width: auto; +// } - .slides-progress { - margin-top: 15px; - } +// .slides-progress { +// margin-top: 15px; +// } - .skip-btn { - padding: 5px 0px 5px 0px; - } -} +// .skip-btn { +// padding: 5px 0px 5px 0px; +// } +// } -/* broken image styling */ - -img.no-image { - position: relative; - height: 100%; - width: 100%; -} .img-background() { content: " "; @@ -759,36 +740,9 @@ img.img-loading:after { // utilities -.whitespace-nowrap { - white-space: nowrap; -} - -body.full-width { - @media (min-width: @screen-md) { - .container { - width: 90%; - } - } -} - -body.no-sidebar { - @media (min-width: @screen-md) { - .layout-side-section { - display: none; - } - - .layout-main-section-wrapper { - width: 100% !important; - } - } -} // utilities -.whitespace-nowrap { - white-space: nowrap; -} - // .modal-minimize { // position: initial; // .modal-backdrop { @@ -810,26 +764,5 @@ body.no-sidebar { // } // } -.app-logo { - width: 24px; -} -.alt-pressed .alt-underline { - text-decoration: underline; -} -.app-change-log-body { - h1 { - font-size: 20px; - } -} - -.new-version-log { - .new-version-links { - padding: 5px 0px; - } - - &:not(:last-child) { - margin-bottom: 1em; - } -} diff --git a/frappe/public/scss/common/global.scss b/frappe/public/scss/common/global.scss index 049a6b7610..6e5ef1885c 100644 --- a/frappe/public/scss/common/global.scss +++ b/frappe/public/scss/common/global.scss @@ -104,3 +104,28 @@ html.firefox, html.safari { } } } + +.no-border { + border: none !important; +} + +.whitespace-nowrap { + white-space: nowrap; +} + +.app-change-log-body { + h1 { + font-size: var(--text-2xl); + } +} + +.new-version-log { + .new-version-links { + padding: var(--padding-xs) 0px; + } + + &:not(:last-child) { + margin-bottom: 1em; + } +} + diff --git a/frappe/public/scss/desk/global.scss b/frappe/public/scss/desk/global.scss index 79e5aa1c2b..d6211b23f0 100644 --- a/frappe/public/scss/desk/global.scss +++ b/frappe/public/scss/desk/global.scss @@ -421,11 +421,6 @@ kbd { color: var(--text-muted); } -.no-border { - border: none !important; -} - - /*rtl styles*/ .frappe-rtl { @@ -438,3 +433,47 @@ kbd { margin-left: 0px; } } + +/* broken image styling */ + +img.no-image { + position: relative; + height: 100%; + width: 100%; + background-color: var(--bg-light-gray); +} + + +@media (min-width: 768px) { + .video-modal .modal-dialog { + width: 700px; + } +} + +body.full-width { + @include media-breakpoint-up(md) { + .container { + width: 90%; + } + } +} + +body.no-sidebar { + @include media-breakpoint-up(md) { + .layout-side-section { + display: none; + } + + .layout-main-section-wrapper { + width: 100% !important; + } + } +} + +.app-logo { + width: 24px; +} + +.alt-pressed .alt-underline { + text-decoration: underline; +} \ No newline at end of file diff --git a/frappe/public/scss/desk/slides.scss b/frappe/public/scss/desk/slides.scss index ce05d95852..d0896c8f3c 100644 --- a/frappe/public/scss/desk/slides.scss +++ b/frappe/public/scss/desk/slides.scss @@ -79,6 +79,10 @@ box-shadow: var(--card-shadow); border-radius: var(--border-radius-md); + .slide-wrapper:focus { + outline: none; + } + .slide-footer { margin: var(--margin-md) 0; padding: 0 var(--padding-lg); @@ -95,6 +99,13 @@ .form-wrapper { margin-top: var(--margin-xl); + + .form { + .form-section { + padding: 0px var(--padding-sm); + border: none; + } + } } &.setup-in-progress { @@ -110,4 +121,17 @@ margin: var(--margin-lg) auto; } } + + .add-more { + margin-bottom: var(--margin-xl); + } + + .lead { + margin-top: var(--margin-lg); + font-weight: 500; + } + + .success-state { + margin-bottom: var(--margin-lg);; + } }