From b5727739b54740d370fe7f22088b698eb1808406 Mon Sep 17 00:00:00 2001 From: raj Date: Sat, 31 Mar 2018 14:19:47 +0100 Subject: [PATCH 01/10] Setup initial html and css for the project --- .gitignore | 5 + css/_abstract.scss | 10 + css/_normalize.scss | 435 ++++++++++++++++++++++++++++++++++++++++++++ css/style.css | 409 ++++++++++++++++++++++++++++++++++++++++- css/style.scss | 11 ++ index.html | 7 +- 6 files changed, 868 insertions(+), 9 deletions(-) create mode 100644 .gitignore create mode 100644 css/_abstract.scss create mode 100755 css/_normalize.scss mode change 100755 => 100644 css/style.css create mode 100644 css/style.scss diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..c53132268 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +css/_abstract.css +css/_abstract.min.css +css/_normalize.css +css/_normalize.min.css +css/style.min.css diff --git a/css/_abstract.scss b/css/_abstract.scss new file mode 100644 index 000000000..788441017 --- /dev/null +++ b/css/_abstract.scss @@ -0,0 +1,10 @@ +// Colors +$primary-col:#ff4500; +$main-left-col:#800080; +$blk-col:#000000; +//mixins +@mixin flx-center{ + display: flex; + justify-content: center; + align-items: center; +} \ No newline at end of file diff --git a/css/_normalize.scss b/css/_normalize.scss new file mode 100755 index 000000000..7af36cab6 --- /dev/null +++ b/css/_normalize.scss @@ -0,0 +1,435 @@ +/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ + +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS text size adjust after orientation change, without disabling + * user zoom. + */ +// Base setting +*, *::after, *::before{ + box-sizing: inherit; + padding:0;margin:0; + } +html { + font-family: sans-serif; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ + font-size: 62.5%; +} + +/** + * Remove default margin. + */ +/* Use the 'Roboto' font from Google. Already added to your HTML header */ +body { + font-family: 'Roboto', sans-serif; + -webkit-font-smoothing: antialiased; + margin: 0; + box-sizing: border-box; +} + +/* HTML5 display definitions + ========================================================================== */ + +/** + * Correct `block` display not defined for any HTML5 element in IE 8/9. + * Correct `block` display not defined for `details` or `summary` in IE 10/11 + * and Firefox. + * Correct `block` display not defined for `main` in IE 11. + */ + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +menu, +nav, +section, +summary { + display: block; +} + +/** + * 1. Correct `inline-block` display not defined in IE 8/9. + * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. + */ + +audio, +canvas, +progress, +video { + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ +} + +/** + * Prevent modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Address `[hidden]` styling not present in IE 8/9/10. + * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. + */ + +[hidden], +template { + display: none; +} + +/* Links + ========================================================================== */ + +/** + * Remove the gray background color from active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * Improve readability when focused and also mouse hovered in all browsers. + */ + +a:active, +a:hover { + outline: 0; +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Address styling not present in IE 8/9/10/11, Safari, and Chrome. + */ + +abbr[title] { + border-bottom: 1px dotted; +} + +/** + * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. + */ + +b, +strong { + font-weight: bold; +} + +/** + * Address styling not present in Safari and Chrome. + */ + +dfn { + font-style: italic; +} + +/** + * Address variable `h1` font-size and margin within `section` and `article` + * contexts in Firefox 4+, Safari, and Chrome. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/** + * Address styling not present in IE 8/9. + */ + +mark { + background: #ff0; + color: #000; +} + +/** + * Address inconsistent and variable font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove border when inside `a` element in IE 8/9/10. + */ + +img { + border: 0; +} + +/** + * Correct overflow not hidden in IE 9/10/11. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* Grouping content + ========================================================================== */ + +/** + * Address margin not present in IE 8/9 and Safari. + */ + +figure { + margin: 1em 40px; +} + +/** + * Address differences between Firefox and other browsers. + */ + +hr { + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} + +/** + * Contain overflow in all browsers. + */ + +pre { + overflow: auto; +} + +/** + * Address odd `em`-unit font size rendering in all browsers. + */ + +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; +} + +/* Forms + ========================================================================== */ + +/** + * Known limitation: by default, Chrome and Safari on OS X allow very limited + * styling of `select`, unless a `border` property is set. + */ + +/** + * 1. Correct color not being inherited. + * Known issue: affects color of disabled elements. + * 2. Correct font properties not being inherited. + * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. + */ + +button, +input, +optgroup, +select, +textarea { + color: inherit; /* 1 */ + font: inherit; /* 2 */ + margin: 0; /* 3 */ +} + +/** + * Address `overflow` set to `hidden` in IE 8/9/10/11. + */ + +button { + overflow: visible; +} + +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. + * Correct `select` style inheritance in Firefox. + */ + +button, +select { + text-transform: none; +} + +/** + * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` + * and `video` controls. + * 2. Correct inability to style clickable `input` types in iOS. + * 3. Improve usability and consistency of cursor style between image-type + * `input` and others. + */ + +button, +html input[type="button"], /* 1 */ +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; /* 2 */ + cursor: pointer; /* 3 */ +} + +/** + * Re-set default cursor for disabled elements. + */ + +button[disabled], +html input[disabled] { + cursor: default; +} + +/** + * Remove inner padding and border in Firefox 4+. + */ + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +/** + * Address Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ + +input { + line-height: normal; +} + +/** + * It's recommended that you don't attempt to style these elements. + * Firefox's implementation doesn't respect box-sizing, padding, or width. + * + * 1. Address box sizing set to `content-box` in IE 8/9/10. + * 2. Remove excess padding in IE 8/9/10. + */ + +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Fix the cursor style for Chrome's increment/decrement buttons. For certain + * `font-size` values of the `input`, it causes the cursor style of the + * decrement button to change from `default` to `text`. + */ + +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Address `appearance` set to `searchfield` in Safari and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari and Chrome + * (include `-moz` to future-proof). + */ + +input[type="search"] { + -webkit-appearance: textfield; /* 1 */ + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; /* 2 */ + box-sizing: content-box; +} + +/** + * Remove inner padding and search cancel button in Safari and Chrome on OS X. + * Safari (but not Chrome) clips the cancel button when the search input has + * padding (and `textfield` appearance). + */ + +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * Define consistent border, margin, and padding. + */ + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/** + * 1. Correct `color` not being inherited in IE 8/9/10/11. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + */ + +legend { + border: 0; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Remove default vertical scrollbar in IE 8/9/10/11. + */ + +textarea { + overflow: auto; +} + +/** + * Don't inherit the `font-weight` (applied by a rule above). + * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. + */ + +optgroup { + font-weight: bold; +} + +/* Tables + ========================================================================== */ + +/** + * Remove most spacing between table cells. + */ + +table { + border-collapse: collapse; + border-spacing: 0; +} + +td, +th { + padding: 0; +} \ No newline at end of file diff --git a/css/style.css b/css/style.css old mode 100755 new mode 100644 index 29fb18be9..dbf6b42eb --- a/css/style.css +++ b/css/style.css @@ -1,14 +1,413 @@ +/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS text size adjust after orientation change, without disabling + * user zoom. + */ +*, *::after, *::before { + box-sizing: inherit; + padding: 0; + margin: 0; +} - /* Use the 'Roboto' font from Google. Already added to your HTML header */ +html { + font-family: sans-serif; + /* 1 */ + -ms-text-size-adjust: 100%; + /* 2 */ + -webkit-text-size-adjust: 100%; + /* 2 */ + font-size: 62.5%; +} +/** + * Remove default margin. + */ +/* Use the 'Roboto' font from Google. Already added to your HTML header */ body { - font-family: 'Roboto', sans-serif; - -webkit-font-smoothing: antialiased; + font-family: 'Roboto', sans-serif; + -webkit-font-smoothing: antialiased; + margin: 0; + box-sizing: border-box; +} + +/* HTML5 display definitions + ========================================================================== */ +/** + * Correct `block` display not defined for any HTML5 element in IE 8/9. + * Correct `block` display not defined for `details` or `summary` in IE 10/11 + * and Firefox. + * Correct `block` display not defined for `main` in IE 11. + */ +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +menu, +nav, +section, +summary { + display: block; +} + +/** + * 1. Correct `inline-block` display not defined in IE 8/9. + * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. + */ +audio, +canvas, +progress, +video { + display: inline-block; + /* 1 */ + vertical-align: baseline; + /* 2 */ +} + +/** + * Prevent modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Address `[hidden]` styling not present in IE 8/9/10. + * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. + */ +[hidden], +template { + display: none; +} + +/* Links + ========================================================================== */ +/** + * Remove the gray background color from active links in IE 10. + */ +a { + background-color: transparent; +} + +/** + * Improve readability when focused and also mouse hovered in all browsers. + */ +a:active, +a:hover { + outline: 0; +} + +/* Text-level semantics + ========================================================================== */ +/** + * Address styling not present in IE 8/9/10/11, Safari, and Chrome. + */ +abbr[title] { + border-bottom: 1px dotted; +} + +/** + * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. + */ +b, +strong { + font-weight: bold; +} + +/** + * Address styling not present in Safari and Chrome. + */ +dfn { + font-style: italic; +} + +/** + * Address variable `h1` font-size and margin within `section` and `article` + * contexts in Firefox 4+, Safari, and Chrome. + */ +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/** + * Address styling not present in IE 8/9. + */ +mark { + background: #ff0; + color: #000; +} + +/** + * Address inconsistent and variable font size in all browsers. + */ +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. + */ +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +/* Embedded content + ========================================================================== */ +/** + * Remove border when inside `a` element in IE 8/9/10. + */ +img { + border: 0; +} + +/** + * Correct overflow not hidden in IE 9/10/11. + */ +svg:not(:root) { + overflow: hidden; +} + +/* Grouping content + ========================================================================== */ +/** + * Address margin not present in IE 8/9 and Safari. + */ +figure { + margin: 1em 40px; +} + +/** + * Address differences between Firefox and other browsers. + */ +hr { + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} + +/** + * Contain overflow in all browsers. + */ +pre { + overflow: auto; +} + +/** + * Address odd `em`-unit font size rendering in all browsers. + */ +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; +} + +/* Forms + ========================================================================== */ +/** + * Known limitation: by default, Chrome and Safari on OS X allow very limited + * styling of `select`, unless a `border` property is set. + */ +/** + * 1. Correct color not being inherited. + * Known issue: affects color of disabled elements. + * 2. Correct font properties not being inherited. + * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. + */ +button, +input, +optgroup, +select, +textarea { + color: inherit; + /* 1 */ + font: inherit; + /* 2 */ + margin: 0; + /* 3 */ +} + +/** + * Address `overflow` set to `hidden` in IE 8/9/10/11. + */ +button { + overflow: visible; +} + +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. + * Correct `select` style inheritance in Firefox. + */ +button, +select { + text-transform: none; +} + +/** + * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` + * and `video` controls. + * 2. Correct inability to style clickable `input` types in iOS. + * 3. Improve usability and consistency of cursor style between image-type + * `input` and others. + */ +button, +html input[type="button"], +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; + /* 2 */ + cursor: pointer; + /* 3 */ +} + +/** + * Re-set default cursor for disabled elements. + */ +button[disabled], +html input[disabled] { + cursor: default; +} + +/** + * Remove inner padding and border in Firefox 4+. + */ +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +/** + * Address Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ +input { + line-height: normal; +} + +/** + * It's recommended that you don't attempt to style these elements. + * Firefox's implementation doesn't respect box-sizing, padding, or width. + * + * 1. Address box sizing set to `content-box` in IE 8/9/10. + * 2. Remove excess padding in IE 8/9/10. + */ +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; + /* 1 */ + padding: 0; + /* 2 */ +} + +/** + * Fix the cursor style for Chrome's increment/decrement buttons. For certain + * `font-size` values of the `input`, it causes the cursor style of the + * decrement button to change from `default` to `text`. + */ +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Address `appearance` set to `searchfield` in Safari and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari and Chrome + * (include `-moz` to future-proof). + */ +input[type="search"] { + -webkit-appearance: textfield; + /* 1 */ + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; + /* 2 */ + box-sizing: content-box; +} + +/** + * Remove inner padding and search cancel button in Safari and Chrome on OS X. + * Safari (but not Chrome) clips the cancel button when the search input has + * padding (and `textfield` appearance). + */ +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * Define consistent border, margin, and padding. + */ +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/** + * 1. Correct `color` not being inherited in IE 8/9/10/11. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + */ +legend { + border: 0; + /* 1 */ + padding: 0; + /* 2 */ +} + +/** + * Remove default vertical scrollbar in IE 8/9/10/11. + */ +textarea { + overflow: auto; +} + +/** + * Don't inherit the `font-weight` (applied by a rule above). + * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. + */ +optgroup { + font-weight: bold; +} + +/* Tables + ========================================================================== */ +/** + * Remove most spacing between table cells. + */ +table { + border-collapse: collapse; + border-spacing: 0; +} + +td, +th { + padding: 0; } /* Add your custom styles here */ /* Remember: be organised, use comments and separate your styles into meaningful chunks */ /* For example: General styles, Navigation styles, Hero styles, Footer etc. */ - /* TIP: When using Flexbox, remember the items you want to move around need to be inside a parent container set to 'display: flex' */ - diff --git a/css/style.scss b/css/style.scss new file mode 100644 index 000000000..659ffb523 --- /dev/null +++ b/css/style.scss @@ -0,0 +1,11 @@ +@import 'abstract'; +@import 'normalize'; +/* Add your custom styles here */ +/* Remember: be organised, use comments and separate your styles into meaningful chunks */ +/* For example: General styles, Navigation styles, Hero styles, Footer etc. */ + +/* TIP: When using Flexbox, remember the items you want to move around need to be inside a parent container set to 'display: flex' */ + + + + diff --git a/index.html b/index.html index 82a83de7b..f7db3394b 100755 --- a/index.html +++ b/index.html @@ -2,19 +2,18 @@ - Karma + Raj- Karma - + - - +

