From a4d8939498599354869afa4a3d993678c2d4d614 Mon Sep 17 00:00:00 2001 From: mcwarman Date: Wed, 20 Sep 2017 10:42:46 +0100 Subject: [PATCH 1/2] navigation style --- LICENSE | 22 ++++++++++++++++++++++ css/main.css | 24 +++++++++++++++++++----- index.html | 2 +- 3 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..bfb219c --- /dev/null +++ b/LICENSE @@ -0,0 +1,22 @@ +The MIT License (MIT) + +Original work Copyright (c) 2016 DashingCode +Modified work Copyright (c) 2017 Matthew Warman + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/css/main.css b/css/main.css index a398dba..db37ffa 100644 --- a/css/main.css +++ b/css/main.css @@ -11,11 +11,25 @@ h1 { padding: 0; } #navigation ul li { - display: inline; - padding-left: 5px; - padding-right: 5px; + list-style: none; + display: inline-block; + border-radius: 100%; + border: 2px solid #000; + height:50px; + width: 50px; + margin: 8px; +} +#navigation ul li:hover { + color: #000; + text-decoration: none; + -webkit-transition: 500ms; + -moz-transition: 500ms; + transition: 500ms; + background-color: rgba(0, 0, 0, 0.25); } - #navigation ul li a { color: #000; -} \ No newline at end of file +} +#navigation ul li a i { + padding: 9px; +} diff --git a/index.html b/index.html index 7a9b601..cef0329 100644 --- a/index.html +++ b/index.html @@ -29,7 +29,7 @@

Matthew Warman

From f4ef83ed902e3a2ce9c5fbbcf97ad1e2763b824d Mon Sep 17 00:00:00 2001 From: mcwarman Date: Wed, 20 Sep 2017 10:51:44 +0100 Subject: [PATCH 2/2] whitespace --- .gitattributes | 1 + css/main.css | 70 +++++++++++++++++++++++++------------------------- 2 files changed, 36 insertions(+), 35 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..176a458 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto diff --git a/css/main.css b/css/main.css index db37ffa..86ca183 100644 --- a/css/main.css +++ b/css/main.css @@ -1,35 +1,35 @@ -h1 { - font-family: "Open Sans", sans-serif; - font-size: 48px; - font-weight: normal; - margin: 10px; - text-align: center; -} -#navigation ul{ - text-align: center; - list-style: none; - padding: 0; -} -#navigation ul li { - list-style: none; - display: inline-block; - border-radius: 100%; - border: 2px solid #000; - height:50px; - width: 50px; - margin: 8px; -} -#navigation ul li:hover { - color: #000; - text-decoration: none; - -webkit-transition: 500ms; - -moz-transition: 500ms; - transition: 500ms; - background-color: rgba(0, 0, 0, 0.25); -} -#navigation ul li a { - color: #000; -} -#navigation ul li a i { - padding: 9px; -} +h1 { + font-family: "Open Sans", sans-serif; + font-size: 48px; + font-weight: normal; + margin: 10px; + text-align: center; +} +#navigation ul{ + text-align: center; + list-style: none; + padding: 0; +} +#navigation ul li { + list-style: none; + display: inline-block; + border-radius: 100%; + border: 2px solid #000; + height:50px; + width: 50px; + margin: 8px; +} +#navigation ul li:hover { + color: #000; + text-decoration: none; + -webkit-transition: 500ms; + -moz-transition: 500ms; + transition: 500ms; + background-color: rgba(0, 0, 0, 0.25); +} +#navigation ul li a { + color: #000; +} +#navigation ul li a i { + padding: 9px; +}