pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/devel' into devel

Browse source
This commit is contained in:
Gina Häußge 2015-02-01 17:27:53 +01:00
commit 2da952e7ff
2 changed files with 26 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/octoprint/static/css/octoprint.css
View file

File diff suppressed because one or more lines are too long

81
src/octoprint/static/less/octoprint.less
View file

@ -46,6 +46,25 @@ body {
}
}
.nowrap {
white-space: nowrap;
}
.actioncol {
text-align: center;
.nowrap;
a {
text-decoration: none;
color: #000;
&.disabled {
color: #ccc;
cursor: default;
}
}
}
.navbar-inner-color (@base) {
@top: lighten(@base, 25%);
@bottom: darken(@base, 15%);
@ -203,23 +222,13 @@ table {
// gcode files
&.gcode_files_name {
text-overflow: ellipsis;
white-space: nowrap;
text-align: left;
.nowrap;
}
&.gcode_files_action {
text-align: center;
width: 90px;
a {
text-decoration: none;
color: #000;
&.disabled {
color: #ccc;
cursor: default;
}
}
.actioncol;
}
// timelapse files
@ -234,18 +243,8 @@ table {
}
&.timelapse_files_action {
text-align: center;
width: 45px;
a {
text-decoration: none;
color: #000;
&.disabled {
color: #ccc;
cursor: default;
}
}
.actioncol;
}
// user settings
@ -260,18 +259,8 @@ table {
}
&.settings_users_actions {
text-align: center;
width: 60px;
a {
text-decoration: none;
color: #000;
&.disabled {
color: #ccc;
cursor: default;
}
}
.actioncol;
}
// log files
@ -291,18 +280,8 @@ table {
}
&.settings_logs_action {
text-align: center;
width: 70px;
a {
text-decoration: none;
color: #000;
&.disabled {
color: #ccc;
cursor: default;
}
}
.actioncol;
}
// Printer profiles
@ -317,18 +296,8 @@ table {
}
&.settings_printerProfiles_profiles_action {
text-align: center;
width: 80px;
a {
text-decoration: none;
color: #000;
&.disabled {
color: #ccc;
cursor: default;
}
}
.actioncol;
}
}