Hi, I am a test!

From 3e0435aed53914bbf604d7755d22b275f37e4195 Mon Sep 17 00:00:00 2001 From: raj Date: Sat, 31 Mar 2018 21:18:07 +0100 Subject: [PATCH 02/10] Add header section for the blog --- css/_normalize.scss | 2 +- css/style.css | 52 ++++++++++++++++++++++++++++++++++++++++- css/style.scss | 57 +++++++++++++++++++++++++++++++++++++++++++++ index.html | 24 +++++++++++++++---- 4 files changed, 129 insertions(+), 6 deletions(-) diff --git a/css/_normalize.scss b/css/_normalize.scss index 7af36cab6..f4b4db981 100755 --- a/css/_normalize.scss +++ b/css/_normalize.scss @@ -14,7 +14,7 @@ html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ - font-size: 62.5%; + // font-size: 62.5%; } /** diff --git a/css/style.css b/css/style.css index dbf6b42eb..f97ff17fd 100644 --- a/css/style.css +++ b/css/style.css @@ -17,7 +17,6 @@ html { /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ - font-size: 62.5%; } /** @@ -411,3 +410,54 @@ th { /* Remember: be organised, use comments and separate your styles into meaningful chunks */ /* For example: General styles, Navigation styles, Hero styles, Footer etc. */ /* TIP: When using Flexbox, remember the items you want to move around need to be inside a parent container set to 'display: flex' */ +.header { + padding: 0 0.938rem; + margin: 0 auto; + min-width: 37.5rem; + height: 4.375rem; + display: flex; + position: fixed; + width: 100%; + justify-content: center; + border-bottom: 1px solid #DDD; +} + +.header:focus { + outline: none; +} + +.header .logo { + height: 4.375rem; +} + +.container { + width: 60%; + display: flex; + justify-content: space-between; +} + +.navigation { + width: 65%; + display: flex; + justify-content: center; + align-items: center; +} + +.navigation__list { + width: 100%; + display: flex; + justify-content: space-between; + color: #838994; + font-size: 1.04rem; + list-style: none; +} + +.navigation__item:hover { + cursor: pointer; + color: #333333; +} + +.navigation__item--active { + color: #4c5058; + font-weight: 500; +} diff --git a/css/style.scss b/css/style.scss index 659ffb523..c8f1a8c23 100644 --- a/css/style.scss +++ b/css/style.scss @@ -5,6 +5,63 @@ /* For example: General styles, Navigation styles, Hero styles, Footer etc. */ /* TIP: When using Flexbox, remember the items you want to move around need to be inside a parent container set to 'display: flex' */ +.header { + padding: 0 0.938rem; + margin: 0 auto; + min-width: 37.5rem; + height: 4.375rem; + // background-color: blue; + display:flex; + position: fixed; + width:100%; + justify-content: center; + border-bottom: 1px solid #DDD; + &:focus { + outline: none; + } + .logo{ + height: 4.375rem; + // width: 4.375rem; + // display: block; + } +} +.container{ + width:60%; + display: flex; + justify-content: space-between; + // background-color: green; + // @include flx-center; +} +// Navigation Section + +.navigation { + // background-color: #fff; + // flex-grow: 1; + width: 65%; + @include flx-center; + &__list{ + width: 100%; + // background-color: green; + display: flex; + justify-content: space-between; + color: #838994; + font-size: 1.04rem; + list-style: none; + } + &__item{ + &:hover{ + cursor: pointer; + color: #333333; + } + &--active { + color: #4c5058; + font-weight: 500; + } + } +} + + + diff --git a/index.html b/index.html index f7db3394b..4868a0fc6 100755 --- a/index.html +++ b/index.html @@ -1,5 +1,6 @@ + Raj- Karma @@ -7,13 +8,28 @@ - + + -

