From 88ef95628253fe5cf83675806d3e60313cb12b48 Mon Sep 17 00:00:00 2001 From: John Redden Date: Sun, 8 Nov 2020 22:23:55 -0500 Subject: [PATCH 1/4] Created basic outline for calculators --- calculator.css | 46 ++++++++++++++++++++++++++ calculator_scientific.html | 66 ++++++++++++++++++++++++++++++++++++++ calculator_standard.html | 52 ++++++++++++++++++++++++++++++ 3 files changed, 164 insertions(+) create mode 100644 calculator.css create mode 100644 calculator_scientific.html create mode 100644 calculator_standard.html diff --git a/calculator.css b/calculator.css new file mode 100644 index 0000000..27d680c --- /dev/null +++ b/calculator.css @@ -0,0 +1,46 @@ + +.card { + background-color: white; + font-weight: 500; + width: fit-content; +} + +input { + width: 45%; + border-color: lightgrey; + border-width: 1px; + height: 40px; + font-weight: bold; + font-size: xx-large; +} + +#inputSci { + width: 79%; + max-width: 630px; + min-width: 415px; +} + +#inputSta { + max-width: 355px; + min-width: 230px; +} + +button { + width: 10%; + height: 40px; + border-color: lightgrey; + max-width: 80px; + font-weight: 475; +} + +#raddeg { + width: 21.5%; + height: 40px; + max-width: 170px; + min-width: 110px; +} + +.equalButton { + color: white; + font-weight: 900; +} diff --git a/calculator_scientific.html b/calculator_scientific.html new file mode 100644 index 0000000..d4cc2a5 --- /dev/null +++ b/calculator_scientific.html @@ -0,0 +1,66 @@ + + + + + + + + + +
+ Standard | Scientific + +
+
+
+ +
+
+
+ + + + + + +
+
+ + + + + + + +
+
+ + + + + + + +
+
+ + + + + + + +
+
+ + + + + + + +
+
+
+ + \ No newline at end of file diff --git a/calculator_standard.html b/calculator_standard.html new file mode 100644 index 0000000..4ec0c49 --- /dev/null +++ b/calculator_standard.html @@ -0,0 +1,52 @@ + + + + + + + + + +
+ Standard | Scientific + +
+
+
+ +
+
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+
+ + \ No newline at end of file From 07a134f5874568db77b94b4be69072ccabf11b03 Mon Sep 17 00:00:00 2001 From: John Redden Date: Sun, 8 Nov 2020 22:27:08 -0500 Subject: [PATCH 2/4] fixed typo --- calculator_standard.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calculator_standard.html b/calculator_standard.html index 4ec0c49..90b534a 100644 --- a/calculator_standard.html +++ b/calculator_standard.html @@ -8,7 +8,7 @@
- Standard | Scientific + Standard | Scientific
From b7fe1544c2b9784e284e3a04ce21b5c0da52832f Mon Sep 17 00:00:00 2001 From: John Redden Date: Sat, 14 Nov 2020 12:34:55 -0500 Subject: [PATCH 3/4] changed names --- calculator.css | 8 ++++---- calculator_scientific.html | 6 +++--- calculator_standard.html | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/calculator.css b/calculator.css index 27d680c..2c938b6 100644 --- a/calculator.css +++ b/calculator.css @@ -14,13 +14,13 @@ input { font-size: xx-large; } -#inputSci { +#input-sci { width: 79%; max-width: 630px; min-width: 415px; } -#inputSta { +#input-sta { max-width: 355px; min-width: 230px; } @@ -33,14 +33,14 @@ button { font-weight: 475; } -#raddeg { +#rad-deg { width: 21.5%; height: 40px; max-width: 170px; min-width: 110px; } -.equalButton { +.equal-button { color: white; font-weight: 900; } diff --git a/calculator_scientific.html b/calculator_scientific.html index d4cc2a5..f9f7854 100644 --- a/calculator_scientific.html +++ b/calculator_scientific.html @@ -13,11 +13,11 @@
- +
- + @@ -57,7 +57,7 @@ - +
diff --git a/calculator_standard.html b/calculator_standard.html index 90b534a..0a49086 100644 --- a/calculator_standard.html +++ b/calculator_standard.html @@ -13,7 +13,7 @@
- +
@@ -43,7 +43,7 @@
- +
From 22e1ecc740afefef389bd40106ee368ec942fca2 Mon Sep 17 00:00:00 2001 From: John Redden Date: Sat, 14 Nov 2020 18:42:11 -0500 Subject: [PATCH 4/4] organized all buttons into rows, fixed accordingly --- calculator.css | 26 +++++++----- calculator_scientific.html | 84 +++++++++++++++++++++----------------- calculator_standard.html | 68 ++++++++++++++++-------------- 3 files changed, 99 insertions(+), 79 deletions(-) diff --git a/calculator.css b/calculator.css index 2c938b6..c52610a 100644 --- a/calculator.css +++ b/calculator.css @@ -5,8 +5,11 @@ width: fit-content; } +.row { + width: 100%; +} + input { - width: 45%; border-color: lightgrey; border-width: 1px; height: 40px; @@ -15,29 +18,30 @@ input { } #input-sci { - width: 79%; - max-width: 630px; - min-width: 415px; + width: 90%; } #input-sta { - max-width: 355px; - min-width: 230px; + width: 83%; } button { - width: 10%; height: 40px; border-color: lightgrey; - max-width: 80px; font-weight: 475; } +.button-sci { + width: 11%; +} + +.button-sta { + width: 20%; +} + #rad-deg { - width: 21.5%; + width: 25%; height: 40px; - max-width: 170px; - min-width: 110px; } .equal-button { diff --git a/calculator_scientific.html b/calculator_scientific.html index f9f7854..0dd8f5c 100644 --- a/calculator_scientific.html +++ b/calculator_scientific.html @@ -11,54 +11,62 @@ Standard | Scientific
-
-
- -
-
+
+ +
+
+
- - - - - + + + + +
+
+
- - - - - - - + + + + + + +
+
+
- - - - - - - + + + + + + +
+
+
- - - - - - - + + + + + + +
+
+
- - - - - - - + + + + + + +
diff --git a/calculator_standard.html b/calculator_standard.html index 0a49086..577b684 100644 --- a/calculator_standard.html +++ b/calculator_standard.html @@ -11,40 +11,48 @@ Standard | Scientific
-
-
- -
-
-
- - - - +
+ +
+
+
+
+ + + +
-
- - - - +
+
+
+ + + +
-
- - - - +
+
+
+ + + +
-
- - - - +
+
+
+ + + +
-
- - - - +
+
+
+ + + +