diff --git a/.gitignore b/.gitignore index 02a7aca..de4f23d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .DS* +work/* \ No newline at end of file diff --git a/assets/css/fira.css b/assets/css/fira.css new file mode 100755 index 0000000..57e30c8 --- /dev/null +++ b/assets/css/fira.css @@ -0,0 +1,39 @@ +@font-face{ + font-family: 'Fira Sans'; + src: local('Fira Sans Light'), + url('../fonts/fira/woff/FiraSans-Light.woff') format('woff'); + font-weight: 300; + font-style: normal; +} + +@font-face{ + font-family: 'Fira Sans'; + src: local('Fira Sans Regular'), + url('../fonts/fira/woff/FiraSans-Regular.woff') format('woff'); + font-weight: 400; + font-style: normal; +} + +@font-face{ + font-family: 'Fira Sans'; + src: local('Fira Sans Regular Italic'), + url('../fonts/fira/woff/FiraSans-Italic.woff') format('woff'); + font-weight: 400; + font-style: italic; +} + +@font-face{ + font-family: 'Fira Sans'; + src: local('Fira Sans Bold'), + url('../fonts/fira/woff/FiraSans-Bold.woff') format('woff'); + font-weight: 700; + font-style: normal; +} + +@font-face{ + font-family: 'Fira Sans'; + src: local('Fira Sans Bold Italic'), + url('../fonts/fira/woff/FiraSans-BoldItalic.woff') format('woff'); + font-weight: 700; + font-style: italic; +} diff --git a/assets/css/main.css b/assets/css/main.css index f4ea2fe..f260f7a 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -14,7 +14,6 @@ border: 0; font-size: 100%; font: inherit; - font-weight: 600; vertical-align: baseline; } @@ -1585,7 +1584,7 @@ body, input, select, textarea { color: #111; - font-family: "Raleway", Arial, Helvetica, sans-serif; + font-family: "Fira Sans", Arial, Helvetica, sans-serif; font-size: 13pt; font-weight: 300; line-height: 1.65; @@ -2229,14 +2228,6 @@ position: relative; } - .icon:before { - -moz-osx-font-smoothing: grayscale; - -webkit-font-smoothing: antialiased; - font-family: FontAwesome; - font-style: normal; - font-weight: normal; - text-transform: none !important; - } .icon > .label { display: none; @@ -2733,7 +2724,6 @@ #header { color: rgba(255,255,255,0.8); - background-color: rgba(0,0,0,0.2); cursor: default; height: 3.25em; left: 0; @@ -2965,7 +2955,7 @@ #banner { padding: 12em 0 10em 0; - background-image: url('../../images/banner-blu.orig.jpg'); + background-image: linear-gradient(0deg, rgba(0, 0, 0, 0) 0%, rgb(0, 0, 0) 100%), url('../../images/banner-blu.orig.jpg'); background-size: cover; background-position: center; /*background-attachment: fixed;*/ @@ -2976,7 +2966,7 @@ #banner h1 { font-size: 3.5em; - font-weight: 100; + font-weight: 400; color: #ffffff; line-height: 1em; margin: 0 0 0.5em 0; diff --git a/assets/css/raleway.css b/assets/css/raleway.css deleted file mode 100644 index 9039eaa..0000000 --- a/assets/css/raleway.css +++ /dev/null @@ -1,18 +0,0 @@ -@font-face { - font-family: 'Raleway'; - font-style: normal; - font-weight: 100; - src: local('Raleway Thin'), local('Raleway-Thin'), url(../fonts/Raleway-Thin.ttf) format('truetype'); -} -@font-face { - font-family: 'Raleway'; - font-style: normal; - font-weight: 300; - src: local('Raleway Light'), local('Raleway-Light'), url(../fonts/Raleway-Light.ttf) format('truetype'); -} -@font-face { - font-family: 'Raleway'; - font-style: normal; - font-weight: 600; - src: local('Raleway SemiBold'), local('Raleway-SemiBold'), url(../fonts/Raleway-SemiBold.ttf) format('truetype'); -} diff --git a/assets/fonts/Raleway-Light.ttf b/assets/fonts/Raleway-Light.ttf deleted file mode 100644 index e6c9a8d..0000000 Binary files a/assets/fonts/Raleway-Light.ttf and /dev/null differ diff --git a/assets/fonts/Raleway-SemiBold.ttf b/assets/fonts/Raleway-SemiBold.ttf deleted file mode 100644 index a2f980b..0000000 Binary files a/assets/fonts/Raleway-SemiBold.ttf and /dev/null differ diff --git a/assets/fonts/Raleway-Thin.ttf b/assets/fonts/Raleway-Thin.ttf deleted file mode 100644 index 52cc096..0000000 Binary files a/assets/fonts/Raleway-Thin.ttf and /dev/null differ diff --git a/assets/fonts/fira/woff/FiraSans-Bold.woff b/assets/fonts/fira/woff/FiraSans-Bold.woff new file mode 100755 index 0000000..a8dba64 Binary files /dev/null and b/assets/fonts/fira/woff/FiraSans-Bold.woff differ diff --git a/assets/fonts/fira/woff/FiraSans-BoldItalic.woff b/assets/fonts/fira/woff/FiraSans-BoldItalic.woff new file mode 100755 index 0000000..54895de Binary files /dev/null and b/assets/fonts/fira/woff/FiraSans-BoldItalic.woff differ diff --git a/assets/fonts/fira/woff/FiraSans-Italic.woff b/assets/fonts/fira/woff/FiraSans-Italic.woff new file mode 100755 index 0000000..2980194 Binary files /dev/null and b/assets/fonts/fira/woff/FiraSans-Italic.woff differ diff --git a/assets/fonts/fira/woff/FiraSans-Light.woff b/assets/fonts/fira/woff/FiraSans-Light.woff new file mode 100755 index 0000000..747071e Binary files /dev/null and b/assets/fonts/fira/woff/FiraSans-Light.woff differ diff --git a/assets/fonts/fira/woff/FiraSans-Regular.woff b/assets/fonts/fira/woff/FiraSans-Regular.woff new file mode 100755 index 0000000..d8e0363 Binary files /dev/null and b/assets/fonts/fira/woff/FiraSans-Regular.woff differ diff --git a/footer.php b/footer.php index 2090684..18b5195 100644 --- a/footer.php +++ b/footer.php @@ -10,8 +10,9 @@ TEMPLATED' ); ?>
diff --git a/screenshot.png b/screenshot.png index 180c983..aecf450 100644 Binary files a/screenshot.png and b/screenshot.png differ diff --git a/style.css b/style.css index 08d723a..0c24d5a 100644 --- a/style.css +++ b/style.css @@ -12,5 +12,5 @@ Text Domain: friendica */ @import url(./assets/css/fork-awesome.min.css); -@import url(./assets/css/raleway.css); +@import url(./assets/css/fira.css); @import url(./assets/css/main.css);