Hi, I am a test!

- +
+
+ + +
+
- + + \ No newline at end of file From 9d87a047d3ee8602ae63ed7960053897cde07bf5 Mon Sep 17 00:00:00 2001 From: raj Date: Sat, 31 Mar 2018 22:14:02 +0100 Subject: [PATCH 03/10] Include introduction section for the blog --- css/style.css | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ css/style.scss | 52 +++++++++++++++++++++++++++++++++++++++++++++--- index.html | 10 ++++++++++ 3 files changed, 113 insertions(+), 3 deletions(-) diff --git a/css/style.css b/css/style.css index f97ff17fd..39cd24215 100644 --- a/css/style.css +++ b/css/style.css @@ -415,6 +415,7 @@ th { margin: 0 auto; min-width: 37.5rem; height: 4.375rem; + background-color: #fff; display: flex; position: fixed; width: 100%; @@ -461,3 +462,56 @@ th { color: #4c5058; font-weight: 500; } + +.intro { + background-image: url("../img/first-background.jpg"); + background-position: center bottom; + background-repeat: no-repeat; + background-size: cover; + height: 45.938rem; + overflow: auto; +} + +.intro__content { + margin-top: 7.875rem; + padding: none; + color: #1d1e21; + text-align: center; +} + +.intro__h1, .intro__h3 { + color: white; + text-align: center; + font-weight: 300; + margin-top: 17.5rem; + font-size: 3.125rem; +} + +.intro__h3 { + margin-top: 1.25rem; + font-size: 1.563rem; +} + +.intro__buttons { + color: white; + text-align: center; + margin-top: 1.563rem; +} + +button { + width: 9.688rem; + background-color: #f15a29; + border-color: #f15a29; + text-shadow: none; + border-style: none; + border-radius: 4px; + padding: 1rem 1.5rem; + color: white; + font-size: 1.125rem; +} + +button:hover { + background-color: #d9400e; + border-color: #cf3d0e; + cursor: pointer; +} diff --git a/css/style.scss b/css/style.scss index c8f1a8c23..27c405e8d 100644 --- a/css/style.scss +++ b/css/style.scss @@ -10,7 +10,7 @@ margin: 0 auto; min-width: 37.5rem; height: 4.375rem; - // background-color: blue; + background-color: #fff; display:flex; position: fixed; width:100%; @@ -60,8 +60,54 @@ } } - - +// introduction +.intro { + background-image: url('../img/first-background.jpg'); + background-position: center bottom; + background-repeat: no-repeat; + background-size: cover; + height: 45.938rem; + overflow: auto; + &__content { + margin-top: 7.875rem; + padding: none; + color: #1d1e21; + text-align: center; + } + &__h1{ + color: white; + text-align: center; + font-weight: 300; + margin-top: 17.5rem; + font-size: 3.125rem; + } + &__h3{ + @extend .intro__h1; + margin-top: 1.25rem; + font-size: 1.563rem; + } + &__buttons { + color: white; + text-align: center; + margin-top: 1.563rem; + } +} +button { + width: 9.688rem; + background-color: #f15a29; + border-color: #f15a29; + text-shadow: none; + border-style: none; + border-radius: 4px; + padding: 1rem 1.5rem; + color: white; + font-size: 1.125rem; +} +button:hover { + background-color: #d9400e; + border-color: #cf3d0e; + cursor: pointer; +} diff --git a/index.html b/index.html index 4868a0fc6..92771e2ce 100755 --- a/index.html +++ b/index.html @@ -30,6 +30,16 @@ + +
+
+

Introducing Karma

+

Bring WiFi with you, everywhere you go.

+
+ +
+
+
\ No newline at end of file From 2724bf66676325fa91ce8c8c9630968bb036147a Mon Sep 17 00:00:00 2001 From: raj Date: Sat, 31 Mar 2018 23:51:10 +0100 Subject: [PATCH 04/10] Insert cases section and setup layout for footer section --- css/style.css | 59 ++++++++++++++++++++++++++++++++++++++++++ css/style.scss | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ index.html | 63 +++++++++++++++++++++++++++++++++++++++------ 3 files changed, 183 insertions(+), 8 deletions(-) diff --git a/css/style.css b/css/style.css index 39cd24215..f12554f41 100644 --- a/css/style.css +++ b/css/style.css @@ -515,3 +515,62 @@ button:hover { border-color: #cf3d0e; cursor: pointer; } + +.cases { + background-color: #fff; + overflow: hidden; + padding-bottom: 5rem; + display: flex; + justify-content: center; + align-items: center; +} + +.cases__content { + margin-top: 7.875rem; + display: flex; + flex-direction: column; + padding: 0; + color: #1d1e21; +} + +.cases__content > h2 { + font-size: 2.75rem; + margin: 1.625rem 0 4.125rem; + margin-left: 6rem; + font-weight: 300; + align-self: center; +} + +.cases__devices { + list-style: none; + display: flex; + justify-content: space-between; +} + +.cases__devices > li { + display: flex; + flex-direction: column; +} + +.cases__devices > li:not(:last-child) { + margin-right: 1rem; +} + +.cases__img { + width: 127px; + height: 127px; + align-self: center; +} + +.cases__caption > h3 { + font-weight: 400; + font-size: 1.563rem; + margin: 2.5rem 0px 1.875rem; +} + +.social { + background-color: #fff; + overflow: auto; + padding-bottom: 9.375rem; + text-align: center; +} diff --git a/css/style.scss b/css/style.scss index 27c405e8d..bc6754efb 100644 --- a/css/style.scss +++ b/css/style.scss @@ -108,7 +108,76 @@ button:hover { border-color: #cf3d0e; cursor: pointer; } +// cases +.cases { + background-color: #fff; + overflow: hidden; + padding-bottom: 5rem; + @include flx-center; + &__content{ + margin-top: 7.875rem; + display:flex; + flex-direction: column; + padding: 0; + color: #1d1e21; + &>h2{ + font-size: 2.75rem; + margin: 1.625rem 0 4.125rem; + margin-left: 6rem; + font-weight: 300; + align-self: center; + } + } + &__devices{ + list-style: none; + display: flex; + justify-content: space-between; + &>li{ + display: flex; + flex-direction: column; + + } + &>li:not(:last-child){ + margin-right: 1rem; + + } + + } + &__img{ + width:127px; + height: 127px; + align-self: center; + } + &__caption{ + &>h3{ + font-weight: 400; + font-size: 1.563rem; + margin: 2.5rem 0px 1.875rem; + } + } +} + +// Footer +.social { + background-color: #fff; + overflow: auto; + padding-bottom: 9.375rem; + text-align: center; + &__content{ + + } + &__icons{ + } + &__twitter{ + + } + &__facebook{ + } + &__instagram{ + + } +} diff --git a/index.html b/index.html index 92771e2ce..6b6ac2349 100755 --- a/index.html +++ b/index.html @@ -20,7 +20,7 @@
@@ -91,6 +108,9 @@
Join us on
+ + + \ No newline at end of file From 376d622ef907171af53b7d3b47d40aa053d66dc5 Mon Sep 17 00:00:00 2001 From: raj Date: Tue, 10 Apr 2018 23:58:56 +0100 Subject: [PATCH 10/10] Add bootstrap layout with flexbox --- css/style.css | 177 +++++++++++++++------------------------------ css/style.scss | 193 ++++++++++++++++--------------------------------- index.html | 152 +++++++++++++++++++++----------------- 3 files changed, 206 insertions(+), 316 deletions(-) diff --git a/css/style.css b/css/style.css index 5bdaccb6a..2d3d0c971 100644 --- a/css/style.css +++ b/css/style.css @@ -406,59 +406,23 @@ th { padding: 0; } -/* Add your custom styles here */ -/* Remember: be organised, use comments and separate your styles into meaningful chunks */ -/* For example: General styles, Navigation styles, Hero styles, Footer etc. */ -/* TIP: When using Flexbox, remember the items you want to move around need to be inside a parent container set to 'display: flex' */ -.header { - min-width: 37.5rem; - height: 4.375rem; - background-color: #fff; - display: flex; - position: fixed; - width: 100%; - justify-content: center; - border-bottom: 1px solid #DDD; -} - -.header:focus { - outline: none; -} - -.header .logo { - height: 4.375rem; -} - -.container { - width: 65%; +.container-top { + width: 80%; display: flex; justify-content: space-between; } -.navigation { - width: 75%; - display: flex; - justify-content: center; - align-items: center; -} - -.navigation__list { - width: 100%; - display: flex; - justify-content: space-between; - color: #838994; - font-size: 1.04rem; - list-style: none; +nav.navbar-light { + background-color: white; } -.navigation__item:hover { - cursor: pointer; - color: #333333; +.nav-item { + padding: .5rem; + letter-spacing: 1px; } -.navigation__item--active { - color: #4c5058; - font-weight: 500; +.logo { + height: 90%; } .intro { @@ -467,7 +431,6 @@ th { background-repeat: no-repeat; background-size: cover; height: 45.938rem; - overflow: auto; display: flex; justify-content: center; align-items: center; @@ -516,61 +479,35 @@ button:hover { } .cases { - background-color: #fff; - overflow: hidden; - padding: 2.5rem; - display: flex; - justify-content: center; - align-items: center; -} - -.cases__content { - display: flex; - flex-direction: column; - padding: 1rem; - color: #1d1e21; + padding: 5rem 0; } -.cases__content > h2 { - font-size: 2.75rem; - margin-bottom: 2rem; +.cases__h2 { + font-size: 3rem; + margin-bottom: 3.5rem; font-weight: 300; - align-self: center; - padding: 1rem; + text-align: center; } -.cases__devices { - list-style: none; - display: flex; - justify-content: space-evenly; +.cases__img { + width: 127px; + height: 127px; } -.cases__devices > li { +.cases__block { display: flex; flex-direction: column; + align-items: center; } -.cases__devices > li:not(:last-child) { - margin-right: 1rem; -} - -.cases__img { - width: 127px; - height: 127px; - align-self: center; -} - -.cases__caption > h3 { - font-weight: 400; - font-size: 1.563rem; - margin: 2.5rem 0px 1.875rem; - text-align: center; +.cases__caption { + margin-top: 2rem; } .social { - background-color: #fff; overflow: auto; padding-bottom: 9.375rem; + margin-bottom: 3rem; display: flex; justify-content: center; align-items: center; @@ -582,18 +519,27 @@ button:hover { } .social__content > hr { - border: 0; - border-top: 1px solid #eaebec; - margin: 1.313rem 0; + display: block; + margin-top: 0.5em; + margin-bottom: 0.5em; + margin-left: auto; + margin-right: auto; + border-style: inset; + border: 1px solid #E9EAEB; } .social__collections { + padding-top: 25px; display: flex; justify-content: center; align-items: center; flex-direction: column; } +.social__collections > h5 { + font-weight: 700; +} + .social__icons > li { border-radius: 1.25rem; width: 2.5rem; @@ -627,28 +573,7 @@ button:hover { color: #838994; } -@media only screen and (max-width: 900px) { - .container { - width: 100%; - padding: 0 1rem; - justify-content: space-around; - } - .cases__content { - width: 100%; - padding: 1rem; - margin: 0; - } - .cases > h2 { - font-size: 2rem; - margin: 0; - } -} - -@media only screen and (max-width: 767px) { - .navigation { - opacity: 0; - visibility: hidden; - } +@media only screen and (max-width: 768px) { .intro__content { padding: .5rem; } @@ -660,17 +585,31 @@ button:hover { font-size: 1.5rem; text-align: center; } - .cases h2 { - font-size: 2rem; - text-align: center; - } - .cases h3 { - font-size: 1.5rem; - } - .cases__devices { - flex-direction: column; + .social { + padding: 0; } .social__content { width: 100%; } + .container-top { + width: 100%; + } +} + +@media (min-width: 576px) { + .navbar-collapse { + flex-grow: 0; + } +} + +@media only screen and (max-width: 575px) { + body { + text-align: center; + } +} + +@media only screen and (min-width: 768px) { + .navbar-expand-md { + justify-content: center; + } } diff --git a/css/style.scss b/css/style.scss index 8263c5da9..6164c03c9 100644 --- a/css/style.scss +++ b/css/style.scss @@ -1,54 +1,21 @@ @import 'abstract'; @import 'normalize'; -/* Add your custom styles here */ -/* Remember: be organised, use comments and separate your styles into meaningful chunks */ -/* For example: General styles, Navigation styles, Hero styles, Footer etc. */ - -/* TIP: When using Flexbox, remember the items you want to move around need to be inside a parent container set to 'display: flex' */ -.header { - min-width: 37.5rem; - height: 4.375rem; - background-color: #fff; - display:flex; - position: fixed; - width:100%; - justify-content: center; - border-bottom: 1px solid #DDD; - &:focus { - outline: none; - } - .logo{ - height: 4.375rem; - } -} -.container{ - width:65%; +.container-top{ + width:80%; display: flex; justify-content: space-between; } -.navigation { - width: 75%; - @include flx-center; - &__list{ - width: 100%; - display: flex; - justify-content: space-between; - color: #838994; - font-size: 1.04rem; - list-style: none; - } - &__item{ - &:hover{ - cursor: pointer; - color: #333333; - } - &--active { - color: #4c5058; - font-weight: 500; - } - } +nav.navbar-light{ + background-color:rgb(255, 255, 255); +} +.nav-item{ + padding: .5rem; + // text-transform: uppercase; + letter-spacing: 1px; +} +.logo{ + height: 90%; } - // introduction .intro { background-image: url('../img/first-background.jpg'); @@ -56,7 +23,6 @@ background-repeat: no-repeat; background-size: cover; height: 45.938rem; - overflow: auto; @include flx-center; &__content { padding: 0; @@ -97,71 +63,55 @@ button:hover { cursor: pointer; } // cases -.cases { - background-color: #fff; - overflow: hidden; - padding: 2.5rem; - @include flx-center; - &__content{ - display:flex; - flex-direction: column; - padding: 1rem; - color: #1d1e21; - &>h2{ - font-size: 2.75rem; - margin-bottom: 2rem; - font-weight: 300; - align-self: center; - padding: 1rem; - } - } - &__devices{ - list-style: none; - display: flex; - justify-content: space-evenly; - &>li{ - display: flex; - flex-direction: column; - - } - &>li:not(:last-child){ - margin-right: 1rem; - } - +.cases{ + padding:5rem 0; + &__h2{ + font-size: 3rem; + margin-bottom: 3.5rem; + font-weight: 300; + text-align: center; + // padding: 1rem; } &__img{ width:127px; height: 127px; - align-self: center; + } + &__block{ + display: flex; + flex-direction: column; + align-items: center; } &__caption{ - &>h3{ - font-weight: 400; - font-size: 1.563rem; - margin: 2.5rem 0px 1.875rem; - text-align: center; - } + margin-top:2rem; } } - // Footer .social { - background-color: #fff; + // background-color: #fff; overflow: auto; padding-bottom: 9.375rem; + margin-bottom: 3rem; @include flx-center; &__content{ width: 60%; - flex-direction: column;; - &>hr{ - border: 0; - border-top: 1px solid #eaebec; - margin: 1.313rem 0; + flex-direction: column; + &> hr { + display: block; + margin-top: 0.5em; + margin-bottom: 0.5em; + margin-left: auto; + margin-right: auto; + border-style: inset; + border: 1px solid #E9EAEB; } } &__collections{ + padding-top: 25px; @include flx-center; flex-direction: column; + &>h5{ + font-weight: 700; + } } &__icons{ &>li{ @@ -193,32 +143,8 @@ button:hover { color: #838994; } } - // MEDIA -@media only screen and (max-width: 900px) { - .container{ - width:100%; - padding: 0 1rem; - justify-content: space-around; - } - .cases { - &__content{ - width:100%; - padding: 1rem; - margin: 0; - } - & > h2 { - font-size:2rem; - margin: 0; - } - } - -} -@media only screen and (max-width: 767px) { - .navigation { - opacity: 0; - visibility: hidden; - } +@media only screen and (max-width: 768px) { .intro{ &__content{ padding: .5rem; @@ -232,23 +158,30 @@ button:hover { text-align: center; } } - - .cases { - h2 { - font-size:2rem; - text-align: center; - } - h3 { - font-size:1.5rem; -} - &__devices { - flex-direction: column; - } - } .social{ + padding: 0; + // margin: 0; &__content { width:100%; } + } + .container-top{ + width: 100%; } - } + @media (min-width: 576px){ + .navbar-collapse { + flex-grow: 0; + } + } + @media only screen and (max-width: 575px) { + body{ + text-align: center; + } + } + +@media only screen and (min-width:768px){ + .navbar-expand-md { + justify-content: center; +} +} \ No newline at end of file diff --git a/index.html b/index.html index 0ddbe47a6..09e77963d 100755 --- a/index.html +++ b/index.html @@ -3,53 +3,59 @@ - + Raj- Karma - + + - - - - + + -
+

Introducing Karma

Bring WiFi with you, everywhere you go.

@@ -59,58 +65,70 @@

Bring WiFi with you, everywhere you go.

-
-
-

Everyone needs a little Karma

-
    -
  • +
    +

    Everyone needs a little Karma

    +
    +
    +
    Internet for all devices image

    Internet for all devices

    -
    • -
  • +
+ + +
+
Boost your productivity image

Boost your productivity

- -
  • +
    • + +
    +
    +
    Pay as You Go image

    Pay as You Go

    - - +
    + +
    -