diff --git a/calc.css b/calc.css index 08ef7e1..05f4962 100644 --- a/calc.css +++ b/calc.css @@ -4,9 +4,9 @@ background-color: rgba(0, 0, 0, 0.5); color:aliceblue; height: 100px; - font-family: 'Ubuntu', sans-serif; + font-family: sans-serif; font-size: 35px; - width: 400px; + width: 500px; border-top: rgba(0, 0, 0, 0); border-left: rgba(0, 0, 0, 0); border-right: rgba(0, 0, 0, 0); @@ -24,7 +24,7 @@ height: 100px; background-color: rgba(0, 0, 0, 0.5); color:aliceblue; - font-family: 'Ubuntu', sans-serif; + font-family: sans-serif; font-size: 50px; border: rgba(0, 0, 0, 0); margin-left: -2; @@ -35,7 +35,7 @@ height: 100px; background-color: rgba(0, 0, 0, 0.5); color:aliceblue; - font-family: 'Ubuntu', sans-serif; + font-family: sans-serif; font-size: 50px; border: rgba(0, 0, 0, 0); margin-left: -3; @@ -45,7 +45,7 @@ height: 100px; background-color: rgba(0, 0, 0, 0.5); color:aliceblue; - font-family: 'Ubuntu', sans-serif; + font-family: sans-serif; font-size: 50px; border: rgba(0, 0, 0, 0); margin-left: -4; @@ -82,4 +82,10 @@ } button { outline: none; +} +#zero { + width: 200px; +} +#equals { + width: 200px; } \ No newline at end of file diff --git a/calculator.php b/calculator.php index dbbd63e..cc2f038 100644 --- a/calculator.php +++ b/calculator.php @@ -24,24 +24,32 @@
+
+ + + + +
- + +
- - + + +
+
- - + @@ -86,7 +94,7 @@ var t1 = document.getElementById("eingabe").value document.getElementById("eingabe").value = t1 + "9"; } - function zero() { + function zerobb() { var t1 = document.getElementById("eingabe").value document.getElementById("eingabe").value = t1 + "0"; } @@ -100,7 +108,13 @@ function equalsb() { var t1 = document.getElementById("eingabe").value var t2 = t1.replace("𝜋", "Math.PI"); - document.getElementById("eingabe").value = eval(t2); + var t3 = t2.replace("²", "^2"); + if(t1 != "") { + document.getElementById("eingabe").value = eval(t3); + } else { + document.getElementById("eingabe").value = ""; + } + } function plusb() { var t1 = document.getElementById("eingabe").value @@ -110,6 +124,34 @@ var t1 = document.getElementById("eingabe").value document.getElementById("eingabe").value = t1 + "𝜋"; } + function klammeraufb() { + var t1 = document.getElementById("eingabe").value + document.getElementById("eingabe").value = t1 + "("; + } + function klammerzub() { + var t1 = document.getElementById("eingabe").value + document.getElementById("eingabe").value = t1 + ")"; + } + function malb() { + var t1 = document.getElementById("eingabe").value + document.getElementById("eingabe").value = t1 + "*"; + } + function geteiltb() { + var t1 = document.getElementById("eingabe").value + document.getElementById("eingabe").value = t1 + "/"; + } + function quadratbb() { + var t1 = document.getElementById("eingabe").value + document.getElementById("eingabe").value = t1 + "²"; + } + function minusb() { + var t1 = document.getElementById("eingabe").value + document.getElementById("eingabe").value = t1 + "-"; + } + function wurzelbb() { + var t1 = document.getElementById("eingabe").value + document.getElementById("eingabe").value = t1 + "√"; + }