Gitlab CSE Unil

Commit c2fb289e authored by Julien Furrer's avatar Julien Furrer
Browse files

Fixed FontSize spin edit

@TODO: fork on github and add my mod ifs
then set bower deps accordingly
parent c206c6aa
......@@ -66,7 +66,8 @@ module.exports = function(grunt) {
// ===== Copy Files =====
copy: {
libs: {
// Copy media files to the static directory
// Copy media files to the static directory.
// Concern mainly fonts and images used in css
files: [
{
expand: true,
......@@ -139,7 +140,7 @@ module.exports = function(grunt) {
}
},
libs: {
// Compress and rewrite 'src' attributes of third party css
// Compress and rewrite 'src' attributes of third party css (found in lib)
// The concat:libs task should be called after this to include the bootstrap's css
options: {
relativeUrls: false,
......
......@@ -501,7 +501,7 @@ function($, Signal, paper, config, view, io, tools, attributes, exporter, AnObjM
input
.spinedit({
value: attributes.getFontSize(),
minimum: 3,
minimum: 9,
maximum: 72,
step: 1,
numberOfDecimals: 0
......
......@@ -23,7 +23,7 @@
"paper": "~0.9.20",
"jquery.autoGrowInput": "~0.0.2",
"signals": "~1.0.0",
"bootstrap-spinedit": "*",
"bootstrap-spinedit": "https://github.com/ahamid/bootstrap-spinedit.git#*",
"seiyria-bootstrap-slider": "git://github.com/seiyria/bootstrap-slider#~4.0.1",
"backbone": "~1.1.2",
"jquery-file-upload": "~9.7.1",
......
......@@ -1109,28 +1109,6 @@ canvas {
top: -100%;
left: auto;
}
span.spinedit {
font-size: 12px;
padding: 0;
}
span.spinedit .spin-up,
span.spinedit .spin-down {
cursor: pointer;
position: relative;
display: inline-block;
}
span.spinedit .spin-up:hover,
span.spinedit .spin-down:hover {
color: #222;
}
span.spinedit .spin-up {
top: -7px;
left: 7px;
}
span.spinedit .spin-down {
top: 8px;
left: -6px;
}
#param-tool-tb .btn {
color: #444;
padding-top: 4px;
......
......@@ -887,26 +887,6 @@ canvas {
}
span.spinedit {
font-size: 12px;
padding: 0;
.spin-up, .spin-down {
cursor: pointer;
position: relative;
display: inline-block;
}
.spin-up:hover, .spin-down:hover {
color: #222;
}
.spin-up {
top: -7px; left: 7px;
}
.spin-down {
top: 8px; left: -6px;
}
}
#param-tool-tb .btn {
color: #444;
......
......@@ -252,31 +252,36 @@
display: inline-block;
}
div.spinedit {
display: inline-block;
span.spinedit .glyphicon-chevron-down {
position: relative;
cursor: pointer;
}
input[type="text"].spinedit {
width: 35px;
}
div.spinedit .glyphicon.glyphicon-plus,
div.spinedit .glyphicon.glyphicon-minus {
span.spinedit .glyphicon-chevron-up {
position: relative;
cursor: pointer;
width: 12px;
left: 8px;
}
div.spinedit .glyphicon.glyphicon-plus {
top: -12px;
span.spinedit .glyphicon-chevron-up {
top: -8px;
left: -3px;
}
div.spinedit .glyphicon.glyphicon-minus {
top: 3px;
left: -4px;
span.spinedit .glyphicon-chevron-down {
top: 8px;
margin-right: -10px;
}
.form-search div.spinedit,
.form-inline div.spinedit,
.form-horizontal div.spinedit {
top: 5px;
input.spinedit {
padding: 6px;
}
span.spinedit {
padding: 6px 0 6px 3px;
font-size: 14px;
font-weight: normal;
line-height: 1;
text-align: center;
display: table-cell;
width: 1%;
white-space: nowrap;
vertical-align: middle;
box-sizing: border-box;
}
@font-face {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment