summaryrefslogtreecommitdiff
path: root/assets
diff options
context:
space:
mode:
authorFrédéric Guillot <fred@kanboard.net>2014-12-06 14:42:53 -0500
committerFrédéric Guillot <fred@kanboard.net>2014-12-06 14:43:36 -0500
commit5933a829b7e0201fefe4198672612c0ae77000d6 (patch)
tree0faa27b990de8c1bb77682b2d6d975181f1fd0ad /assets
parent18bba794131e18b6ae81dff897bc196f43ca9d63 (diff)
Minors layout improvements
Diffstat (limited to 'assets')
-rw-r--r--assets/css/app.css79
-rw-r--r--assets/css/form.css4
-rw-r--r--assets/css/responsive.css71
-rw-r--r--assets/css/table.css4
-rw-r--r--assets/js/analytic.js10
-rw-r--r--assets/js/app.js10
6 files changed, 42 insertions, 136 deletions
diff --git a/assets/css/app.css b/assets/css/app.css
index c239153c..2ce277c7 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -121,6 +121,10 @@ th a:hover {
white-space: nowrap;
}
+.table-fixed th {
+ overflow: hidden;
+}
+
.table-fixed td {
white-space: nowrap;
overflow: hidden;
@@ -298,6 +302,10 @@ ul.form-errors li {
display: none;
}
+.form-inline-group {
+ display: inline;
+}
+
input.form-date {
width: 150px;
}
@@ -1294,35 +1302,9 @@ tr td.task-orange,
margin-left: 30px;
line-height: 1.8em;
}/* responsive design */
-@media only screen and (min-width : 769px) and (max-width : 1024px) {
-
- .hide-tablet {
- display: none;
- }
-
- body {
- font-size: 0.9em;
- }
-
- .project-menu {
- font-size: 0.8em;
- }
-
- .task-board-title {
- font-size: 1.5em;
- }
-
- .form-tab {
- max-width: 662px;
- }
-
- input.form-date ~ div.form-help {
- max-width: 150px;
- }
-}
-
-@media only screen and (max-width : 768px) {
+@media only screen and (max-width: 1024px) {
+ li.hide-tablet,
.hide-tablet {
display: none;
}
@@ -1331,46 +1313,17 @@ tr td.task-orange,
font-size: 0.85em;
}
- .logo,
- .project-menu {
- display: none;
- }
-
- nav li:first-child {
- padding-left: 0;
+ .form-tab {
+ max-width: 404px;
}
- .username {
+ .form-inline-group input[type="submit"],
+ .form-inline-group label {
display: block;
- text-align: right;
}
- .user-show-sidebar,
- .project-show-sidebar,
- .task-show-sidebar {
- width: 200px;
- }
-
- .user-show-main,
- .project-show-main,
- .task-show-main {
- margin-left: 230px;
- }
-
- table input[type="text"] {
- width: 150px;
- }
-
- .task-score {
- display: none;
- }
-
- .task-board-title {
- font-size: 1.5em;
- }
-
- .form-tab {
- max-width: 404px;
+ .form-inline-group input[type="submit"] {
+ margin-top: 20px;
}
}
/*!
diff --git a/assets/css/form.css b/assets/css/form.css
index 125223e2..ec566684 100644
--- a/assets/css/form.css
+++ b/assets/css/form.css
@@ -131,6 +131,10 @@ ul.form-errors li {
display: none;
}
+.form-inline-group {
+ display: inline;
+}
+
input.form-date {
width: 150px;
}
diff --git a/assets/css/responsive.css b/assets/css/responsive.css
index b1977b01..38a57593 100644
--- a/assets/css/responsive.css
+++ b/assets/css/responsive.css
@@ -1,33 +1,7 @@
/* responsive design */
-@media only screen and (min-width : 769px) and (max-width : 1024px) {
-
- .hide-tablet {
- display: none;
- }
-
- body {
- font-size: 0.9em;
- }
-
- .project-menu {
- font-size: 0.8em;
- }
-
- .task-board-title {
- font-size: 1.5em;
- }
-
- .form-tab {
- max-width: 662px;
- }
-
- input.form-date ~ div.form-help {
- max-width: 150px;
- }
-}
-
-@media only screen and (max-width : 768px) {
+@media only screen and (max-width: 1024px) {
+ li.hide-tablet,
.hide-tablet {
display: none;
}
@@ -36,45 +10,16 @@
font-size: 0.85em;
}
- .logo,
- .project-menu {
- display: none;
- }
-
- nav li:first-child {
- padding-left: 0;
+ .form-tab {
+ max-width: 404px;
}
- .username {
+ .form-inline-group input[type="submit"],
+ .form-inline-group label {
display: block;
- text-align: right;
- }
-
- .user-show-sidebar,
- .project-show-sidebar,
- .task-show-sidebar {
- width: 200px;
- }
-
- .user-show-main,
- .project-show-main,
- .task-show-main {
- margin-left: 230px;
}
- table input[type="text"] {
- width: 150px;
- }
-
- .task-score {
- display: none;
- }
-
- .task-board-title {
- font-size: 1.5em;
- }
-
- .form-tab {
- max-width: 404px;
+ .form-inline-group input[type="submit"] {
+ margin-top: 20px;
}
}
diff --git a/assets/css/table.css b/assets/css/table.css
index 1a1e52a7..7c7be56b 100644
--- a/assets/css/table.css
+++ b/assets/css/table.css
@@ -48,6 +48,10 @@ th a:hover {
white-space: nowrap;
}
+.table-fixed th {
+ overflow: hidden;
+}
+
.table-fixed td {
white-space: nowrap;
overflow: hidden;
diff --git a/assets/js/analytic.js b/assets/js/analytic.js
index e8cffdc7..14cbc815 100644
--- a/assets/js/analytic.js
+++ b/assets/js/analytic.js
@@ -31,7 +31,7 @@ Kanboard.Analytic.CFD = (function() {
{
var series = prepareSeries(metrics, labels);
- var svg = dimple.newSvg("#chart", 800, 380);
+ var svg = dimple.newSvg("#chart", "100%", 380);
var chart = new dimple.chart(svg, series);
var x = chart.addCategoryAxis("x", labels['day']);
@@ -81,13 +81,13 @@ Kanboard.Analytic.TaskRepartition = (function() {
{
var series = prepareSeries(metrics, labels);
- var svg = dimple.newSvg("#chart", 700, 350);
+ var svg = dimple.newSvg("#chart", "100%", 350);
var chart = new dimple.chart(svg, series);
chart.addMeasureAxis("p", labels["nb_tasks"]);
var ring = chart.addSeries(labels["column_title"], dimple.plot.pie);
ring.innerRadius = "50%";
- chart.addLegend(0, 0, 100, 100, "left");
+ chart.addLegend(0, 0, 100, "100%", "left");
chart.draw();
}
@@ -126,13 +126,13 @@ Kanboard.Analytic.UserRepartition = (function() {
{
var series = prepareSeries(metrics, labels);
- var svg = dimple.newSvg("#chart", 700, 350);
+ var svg = dimple.newSvg("#chart", "100%", 350);
var chart = new dimple.chart(svg, series);
chart.addMeasureAxis("p", labels["nb_tasks"]);
var ring = chart.addSeries(labels["user"], dimple.plot.pie);
ring.innerRadius = "50%";
- chart.addLegend(0, 0, 100, 100, "left");
+ chart.addLegend(0, 0, 100, "100%", "left");
chart.draw();
}
diff --git a/assets/js/app.js b/assets/js/app.js
index 5e13d013..0be4fca4 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -462,7 +462,7 @@ Kanboard.Analytic.CFD = (function() {
{
var series = prepareSeries(metrics, labels);
- var svg = dimple.newSvg("#chart", 800, 380);
+ var svg = dimple.newSvg("#chart", "100%", 380);
var chart = new dimple.chart(svg, series);
var x = chart.addCategoryAxis("x", labels['day']);
@@ -512,13 +512,13 @@ Kanboard.Analytic.TaskRepartition = (function() {
{
var series = prepareSeries(metrics, labels);
- var svg = dimple.newSvg("#chart", 700, 350);
+ var svg = dimple.newSvg("#chart", "100%", 350);
var chart = new dimple.chart(svg, series);
chart.addMeasureAxis("p", labels["nb_tasks"]);
var ring = chart.addSeries(labels["column_title"], dimple.plot.pie);
ring.innerRadius = "50%";
- chart.addLegend(0, 0, 100, 100, "left");
+ chart.addLegend(0, 0, 100, "100%", "left");
chart.draw();
}
@@ -557,13 +557,13 @@ Kanboard.Analytic.UserRepartition = (function() {
{
var series = prepareSeries(metrics, labels);
- var svg = dimple.newSvg("#chart", 700, 350);
+ var svg = dimple.newSvg("#chart", "100%", 350);
var chart = new dimple.chart(svg, series);
chart.addMeasureAxis("p", labels["nb_tasks"]);
var ring = chart.addSeries(labels["user"], dimple.plot.pie);
ring.innerRadius = "50%";
- chart.addLegend(0, 0, 100, 100, "left");
+ chart.addLegend(0, 0, 100, "100%", "left");
chart.draw();
}