Bladeren bron

Fixed calendar, gantt css, page title font-size in mobile

version-14
Anand Doshi 10 jaren geleden
bovenliggende
commit
fbfdc2b5db
12 gewijzigde bestanden met toevoegingen van 164 en 146 verwijderingen
  1. +1
    -1
      frappe/desk/page/messages/messages.js
  2. +6
    -4
      frappe/public/build.json
  3. +31
    -0
      frappe/public/css/calendar.css
  4. +32
    -0
      frappe/public/css/gantt.css
  5. +8
    -1
      frappe/public/css/mobile.css
  6. +0
    -65
      frappe/public/css/report.css
  7. +4
    -2
      frappe/public/js/frappe/assets.js
  8. +0
    -2
      frappe/public/js/frappe/views/calendar.js
  9. +38
    -0
      frappe/public/less/calendar.less
  10. +32
    -0
      frappe/public/less/gantt.less
  11. +12
    -1
      frappe/public/less/mobile.less
  12. +0
    -70
      frappe/public/less/report.less

+ 1
- 1
frappe/desk/page/messages/messages.js Bestand weergeven

@@ -14,7 +14,7 @@ frappe.pages.messages.on_page_load = function(parent) {
});

page.set_title('<span class="hidden-xs">' + __("Messages") + '</span>'
+ '<span class="visible-xs message-to"></span>');
+ '<span class="hidden-sm hidden-md hidden-lg message-to"></span>');

$(".navbar-center").html(__("Messages"));



+ 6
- 4
frappe/public/build.json Bestand weergeven

@@ -152,7 +152,9 @@
],
"css/list.min.css": [
"public/css/list.css",
"public/css/tag-it.css"
"public/css/tag-it.css",
"public/css/calendar.css",
"public/css/gantt.css"
],
"js/list.min.js": [
"public/js/frappe/ui/listing.html",
@@ -172,7 +174,9 @@
"public/js/frappe/list/list_item_main_head.html",
"public/js/frappe/list/list_item_row_head.html",
"public/js/frappe/list/list_item_subject.html",
"public/js/frappe/list/listview.js"
"public/js/frappe/list/listview.js",
"public/js/frappe/views/calendar.js",
"public/js/frappe/views/ganttview.js"
],
"css/report.min.css": [
"public/css/report.css",
@@ -187,8 +191,6 @@
"public/js/frappe/views/reports/query_report.js",
"public/js/frappe/views/reports/grid_report.js",
"public/js/frappe/views/reports/print_grid.html",
"public/js/frappe/views/calendar.js",
"public/js/frappe/views/ganttview.js",

"public/js/lib/slickgrid/jquery.event.drag.js",
"public/js/lib/slickgrid/plugins/slick.cellrangedecorator.js",


+ 31
- 0
frappe/public/css/calendar.css Bestand weergeven

@@ -0,0 +1,31 @@
.fc-toolbar {
padding: 15px;
margin-bottom: 0px !important;
}
.fc-view-container {
margin-left: -1px;
}
th.fc-widget-header {
background-color: #f7fafc;
color: #8C99A5;
}
.fc-unthemed th,
.fc-unthemed td,
.fc-unthemed hr,
.fc-unthemed thead,
.fc-unthemed tbody,
.fc-unthemed .fc-row,
.fc-unthemed .fc-popover {
border-color: #d1d8dd !important;
}
.fc-unthemed .fc-today {
background-color: #FFFEF2 !important;
}
.fc-highlight {
background-color: #D9F6FF !important;
}
.fc-event {
border: 1px solid #E8DDFF !important;
/* default BORDER color */
background-color: #E8DDFF !important;
}

+ 32
- 0
frappe/public/css/gantt.css Bestand weergeven

@@ -0,0 +1,32 @@
.gantt,
.gantt2 {
border: none !important;
border-radius: none !important;
margin: 0px auto !important;
}
.fn-gantt .leftPanel,
.fn-gantt .leftPanel .row0,
.fn-gantt .leftPanel .name,
.fn-gantt .leftPanel .desc,
.fn-gantt .dataPanel,
.fn-gantt .day,
.fn-gantt .date,
.fn-gantt .rightPanel .month,
.fn-gantt .rightPanel .year {
border-color: #d1d8dd !important;
}
.fn-gantt .navigate {
border: none !important;
}
.fn-gantt .leftPanel .name,
.fn-gantt .leftPanel .desc,
.fn-gantt .spacer,
.fn-gantt .wd,
.fn-gantt .rightPanel .month,
.fn-gantt .rightPanel .year,
.fn-gantt .bottom {
background-color: #f7fafc !important;
}
.fn-gantt .today {
background-color: #D9F6FF !important;
}

+ 8
- 1
frappe/public/css/mobile.css Bestand weergeven

@@ -21,6 +21,10 @@
.modal .modal-body .form-layout {
margin: -15px;
}
.page-head .page-title h1 {
font-size: 18px;
margin-top: 22px;
}
.layout-main-section-wrapper {
padding: 0px;
}
@@ -115,6 +119,9 @@
.doclist-row .list-row-modified {
margin-right: -10px;
}
.doclist-row .list-row-left {
z-index: 1;
}
.doclist-row .list-row-right {
float: right;
}
@@ -173,7 +180,7 @@
top: 0;
}
body[data-route^="Form"] .page-title h1 {
margin-top: 10px;
margin-top: 14px;
}
body[data-route^="Form"] .page-title .indicator {
display: block;


+ 0
- 65
frappe/public/css/report.css Bestand weergeven

@@ -14,71 +14,6 @@
margin: 10px;
display: none;
}
/* gantt chart */
.gantt,
.gantt2 {
border: none !important;
border-radius: none !important;
margin: 0px auto !important;
}
.fn-gantt .leftPanel,
.fn-gantt .leftPanel .row0,
.fn-gantt .leftPanel .name,
.fn-gantt .leftPanel .desc,
.fn-gantt .dataPanel,
.fn-gantt .day,
.fn-gantt .date,
.fn-gantt .rightPanel .month,
.fn-gantt .rightPanel .year {
border-color: #d1d8dd !important;
}
.fn-gantt .navigate {
border: none !important;
}
.fn-gantt .leftPanel .name,
.fn-gantt .leftPanel .desc,
.fn-gantt .spacer,
.fn-gantt .wd,
.fn-gantt .rightPanel .month,
.fn-gantt .rightPanel .year,
.fn-gantt .bottom {
background-color: #f7fafc !important;
}
.fn-gantt .today {
background-color: #D9F6FF !important;
}
/* calendar */
.fc-toolbar {
padding: 15px;
margin-bottom: 0px !important;
}
.fc-view-container {
margin-left: -1px;
}
th.fc-widget-header {
background-color: #f7fafc;
color: #8C99A5;
}
.fc-unthemed th,
.fc-unthemed td,
.fc-unthemed hr,
.fc-unthemed thead,
.fc-unthemed tbody,
.fc-unthemed .fc-row,
.fc-unthemed .fc-popover {
border-color: #d1d8dd !important;
}
.fc-unthemed .fc-today {
background-color: #FFFEF2 !important;
}
.fc-highlight {
background-color: #D9F6FF !important;
}
.fc-event {
border: 1px solid #E8DDFF !important;
/* default BORDER color */
background-color: #E8DDFF !important;
}
.column-picker-dialog .column-list {
margin: 15px -15px;
border-top: 1px solid #d1d8dd;


+ 4
- 2
frappe/public/js/frappe/assets.js Bestand weergeven

@@ -147,10 +147,12 @@ frappe.assets = {
frappe.require("assets/js/module.min.js");
},
"Calendar": function() {
frappe.assets.views["Report"]();
frappe.assets.views["List"]();
// frappe.assets.views["Report"]();
},
"Gantt": function() {
frappe.assets.views["Report"]();
frappe.assets.views["List"]();
// frappe.assets.views["Report"]();
},
}
};

+ 0
- 2
frappe/public/js/frappe/views/calendar.js Bestand weergeven

