From 783f16ae545e57db247f58006c3c0053bcbee357 Mon Sep 17 00:00:00 2001 From: jeremyking1996 <73255406+jeremyking1996@users.noreply.github.com> Date: Sun, 15 Nov 2020 16:56:14 -0500 Subject: [PATCH 1/3] Content no format --- .DS_Store | Bin 0 -> 6148 bytes index.html | 36 ++++++++++++++++++++++++++++++++++ scientific.html | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ styles.css | 27 ++++++++++++++++++++++++++ 4 files changed, 113 insertions(+) create mode 100644 .DS_Store create mode 100644 index.html create mode 100644 scientific.html create mode 100644 styles.css diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..6c4228054270a1b3cd1d9876c6efa3599d8ea818 GIT binary patch literal 6148 zcmeHK%}T>S5Z-O8CKe=u2L%rS4_-X9C>C#_ww?sVh&}jI6B2A7CX%M@p%j7--~;H@ zpZ8E7!WZ%G%vYh1>i3{lcJ~mP&6tmoH3B&uIE=Q7_IF^;5eQ z_w3Y3JMF5IG>v6D@O;-v8iAL#4*jSe`dvTTOLm>qPmVG8FpfhAkhbF<1%9t-ENsV7 z>I9LWhD;&Zr7>bInokU?AU4Um8J&YnG z28aP-U;-FWTbov#fVI#Phyh~YcNxI_!30IL6lM~|)&UJ(A91{ZhypggB@j)8mcmRT zjDT>N3Mf;#dSY;y4t`U`Sqd|WGM#ZTGt^NtbM->uVs`MGBAjtcBDKT-F)+$NUUm&U z|LZ@$|3{OkM+^`H6U6{8)a+UnmZZ+svBlw8Yl5DGqF`Jm@iPSsaTG%=9>t5GLcnjL W0ca`AB!UNoE&_rEYKVb9W#9u`ZeR2O literal 0 HcmV?d00001 diff --git a/index.html b/index.html new file mode 100644 index 0000000..2d84ec7 --- /dev/null +++ b/index.html @@ -0,0 +1,36 @@ + + + + + + +
+Standard | +Scientific
+
+ + + +
+ + + +
+ + + +
+ + + +
+ + + + + + + +
+ + \ No newline at end of file diff --git a/scientific.html b/scientific.html new file mode 100644 index 0000000..83dc966 --- /dev/null +++ b/scientific.html @@ -0,0 +1,50 @@ + + + + + + +
+ Standard | + Scientific
+
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + + + + + +
+ \ No newline at end of file diff --git a/styles.css b/styles.css new file mode 100644 index 0000000..3cfc889 --- /dev/null +++ b/styles.css @@ -0,0 +1,27 @@ + + +.calculator { + border: solid; + border-radius: 5%; + border-color: lightgrey; + width: auto; +} + +.operation { + background-color: rgb(223, 225, 229); + border-radius: 5%; + border-color: rgb(223, 225, 229); +} + +.number { + background-color: rgb(243, 244, 245); + border-radius: 5%; + border-color: rgb(243, 244, 245); +} + +.equal { + background-color: rgb(66,133,244); + color: white; + border-radius: 5%; + border-color: rgb(66,133,244); +} \ No newline at end of file From 72872f7377a2b8b45be112b5e3bdec3707a3e875 Mon Sep 17 00:00:00 2001 From: jeremyking1996 <73255406+jeremyking1996@users.noreply.github.com> Date: Thu, 19 Nov 2020 11:23:38 -0500 Subject: [PATCH 2/3] Fixed button size --- index.html | 44 +++++++++++++++++++++++--------------------- scientific.html | 8 +++++--- styles.css | 19 ++++++++++++++++++- 3 files changed, 46 insertions(+), 25 deletions(-) diff --git a/index.html b/index.html index 2d84ec7..595d283 100644 --- a/index.html +++ b/index.html @@ -2,32 +2,34 @@ + +
Standard | -Scientific
+Scientific

- - - -
- - - -
- - - -
- - - -
- - - - + + + +
+ + + +
+ + + +
+ + + +
+ + + + diff --git a/scientific.html b/scientific.html index 83dc966..cd3bbec 100644 --- a/scientific.html +++ b/scientific.html @@ -2,10 +2,12 @@ + +
- Standard | + Standard | Scientific

@@ -22,7 +24,7 @@
- + @@ -31,7 +33,7 @@
- + diff --git a/styles.css b/styles.css index 3cfc889..a3d1a9c 100644 --- a/styles.css +++ b/styles.css @@ -1,22 +1,37 @@ - .calculator { border: solid; border-radius: 5%; border-color: lightgrey; width: auto; + padding: 1%; +} + +button:hover { + color: lightgrey; } +button:active { + color: forestgreen; +} + + .operation { background-color: rgb(223, 225, 229); border-radius: 5%; border-color: rgb(223, 225, 229); + margin: .1%; + width: 4rem; + text-align: center; } .number { background-color: rgb(243, 244, 245); border-radius: 5%; border-color: rgb(243, 244, 245); + margin: .1%; + width: 4rem; + text-align: center; } .equal { @@ -24,4 +39,6 @@ color: white; border-radius: 5%; border-color: rgb(66,133,244); + margin: .1%; + width: 4rem; } \ No newline at end of file From 4b4cd174e2cc652cd1bacb10a5711e1ebeaf6662 Mon Sep 17 00:00:00 2001 From: jeremyking1996 <73255406+jeremyking1996@users.noreply.github.com> Date: Sun, 22 Nov 2020 17:43:51 -0500 Subject: [PATCH 3/3] finished formatting --- index.html | 4 ++-- styles.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 595d283..9e6af30 100644 --- a/index.html +++ b/index.html @@ -6,10 +6,10 @@ -
+
Standard | Scientific
-
+
diff --git a/styles.css b/styles.css index a3d1a9c..3fa8d1a 100644 --- a/styles.css +++ b/styles.css @@ -3,7 +3,7 @@ border: solid; border-radius: 5%; border-color: lightgrey; - width: auto; + width: 540px; padding: 1%; }