Skip to content

Commit e1e029a

Browse files
juliandescottesjuliandescottes
committed
Merge pull request #221 from juliandescottes/enhancement-palette-sorting
Enhancement palette sorting
2 parents 32e5285 + fe5e896 commit e1e029a

File tree

91 files changed

+2714
-1070
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+2714
-1070
lines changed

‎Gruntfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ module.exports = function(grunt) {
3636
},
3737
'travis' : {
3838
suite : './test/casperjs/TravisTestSuite.js',
39-
delay : 5000
39+
delay : 10000
4040
}
4141
};
4242

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"karma": "0.12.17",
3434
"karma-chrome-launcher": "^0.1.4",
3535
"karma-phantomjs-launcher": "^0.1.4",
36-
"karma-jasmine": "^0.1.5",
36+
"karma-jasmine": "^0.2.0",
3737
"nodewebkit": "~0.10.1"
3838
},
3939
"window": {

‎src/css/bootstrap/bootstrap.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
}
3737
.tooltip {
3838
position: absolute;
39-
z-index: 1030;
39+
z-index: 30000;
4040
display: block;
4141
visibility: visible;
4242
padding: 5px;

‎src/css/color-picker-slider.css

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
.color-picker-slider * {
2+
box-sizing: border-box;
3+
}
4+
5+
.color-picker-slider input[type="range"] {
6+
-webkit-appearance: none;
7+
-webkit-tap-highlight-color: rgba(255, 255, 255, 0);
8+
width: 100%;
9+
border: none;
10+
padding: 1px 2px;
11+
border-radius: 3px;
12+
background-image: linear-gradient(to right, hsl(0, 30%, 70%) 0, hsl(359, 30%, 70%) 100%);
13+
box-shadow: inset 0 1px 0 0 #0d0e0f, inset 0 -1px 0 0 #3a3d42;
14+
outline: none; /* no focus outline */
15+
}
16+
17+
/* thumb */
18+
19+
.color-picker-slider input[type="range"]::-webkit-slider-thumb {
20+
-webkit-appearance: none;
21+
cursor:pointer;
22+
width: 7px;
23+
height: 18px;
24+
border: none;
25+
border-radius: 2px;
26+
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #529de1), color-stop(100%, #245e8f)); /* android <= 2.2 */
27+
background-image: -webkit-linear-gradient(top , #529de1 0, #245e8f 100%); /* older mobile safari and android > 2.2 */;
28+
background-image: linear-gradient(to bottom, #529de1 0, #245e8f 100%); /* W3C */
29+
}
30+
.color-picker-slider input[type="range"]::-moz-range-thumb {
31+
width: 7px;
32+
height: 18px;
33+
border: none;
34+
border-radius: 2px;
35+
background-image: linear-gradient(to bottom, #529de1 0, #245e8f 100%); /* W3C */
36+
}
37+
38+
.color-picker-slider input[type="range"]::-ms-thumb {
39+
width: 7px;
40+
height: 18px;
41+
border-radius: 2px;
42+
border: 0;
43+
background-image: linear-gradient(to bottom, #529de1 0, #245e8f 100%); /* W3C */
44+
}
45+
46+
/*CROSS BROWSER RESET*/
47+
48+
49+
.color-picker-slider input[type="range"]::-moz-range-track {
50+
border: inherit;
51+
background: transparent;
52+
}
53+
54+
.color-picker-slider input[type="range"]::-ms-track {
55+
border: inherit;
56+
color: transparent; /* don't drawn vertical reference line */
57+
background: transparent;
58+
}
59+
60+
.color-picker-slider input[type="range"]::-ms-fill-lower,
61+
.color-picker-slider input[type="range"]::-ms-fill-upper {
62+
background: transparent;
63+
}
64+
65+
.color-picker-slider input[type="range"]::-ms-tooltip {
66+
display: none;
67+
}
68+
69+
.color-picker-slider {
70+
padding: 0 10px;
71+
height : 25px;
72+
overflow: hidden;
73+
}
74+
75+
.color-picker-slider span{
76+
line-height : 25px;
77+
width : 10px;
78+
float:left;
79+
}
80+
81+
.color-picker-slider input[type="range"]{
82+
float:left;
83+
height : 10px;
84+
width : 100px;
85+
margin: 7px 1px 7px 8px;
86+
}
87+
88+
.color-picker-slider input[type="text"]{
89+
float:left;
90+
width : 47px;
91+
margin-left: 5px;
92+
}
93+
94+
.color-picker-slider input[type="range"][data-dimension="h"] {
95+
background-image:linear-gradient(to right, #ff0000 0%, #ffff00 17%, #00ff00 33%, #00ffff 50%, #0000ff 67%, #ff00ff 83%, #ff0000 100%);
96+
}

‎src/css/dialogs-create-palette.css

Lines changed: 169 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
1+
#dialog-container.create-palette {
2+
width: 500px;
3+
height: 600px;
4+
top : 50%;
5+
left : 50%;
6+
position : absolute;
7+
margin-left: -250px;
8+
}
9+
10+
.show #dialog-container.create-palette {
11+
margin-top: -300px;
12+
}
13+
14+
.create-palette-section {
15+
position: absolute;
16+
left: 10px;
17+
top: 50px;
18+
}
19+
20+
.create-palette-import-section {
21+
display : inline-block;
22+
}
23+
24+
.colors-container {
25+
position: absolute;
26+
27+
left: 10px;
28+
right: 10px;
29+
top: 85px;
30+
31+
height: 460px;
32+
33+
border: 1px solid black;
34+
background: #333;
35+
}
36+
37+
.color-picker-container {
38+
position:absolute;
39+
left : 280px;
40+
top:0;
41+
bottom:0;
42+
right:0;
43+
background: #222;
44+
}
45+
46+
.create-palette-actions {
47+
position: absolute;
48+
box-sizing: border-box;
49+
50+
width:100%;
51+
height: 45px;
52+
53+
left: 0;
54+
right: 0;
55+
bottom: 0;
56+
57+
padding:10px;
58+
text-align:right;
59+
}
60+
61+
.color-preview {
62+
width: 170px;
63+
height: 76px;
64+
margin: 11px;
65+
}
66+
67+
.colors-list {
68+
overflow: auto;
69+
width: 280px;
70+
box-sizing: border-box;
71+
height: 100%;
72+
padding-bottom: 10px;
73+
}
74+
75+
.create-palette-color, .create-palette-new-color, .colors-list-drop-proxy{
76+
position:relative;
77+
float : left;
78+
79+
width : 44px;
80+
height : 44px;
81+
margin : 10px 0 0 10px;
82+
83+
box-sizing : border-box;
84+
85+
cursor : pointer;
86+
}
87+
88+
@-moz-document url-prefix() {
89+
.create-palette-color, .create-palette-new-color, .colors-list-drop-proxy{
90+
margin : 7px 0 0 7px;
91+
}
92+
}
93+
94+
@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
95+
.create-palette-color, .create-palette-new-color, .colors-list-drop-proxy{
96+
margin : 7px 0 0 7px;
97+
}
98+
}
99+
100+
101+
.create-palette-color {
102+
border:1px solid #2c2c2c;
103+
transition : border-color 0.2s;
104+
}
105+
.create-palette-color:hover {
106+
border:1px solid gold;
107+
}
108+
109+
.colors-list-drop-proxy {
110+
border:2px dotted #eee;
111+
}
112+
113+
.create-palette-new-color {
114+
border:2px dotted gold;
115+
116+
border-radius: 2px;
117+
line-height: 40px;
118+
text-align: center;
119+
font-size: 20px;
120+
color: gold;
121+
}
122+
123+
.create-palette-color.selected {
124+
border:2px solid gold;
125+
}
126+
127+
.create-palette-remove-color {
128+
position: absolute;
129+
top: 0;
130+
right: 0;
131+
padding: 2px 4px 0 0;
132+
opacity : 0.2;
133+
134+
font-weight: bold;
135+
color: rgb(255,255,255);
136+
text-shadow : 0 0 1px rgb(0,0,0);
137+
138+
transition : opacity 0.3s, color 0.1s;
139+
}
140+
141+
.light-color .create-palette-remove-color {
142+
color: rgb(0,0,0);
143+
text-shadow : 0 0 1px rgb(255,255,255);
144+
}
145+
146+
.selected .create-palette-remove-color {
147+
top: -1px;
148+
right: -1px;
149+
}
150+
151+
.create-palette-color:hover .create-palette-remove-color {
152+
opacity: 0.6;
153+
}
154+
155+
.create-palette-color .create-palette-remove-color:hover {
156+
opacity: 1;
157+
color: rgb(240,80,80);
158+
text-shadow : 0 0 1px rgb(0,0,0);
159+
}
160+
161+
/*SPECTRUM OVERRIDES*/
162+
163+
.create-palette .sp-container{
164+
background-color: transparent;
165+
border: none;
166+
box-shadow : none;
167+
border-radius:0;
168+
padding:5px;
169+
}

0 commit comments

Comments
 (0)