diff --git a/express-server/public/javascripts/ajax.js b/express-server/public/javascripts/ajax.js index 7e9cfebb..3abdd961 100644 --- a/express-server/public/javascripts/ajax.js +++ b/express-server/public/javascripts/ajax.js @@ -75,7 +75,7 @@ $(document).ready(function() { data: { sl_id: globaleAddZwischenID, name: $("#groupname").val(), - color: $("#groupfarbe").val() + color: $( "input:checked" ).val() }, success(res){ console.log("groupadd funktioniert"); @@ -269,7 +269,7 @@ function Detail(){ `); for (let i = 0; i < res.groups.length; i++) { const el = res.groups[i]; - $(".gruppeninhalt").append(`
+ $(".gruppeninhalt").append(`
${el.name}
diff --git a/express-server/public/stylesheets/colorpicker-style.css b/express-server/public/stylesheets/colorpicker-style.css new file mode 100644 index 00000000..050ab98e --- /dev/null +++ b/express-server/public/stylesheets/colorpicker-style.css @@ -0,0 +1,95 @@ +/* @import url(https://fonts.googleapis.com/css?family=Lato:400,300); +* { + box-sizing: border-box; +} +body { + position: absolute; + top: 35%; + left: 35%; + transform: translate(-35%, -35%); + font-family: 'lato'; + color: #333; +} */ +input[type="radio"] { + display: none; + border: 1px solid black; + } + input[type="radio"]:checked + label span { + transform: scale(1.25); + } + input[type="radio"]:checked + label .farbe1 { + border: 1px solid black; + } + input[type="radio"]:checked + label .farbe2 { + border: 1px solid black; + } + input[type="radio"]:checked + label .farbe3 { + border: 1px solid black; + } + input[type="radio"]:checked + label .farbe4 { + border: 1px solid black; + } + input[type="radio"]:checked + label .farbe5 { + border: 1px solid black; + } + input[type="radio"]:checked + label .farbe6 { + border: 1px solid black; + } + input[type="radio"]:checked + label .farbe7 { + border: 1px solid black; + } + input[type="radio"]:checked + label .violet { + border: 1px solid black; + } + input[type="radio"]:checked + label .purple { + border: 1px solid black; + } + input[type="radio"]:checked + label .pink { + border: 1px solid black; + } + label { + display: inline-block; + width: 25px; + height: 25px; + margin-right: 10px; + cursor: pointer; + } + label:hover span { + transform: scale(1.25); + } + label span { + display: block; + width: 100%; + height: 100%; + transition: transform 0.2s ease-in-out; + } + label span.farbe1 { + background: #F44336; + } + label span.farbe2 { + background: #e91e63; + } + label span.farbe3 { + background: #9c27b0; + } + label span.farbe4 { + background: #673ab7; + } + label span.farbe5 { + background: #3F51B5; + } + label span.farbe6 { + background: #2196F3; + } + label span.blue { + background: #03A9F4; + } + label span.violet { + background: #00BCD4; + } + label span.purple { + background: #009688; + } + label span.pink { + background: #4CAF50; + } \ No newline at end of file diff --git a/express-server/public/stylesheets/style.css b/express-server/public/stylesheets/style.css index 863bbcb0..169545a7 100644 --- a/express-server/public/stylesheets/style.css +++ b/express-server/public/stylesheets/style.css @@ -56,4 +56,8 @@ right:5px; margin-top:-40px; border: 0px; +} + +.farbeeen{ + margin-left: 19px; } \ No newline at end of file diff --git a/express-server/views/dash.ejs b/express-server/views/dash.ejs index bd02fb31..91cc5c1a 100644 --- a/express-server/views/dash.ejs +++ b/express-server/views/dash.ejs @@ -4,6 +4,7 @@ + @@ -64,7 +65,47 @@
- +
+ + + + + + + + + + + + + + + + + + + + + +