Browse Source

Merge pull request #1910 from netchampfaris/ui-fixes

UI fixes frappe/erpnext#5842
version-14
Rushabh Mehta 9 years ago
committed by GitHub
parent
commit
9aa9706e1d
6 changed files with 16 additions and 4 deletions
  1. +2
    -1
      frappe/public/css/desk.css
  2. +6
    -0
      frappe/public/css/form.css
  3. +1
    -1
      frappe/public/css/page.css
  4. +1
    -1
      frappe/public/less/desk.less
  5. +5
    -0
      frappe/public/less/form.less
  6. +1
    -1
      frappe/public/less/page.less

+ 2
- 1
frappe/public/css/desk.css View File

@@ -405,7 +405,8 @@ fieldset[disabled] .form-control {
.ui-menu .ui-menu-item { .ui-menu .ui-menu-item {
font-size: 12px; font-size: 12px;
} }
.ui-menu .ui-menu-item a {
.ui-menu .ui-menu-item a,
.ui-menu .ui-menu-item div {
padding: 9px 11.8px !important; padding: 9px 11.8px !important;
text-decoration: none; text-decoration: none;
} }


+ 6
- 0
frappe/public/css/form.css View File

@@ -92,6 +92,12 @@
.form-heatmap .heatmap-message { .form-heatmap .heatmap-message {
margin-top: 10px; margin-top: 10px;
} }
@media (max-width: 991px) {
.form-heatmap {
overflow: hidden;
overflow-x: scroll;
}
}
.inline-graph .inline-graph-half { .inline-graph .inline-graph-half {
width: 48%; width: 48%;
display: inline-block; display: inline-block;


+ 1
- 1
frappe/public/css/page.css View File

@@ -132,7 +132,7 @@ select.input-sm {
} }
@media (max-width: 767px) { @media (max-width: 767px) {
.page-actions { .page-actions {
width: 105px;
max-width: 150px;
float: right; float: right;
} }
.page-title { .page-title {


+ 1
- 1
frappe/public/less/desk.less View File

@@ -221,7 +221,7 @@ textarea.form-control {


.ui-menu .ui-menu-item { .ui-menu .ui-menu-item {
font-size: @text-medium; font-size: @text-medium;
a {
a, div {
padding: 9px 11.8px !important; padding: 9px 11.8px !important;
text-decoration: none; text-decoration: none;
} }


+ 5
- 0
frappe/public/less/form.less View File

@@ -125,6 +125,11 @@
.heatmap-message { .heatmap-message {
margin-top: 10px; margin-top: 10px;
} }

@media (max-width: @screen-sm) {
overflow: hidden;
overflow-x: scroll;
}
} }


.inline-graph { .inline-graph {


+ 1
- 1
frappe/public/less/page.less View File

@@ -166,7 +166,7 @@ select.input-sm {


@media(max-width: @screen-xs) { @media(max-width: @screen-xs) {
.page-actions { .page-actions {
width: 105px;
max-width: 150px;
float: right; float: right;
} }




Loading…
Cancel
Save