summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/Locale/fr_FR/translations.php2
-rw-r--r--app/Template/board/edit.php4
-rw-r--r--app/Template/layout.php2
-rw-r--r--assets/css/app.css46
-rw-r--r--assets/css/base.css1
-rw-r--r--assets/css/form.css2
-rw-r--r--assets/css/responsive.css39
-rw-r--r--assets/css/sidebar.css4
8 files changed, 88 insertions, 12 deletions
diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php
index c1cdef88..28c999a5 100644
--- a/app/Locale/fr_FR/translations.php
+++ b/app/Locale/fr_FR/translations.php
@@ -186,7 +186,7 @@ return array(
'Page not found' => 'Page introuvable',
'Complexity' => 'Complexité',
'limit' => 'limite',
- 'Task limit' => 'Nombre maximum de tâches',
+ 'Task limit' => 'Tâches Max.',
'Task count' => 'Nombre de tâches',
'This value must be greater than %d' => 'Cette valeur doit être plus grande que %d',
'Edit project access list' => 'Modifier l\'accès au projet',
diff --git a/app/Template/board/edit.php b/app/Template/board/edit.php
index 2c3236e2..d7086504 100644
--- a/app/Template/board/edit.php
+++ b/app/Template/board/edit.php
@@ -16,7 +16,7 @@
</tr>
<?php foreach ($columns as $column): ?>
<tr>
- <td><?= Helper\form_label(t('Column %d', ++$i), 'title['.$column['id'].']', array('title="column_id='.$column['id'].'"')) ?></td>
+ <td><?= Helper\form_label(++$i, 'title['.$column['id'].']', array('title="column_id='.$column['id'].'"')) ?></td>
<td><?= Helper\form_text('title['.$column['id'].']', $values, $errors, array('required')) ?></td>
<td><?= Helper\form_number('task_limit['.$column['id'].']', $values, $errors, array('placeholder="'.t('limit').'"')) ?></td>
<td>
@@ -44,7 +44,7 @@
<input type="submit" value="<?= t('Update') ?>" class="btn btn-blue"/>
</div>
</form>
-
+<hr/>
<h3><?= t('Add a new column') ?></h3>
<form method="post" action="<?= Helper\u('board', 'add', array('project_id' => $project['id'])) ?>" autocomplete="off">
diff --git a/app/Template/layout.php b/app/Template/layout.php
index 562d26e1..7edd0051 100644
--- a/app/Template/layout.php
+++ b/app/Template/layout.php
@@ -44,7 +44,7 @@
<?php endif ?>
<li>
<?= Helper\a(t('Logout'), 'user', 'logout', array(), true) ?>
- <span class="username">(<?= Helper\a(Helper\escape(Helper\get_username()), 'user', 'show', array('user_id' => Helper\get_user_id())) ?>)</span>
+ <span class="username hide-tablet">(<?= Helper\a(Helper\escape(Helper\get_username()), 'user', 'show', array('user_id' => Helper\get_user_id())) ?>)</span>
</li>
</ul>
</nav>
diff --git a/assets/css/app.css b/assets/css/app.css
index c79e5f48..e37b57f6 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -24,6 +24,7 @@ body {
-webkit-font-smoothing: antialiased;
font-smoothing: antialiased;
text-rendering: optimizeLegibility;
+ -webkit-text-size-adjust: 100%;
}
ul.no-bullet li {
@@ -183,7 +184,6 @@ label {
input[type="number"],
input[type="date"],
input[type="email"],
-input[type="tel"],
input[type="password"],
input[type="text"] {
color: #888;
@@ -202,7 +202,6 @@ input[type="text"] {
input[type="number"]:focus,
input[type="date"]:focus,
input[type="email"]:focus,
-input[type="tel"]:focus,
input[type="password"]:focus,
input[type="text"]:focus,
textarea:focus {
@@ -1284,14 +1283,14 @@ tr td.task-orange,
}
.sidebar-content {
- margin-left: 330px;
+ margin-left: 280px;
}
.sidebar {
position: absolute;
left: 0px;
top: 0;
- width: 250px;
+ max-width: 250px;
padding: 10px;
padding-top: 0;
border: 1px solid #ddd;
@@ -1315,6 +1314,10 @@ tr td.task-orange,
font-size: 0.85em;
}
+ .sidebar-content {
+ margin-left: 255px;
+ }
+
.form-tab {
max-width: 404px;
}
@@ -1327,6 +1330,41 @@ tr td.task-orange,
.form-inline-group input[type="submit"] {
margin-top: 20px;
}
+
+ td > input[type="text"] {
+ max-width: 150px;
+ }
+}
+
+@media only screen and (max-width: 1024px) and (orientation: landscape) {
+
+ body {
+ font-size: 0.7em;
+ }
+
+ header {
+ padding-bottom: 4px;
+ }
+
+ .sidebar {
+ max-width: 220px;
+ }
+
+ .sidebar-content {
+ margin-left: 225px;
+ }
+
+ div.chosen-container {
+ font-size: 0.9em;
+ }
+
+ input[type="number"],
+ input[type="date"],
+ input[type="email"],
+ input[type="password"],
+ input[type="text"] {
+ height: 18px;
+ }
}
/*!
* Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome
diff --git a/assets/css/base.css b/assets/css/base.css
index f4c438a2..a8c7d73e 100644
--- a/assets/css/base.css
+++ b/assets/css/base.css
@@ -23,6 +23,7 @@ body {
-webkit-font-smoothing: antialiased;
font-smoothing: antialiased;
text-rendering: optimizeLegibility;
+ -webkit-text-size-adjust: 100%;
}
ul.no-bullet li {
diff --git a/assets/css/form.css b/assets/css/form.css
index ec566684..b6cb891e 100644
--- a/assets/css/form.css
+++ b/assets/css/form.css
@@ -12,7 +12,6 @@ label {
input[type="number"],
input[type="date"],
input[type="email"],
-input[type="tel"],
input[type="password"],
input[type="text"] {
color: #888;
@@ -31,7 +30,6 @@ input[type="text"] {
input[type="number"]:focus,
input[type="date"]:focus,
input[type="email"]:focus,
-input[type="tel"]:focus,
input[type="password"]:focus,
input[type="text"]:focus,
textarea:focus {
diff --git a/assets/css/responsive.css b/assets/css/responsive.css
index 38a57593..ac767bbb 100644
--- a/assets/css/responsive.css
+++ b/assets/css/responsive.css
@@ -10,6 +10,10 @@
font-size: 0.85em;
}
+ .sidebar-content {
+ margin-left: 255px;
+ }
+
.form-tab {
max-width: 404px;
}
@@ -22,4 +26,39 @@
.form-inline-group input[type="submit"] {
margin-top: 20px;
}
+
+ td > input[type="text"] {
+ max-width: 150px;
+ }
+}
+
+@media only screen and (max-width: 1024px) and (orientation: landscape) {
+
+ body {
+ font-size: 0.7em;
+ }
+
+ header {
+ padding-bottom: 4px;
+ }
+
+ .sidebar {
+ max-width: 220px;
+ }
+
+ .sidebar-content {
+ margin-left: 225px;
+ }
+
+ div.chosen-container {
+ font-size: 0.9em;
+ }
+
+ input[type="number"],
+ input[type="date"],
+ input[type="email"],
+ input[type="password"],
+ input[type="text"] {
+ height: 18px;
+ }
}
diff --git a/assets/css/sidebar.css b/assets/css/sidebar.css
index b8a94838..7618ad22 100644
--- a/assets/css/sidebar.css
+++ b/assets/css/sidebar.css
@@ -5,14 +5,14 @@
}
.sidebar-content {
- margin-left: 330px;
+ margin-left: 280px;
}
.sidebar {
position: absolute;
left: 0px;
top: 0;
- width: 250px;
+ max-width: 250px;
padding: 10px;
padding-top: 0;
border: 1px solid #ddd;
generated by cgit v1.2.3 (git 2.46.0) at 2025-03-28 20:55:19 +0000