@@ -60,8 +60,6 @@ frappe.views.Calendar = Class.extend({
// .html(__("Select dates to create a new ") + __(me.doctype))
// .appendTo(this.$wrapper);

console.log(this.$cal);

this.$cal.fullCalendar(this.cal_options);

this.set_css();


+ 38
- 0
frappe/public/less/calendar.less Bestand weergeven

@@ -0,0 +1,38 @@
@import "variables.less";

.fc-toolbar {
padding: 15px;
margin-bottom: 0px !important;
}

.fc-view-container {
margin-left: -1px;
}

th.fc-widget-header {
background-color: @panel-bg;
color: #8C99A5;
}

.fc-unthemed th,
.fc-unthemed td,
.fc-unthemed hr,
.fc-unthemed thead,
.fc-unthemed tbody,
.fc-unthemed .fc-row,
.fc-unthemed .fc-popover {
border-color: @border-color !important;
}

.fc-unthemed .fc-today {
background-color: #FFFEF2 !important;
}

.fc-highlight {
background-color: #D9F6FF !important;
}

.fc-event {
border: 1px solid #E8DDFF !important; /* default BORDER color */
background-color: #E8DDFF !important;
}

+ 32
- 0
frappe/public/less/gantt.less Bestand weergeven

@@ -0,0 +1,32 @@
@import "variables.less";

.gantt, .gantt2 {
border: none !important;
border-radius: none !important;
margin: 0px auto !important;
}

.fn-gantt .leftPanel,
.fn-gantt .leftPanel .row0,
.fn-gantt .leftPanel .name, .fn-gantt .leftPanel .desc,
.fn-gantt .dataPanel,
.fn-gantt .day, .fn-gantt .date,
.fn-gantt .rightPanel .month, .fn-gantt .rightPanel .year {
border-color: @border-color !important;
}

.fn-gantt .navigate {
border: none !important;
}

.fn-gantt .leftPanel .name, .fn-gantt .leftPanel .desc,
.fn-gantt .spacer,
.fn-gantt .wd,
.fn-gantt .rightPanel .month, .fn-gantt .rightPanel .year,
.fn-gantt .bottom {
background-color: @panel-bg !important;
}

.fn-gantt .today {
background-color: #D9F6FF !important;
}

+ 12
- 1
frappe/public/less/mobile.less Bestand weergeven

@@ -30,6 +30,13 @@
}
}

.page-head {
.page-title h1 {
font-size: 18px;
margin-top: 22px;
}
}

.layout-main-section-wrapper {
padding: 0px;
}
@@ -155,6 +162,10 @@
margin-right: -10px;
}

.list-row-left {
z-index: 1;
}

.list-row-right {
float: right;
}
@@ -226,7 +237,7 @@

body[data-route^="Form"] {
.page-title h1 {
margin-top: 10px;
margin-top: 14px;
}

.page-title .indicator {


+ 0
- 70
frappe/public/less/report.less Bestand weergeven

@@ -20,76 +20,6 @@
display: none
}

/* gantt chart */
.gantt, .gantt2 {
border: none !important;
border-radius: none !important;
margin: 0px auto !important;
}

.fn-gantt .leftPanel,
.fn-gantt .leftPanel .row0,
.fn-gantt .leftPanel .name, .fn-gantt .leftPanel .desc,
.fn-gantt .dataPanel,
.fn-gantt .day, .fn-gantt .date,
.fn-gantt .rightPanel .month, .fn-gantt .rightPanel .year {
border-color: @border-color !important;
}

.fn-gantt .navigate {
border: none !important;
}

.fn-gantt .leftPanel .name, .fn-gantt .leftPanel .desc,
.fn-gantt .spacer,
.fn-gantt .wd,
.fn-gantt .rightPanel .month, .fn-gantt .rightPanel .year,
.fn-gantt .bottom {
background-color: @panel-bg !important;
}

.fn-gantt .today {
background-color: #D9F6FF !important;
}

/* calendar */
.fc-toolbar {
padding: 15px;
margin-bottom: 0px !important;
}

.fc-view-container {
margin-left: -1px;
}

th.fc-widget-header {
background-color: @panel-bg;
color: #8C99A5;
}

.fc-unthemed th,
.fc-unthemed td,
.fc-unthemed hr,
.fc-unthemed thead,
.fc-unthemed tbody,
.fc-unthemed .fc-row,
.fc-unthemed .fc-popover {
border-color: @border-color !important;
}

.fc-unthemed .fc-today {
background-color: #FFFEF2 !important;
}

.fc-highlight {
background-color: #D9F6FF !important;
}

.fc-event {
border: 1px solid #E8DDFF !important; /* default BORDER color */
background-color: #E8DDFF !important;
}

// column picker
.column-picker-dialog {
.column-list {


Laden…
Annuleren
Opslaan