From b06609b625a6acdfb842264a944efa08c9a4bfca Mon Sep 17 00:00:00 2001 From: monicaedavidson Date: Wed, 5 Nov 2014 11:50:08 -0800 Subject: [PATCH 1/6] first commit --- Monica-Henok/.DS_Store | Bin 0 -> 6148 bytes Monica-Henok/IndexBem.html | 113 +++++++++++++++++ Monica-Henok/README.md | 15 +++ Monica-Henok/css/.DS_Store | Bin 0 -> 6148 bytes Monica-Henok/css/bem.css | 234 +++++++++++++++++++++++++++++++++++ Monica-Henok/css/reset.css | 48 +++++++ Monica-Henok/img/.DS_Store | Bin 0 -> 6148 bytes Monica-Henok/img/profile.jpg | Bin 0 -> 14457 bytes 8 files changed, 410 insertions(+) create mode 100644 Monica-Henok/.DS_Store create mode 100644 Monica-Henok/IndexBem.html create mode 100644 Monica-Henok/README.md create mode 100644 Monica-Henok/css/.DS_Store create mode 100644 Monica-Henok/css/bem.css create mode 100755 Monica-Henok/css/reset.css create mode 100644 Monica-Henok/img/.DS_Store create mode 100644 Monica-Henok/img/profile.jpg diff --git a/Monica-Henok/.DS_Store b/Monica-Henok/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..fc43b81569b096281b77108fcee66f50c88081ab GIT binary patch literal 6148 zcmeHK&2G~`5T0#Pu!#U8aVR(6;1E@*Ovn*qQlttYp&HQxMa8b8#**u;Vuv85k$h|m zyaxhtpWX>&{*8;nP?i9vz>&|M2nCXZ^znd~Yea#rO-ppu;PE8;IS5+4|{dC#3p9yY^kaX&Xz}Pd5dg){YSRciWk_r4jYg|0t0vl0or|7g&~xP*#d*7 z3k=$@3G46(`tS^K6+4o82Ry-!9_sRZj@HO|8Q}lE)jDsZsW%K51};4V^nP$r34O*& zqk46qQC9%OCWe)uuRi_}T?!!jjFm==pa|WHs9ObJF$CWogl@;Y&-Il?-3~%M8Ry|A z3%;QUzIq5(m4om#8fzFZ4AdED=%GXB|N7tW|Mey_G7K07E)@f!*$?{xE{V_9GmE3M u) + + + Marissa and Loann + + + + + + + + + +
+ +
+ + + + +
+ +

Main Introduction

+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas in mi urna. Phasellus rhoncus tempor velit, vitae finibus felis. Vestibulum tempor justo ante, a tincidunt purus dignissim eu. Quisque maximus ut lorem suscipit molestie. Nullam interdum ante et maximus varius. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin interdum tellus tortor, sit amet placerat lectus gravida quis.

+ +
+ + + + +
+ +

Programs

+ +
+

Sample Header

+

+ +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas in mi urna. Phasellus rhoncus tempor velit, vitae finibus felis. Vestibulum tempor justo ante, a tincidunt purus dignissim eu.

+
+ +
+

Sample Header

+

+ +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas in mi urna. Phasellus rhoncus tempor velit, vitae finibus felis. Vestibulum tempor justo ante, a tincidunt purus dignissim eu.

+
+ +
+

Sample Header

+

+ +

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas in mi urna. Phasellus rhoncus tempor velit, vitae finibus felis. Vestibulum tempor justo ante, a tincidunt purus dignissim eu.

+
+ +
+ + + + + +
+

feature and Speakers

+ +
+ +

Professor Name

+

Professor Title and Department

+
+ +
+ +

Professor Name

+

Professor Title and Department

+
+ +
+ +

Professor Name

+

Professor Title and Department

+
+ +
+ +

Professor Name

+

Professor Title and Department

+
+
+ + + diff --git a/Monica-Henok/README.md b/Monica-Henok/README.md new file mode 100644 index 0000000..4c3c59b --- /dev/null +++ b/Monica-Henok/README.md @@ -0,0 +1,15 @@ +# Refractor Another Team's CSS + +##Overview + +-We repaired the image tag for col 1_of_4 +-Changed the navigation from white to black (so that it appears on screen) +-Got rid of the main link on the nav bar +-Removed blue, yellow and green classes +-Got rid of height parameters dept 1-3 and main tags +-Switched

tags to

(there were multiple

tags on the HTML) +-On dept. we added margin 0 auto to center +-Condensed CSS + +###Collaborators +Henok and Monica refractored this assignment \ No newline at end of file diff --git a/Monica-Henok/css/.DS_Store b/Monica-Henok/css/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..040fd5e116db0c0b3a6af7bf18bd7a058ea137f0 GIT binary patch literal 6148 zcmeHKyH3ME5S)cbB%(=4d1Wdj{@@e^BPQO1tCR z+ws{`+};6@<=5*2Fb6QDD`KxfaN}y+MOFyyG5c z{9VHt{j4YYf-Zf}2+Z)o>X!a_fpK8fqBk=}hEyOGNCi@XR3H`jQGh*LZF=jNF%?J! zQh}2Kx<3@UVh!vZZR=pr#So`6U!txCc8*Sm z*vfoQtSoUu5nG-4V&#zPm@ySd1%?V-`*5!P|B-&-{y!w;C>2Nr{*?kUS*=$~{!;YT w(a&kGE%X=qx3SjB83u;{4zv~Doz)e6W?c>J9F5Mr(TRBwP+ihefxl4T2n((xivR!s literal 0 HcmV?d00001 diff --git a/Monica-Henok/css/bem.css b/Monica-Henok/css/bem.css new file mode 100644 index 0000000..826c2fb --- /dev/null +++ b/Monica-Henok/css/bem.css @@ -0,0 +1,234 @@ +*{ + -moz-box-sizing: border-box; /* Firefox 1, probably can drop this */ + -webkit-box-sizing: border-box; /* Safari 3-4, also probably droppable */ + box-sizing: border-box; /* Everything else */ +} + +body{ + font-size: 1em; + +} + +/* nav */ + +nav { + width:100%; + height: 3em; + padding:5% 0; + text-align: center; +} + +nav .item{ + display: inline-block; +} + +nav .link { + color: black; + margin:0 1em; + font-size: 1.5em; + text-decoration: none; +} + +/* main intro */ + +.main{ + background-color:MediumOrchid; + padding:5% 0; + text-align:center; +} + +.main__header{ + color:white; + font-size: 5em; + width:100%; +} + +.intro{ + color:white; + font-size: 1em; + line-height: 1.5em; + width:600px; + margin:auto; +} + +/* department section */ + + +.dept{ + margin: 0 auto; + display: inline-block; + width:100%; + text-align:center; + } + +.dept__header{ + text-align: center; + margin:3% 0; + text-transform: uppercase; + font-size: 1.25em; + color:gray; +} + +.deptOne{ + padding:3%; + display: inline-block; + /*margin-right:10px;*/ + background-color: SkyBlue; +} + +.deptOne__header{ + color:white; + font-size:1.1em; +} + +.deptOne__date{ + color:white; + font-size: 1em; + line-height: 2em; +} + +.deptOne__info{ + color:white; + line-height: 1em; +} + +.deptTwo{ + padding:3%; + display: inline-block; + background-color: LemonChiffon; +} + +.deptTwo__header{ + color:gray; + font-size:1.1em; +} + +.deptTwo__date{ + color:gray; + font-size: 1em; + line-height: 2em; +} + +.deptTwo__info{ + color:gray; + line-height: 1em; +} + +.deptThree{ + padding:3%; + display: inline-block; + background-color: MediumSeaGreen; +} + +.deptThree__header{ + color:white; + font-size:1.1em; +} + +.deptThree__date{ + color:white; + font-size: 1em; + line-height: 2em; +} + +.deptThree__info{ + color:white; + line-height: 1em; +} + +/* form section */ + +.sign-up{ + text-align: center; + display: block; + font-size: 1.25em; + cursor:pointer; + height:60px; + margin:10% 0; +} + +.sign-up__field{ + margin-top:20px; + width:275px; + height:35px; + padding:2px; +} + +/* feature section */ + +.feature{ + text-align: center; + display: block; + width:100%; +} + +.feature__title{ + text-align: center; + margin:3% 0; + text-transform: uppercase; + font-size: 1.25em; + width:100%; +} + +.feature__header{ + margin-top:3px; + color:gray; + line-height: 1.5em; +} + +.feature__info{ + color:gray; +} + +.feature__one{ + display: inline-block; + padding:1%; +} + +.feature__two{ + display: inline-block; + padding:1%; +} + +.feature__three{ + height:450px; + display: inline-block; + padding:1%; +} + +.feature__four{ + height:450px; + display: inline-block; + padding:1%; +} + +/* GRIDS ============================================================================= */ +.col_1_of_3 { + width: 25.25%; +} + +.col_1_of_4 { + width: 21%; +} + +/* GO FULL WIDTH AT LESS THAN 480 PIXELS */ + +@media only screen and (max-width: 480px) { +.col_3_of_3 { + width: 100%; +} + +.col_1_of_3 { + width: 100%; + } +} + +@media only screen and (max-width: 480px) { + +.col_4_of_4 { + width: 100%; + } +.col_1_of_4 { + width: 100%; + } +} diff --git a/Monica-Henok/css/reset.css b/Monica-Henok/css/reset.css new file mode 100755 index 0000000..af94440 --- /dev/null +++ b/Monica-Henok/css/reset.css @@ -0,0 +1,48 @@ +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) +*/ + +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +/* HTML5 display-role reset for older browsers */ +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} \ No newline at end of file diff --git a/Monica-Henok/img/.DS_Store b/Monica-Henok/img/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..9f2e7d3711ddb6e9f9110de2bf4b5d05d086cac1 GIT binary patch literal 6148 zcmeHKyGq1R5Iv(?ENru-kB22MX*ohcll>}=D|XUHiC_ufthpf zWKM2!icAK8ZQkxLfi-|7-4X8|=H}PkXLeEAHDXxOnQv9s6^@BXhsDXfPn~Qvp;(;G ze2a2em#8QOq`*{x)7-AT|6kF6nE$6F?WBMd_*V+pVtc#Y@Rh2!&R))YZKLn#Uh_eB q<2on|(T<7Hj=Ax6d=^Dn*L=FlR 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 REZM!k{au!Pwfoz}{{fac3H<;7 literal 0 HcmV?d00001 From 4cea9ba295ad20907cdc8bd0f5bc449ae5c5f16c Mon Sep 17 00:00:00 2001 From: Monica Date: Wed, 5 Nov 2014 11:50:31 -0800 Subject: [PATCH 2/6] Delete .DS_Store --- Monica-Henok/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Monica-Henok/.DS_Store diff --git a/Monica-Henok/.DS_Store b/Monica-Henok/.DS_Store deleted file mode 100644 index fc43b81569b096281b77108fcee66f50c88081ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK&2G~`5T0#Pu!#U8aVR(6;1E@*Ovn*qQlttYp&HQxMa8b8#**u;Vuv85k$h|m zyaxhtpWX>&{*8;nP?i9vz>&|M2nCXZ^znd~Yea#rO-ppu;PE8;IS5+4|{dC#3p9yY^kaX&Xz}Pd5dg){YSRciWk_r4jYg|0t0vl0or|7g&~xP*#d*7 z3k=$@3G46(`tS^K6+4o82Ry-!9_sRZj@HO|8Q}lE)jDsZsW%K51};4V^nP$r34O*& zqk46qQC9%OCWe)uuRi_}T?!!jjFm==pa|WHs9ObJF$CWogl@;Y&-Il?-3~%M8Ry|A z3%;QUzIq5(m4om#8fzFZ4AdED=%GXB|N7tW|Mey_G7K07E)@f!*$?{xE{V_9GmE3M u) Date: Wed, 5 Nov 2014 11:54:30 -0800 Subject: [PATCH 3/6] Delete .DS_Store --- Monica-Henok/img/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Monica-Henok/img/.DS_Store diff --git a/Monica-Henok/img/.DS_Store b/Monica-Henok/img/.DS_Store deleted file mode 100644 index 9f2e7d3711ddb6e9f9110de2bf4b5d05d086cac1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKyGq1R5Iv(?ENru-kB22MX*ohcll>}=D|XUHiC_ufthpf zWKM2!icAK8ZQkxLfi-|7-4X8|=H}PkXLeEAHDXxOnQv9s6^@BXhsDXfPn~Qvp;(;G ze2a2em#8QOq`*{x)7-AT|6kF6nE$6F?WBMd_*V+pVtc#Y@Rh2!&R))YZKLn#Uh_eB q<2on|(T<7Hj=Ax6d=^Dn*L= Date: Sun, 21 Dec 2014 03:36:43 -0800 Subject: [PATCH 4/6] spaces for BEM assignment spaces have been cleaned up --- Monica-Henok/IndexBem.html | 71 ++++++++++---------------------------- 1 file changed, 18 insertions(+), 53 deletions(-) diff --git a/Monica-Henok/IndexBem.html b/Monica-Henok/IndexBem.html index a2f493c..9b518fe 100644 --- a/Monica-Henok/IndexBem.html +++ b/Monica-Henok/IndexBem.html @@ -1,113 +1,78 @@ - + Marissa and Loann - - - - - - -
-
-

Main Introduction

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas in mi urna. Phasellus rhoncus tempor velit, vitae finibus felis. Vestibulum tempor justo ante, a tincidunt purus dignissim eu. Quisque maximus ut lorem suscipit molestie. Nullam interdum ante et maximus varius. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Proin interdum tellus tortor, sit amet placerat lectus gravida quis.

-
- - - -
-

Programs

-

Sample Header

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas in mi urna. Phasellus rhoncus tempor velit, vitae finibus felis. Vestibulum tempor justo ante, a tincidunt purus dignissim eu.

-

Sample Header

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas in mi urna. Phasellus rhoncus tempor velit, vitae finibus felis. Vestibulum tempor justo ante, a tincidunt purus dignissim eu.

-

Sample Header

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas in mi urna. Phasellus rhoncus tempor velit, vitae finibus felis. Vestibulum tempor justo ante, a tincidunt purus dignissim eu.

-
- - - -

feature and Speakers

-

Professor Name

Professor Title and Department

-

Professor Name

Professor Title and Department

-

Professor Name

Professor Title and Department

-

Professor Name

Professor Title and Department

- From 12d0cc954ad3be7ad0dd0846b78278b4cd082fe2 Mon Sep 17 00:00:00 2001 From: Monica Date: Sun, 21 Dec 2014 03:40:48 -0800 Subject: [PATCH 5/6] Update bem.css spaces cleaned up --- Monica-Henok/css/bem.css | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/Monica-Henok/css/bem.css b/Monica-Henok/css/bem.css index 826c2fb..1d010ba 100644 --- a/Monica-Henok/css/bem.css +++ b/Monica-Henok/css/bem.css @@ -6,12 +6,9 @@ body{ font-size: 1em; - } - /* nav */ - -nav { +nav{ width:100%; height: 3em; padding:5% 0; @@ -22,15 +19,13 @@ nav .item{ display: inline-block; } -nav .link { +nav .link{ color: black; margin:0 1em; font-size: 1.5em; text-decoration: none; } - /* main intro */ - .main{ background-color:MediumOrchid; padding:5% 0; @@ -51,15 +46,12 @@ nav .link { margin:auto; } -/* department section */ - - .dept{ margin: 0 auto; display: inline-block; width:100%; text-align:center; - } +} .dept__header{ text-align: center; @@ -72,7 +64,6 @@ nav .link { .deptOne{ padding:3%; display: inline-block; - /*margin-right:10px;*/ background-color: SkyBlue; } @@ -135,9 +126,7 @@ nav .link { color:white; line-height: 1em; } - /* form section */ - .sign-up{ text-align: center; display: block; @@ -153,9 +142,7 @@ nav .link { height:35px; padding:2px; } - /* feature section */ - .feature{ text-align: center; display: block; @@ -202,33 +189,33 @@ nav .link { padding:1%; } -/* GRIDS ============================================================================= */ -.col_1_of_3 { +/*Grids*/ +.col_1_of_3{ width: 25.25%; } -.col_1_of_4 { +.col_1_of_4{ width: 21%; } -/* GO FULL WIDTH AT LESS THAN 480 PIXELS */ +/*GO FULL WIDTH AT LESS THAN 480 PIXELS */ @media only screen and (max-width: 480px) { -.col_3_of_3 { +.col_3_of_3{ width: 100%; } -.col_1_of_3 { +.col_1_of_3{ width: 100%; } } @media only screen and (max-width: 480px) { -.col_4_of_4 { +.col_4_of_4{ width: 100%; } -.col_1_of_4 { +.col_1_of_4{ width: 100%; } } From bbe46326563558aabf21ce7e5e51facd84485e96 Mon Sep 17 00:00:00 2001 From: Monica Date: Sun, 21 Dec 2014 03:42:41 -0800 Subject: [PATCH 6/6] Update bem.css spaces given after selectors --- Monica-Henok/css/bem.css | 74 ++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/Monica-Henok/css/bem.css b/Monica-Henok/css/bem.css index 1d010ba..97e39ab 100644 --- a/Monica-Henok/css/bem.css +++ b/Monica-Henok/css/bem.css @@ -1,44 +1,44 @@ -*{ +* { -moz-box-sizing: border-box; /* Firefox 1, probably can drop this */ -webkit-box-sizing: border-box; /* Safari 3-4, also probably droppable */ box-sizing: border-box; /* Everything else */ } -body{ +body { font-size: 1em; } /* nav */ -nav{ +nav { width:100%; height: 3em; padding:5% 0; text-align: center; } -nav .item{ +nav .item { display: inline-block; } -nav .link{ +nav .link { color: black; margin:0 1em; font-size: 1.5em; text-decoration: none; } /* main intro */ -.main{ +.main { background-color:MediumOrchid; padding:5% 0; text-align:center; } -.main__header{ +.main__header { color:white; font-size: 5em; width:100%; } -.intro{ +.intro { color:white; font-size: 1em; line-height: 1.5em; @@ -46,14 +46,14 @@ nav .link{ margin:auto; } -.dept{ +.dept { margin: 0 auto; display: inline-block; width:100%; text-align:center; } -.dept__header{ +.dept__header { text-align: center; margin:3% 0; text-transform: uppercase; @@ -61,57 +61,57 @@ nav .link{ color:gray; } -.deptOne{ +.deptOne { padding:3%; display: inline-block; background-color: SkyBlue; } -.deptOne__header{ +.deptOne__header { color:white; font-size:1.1em; } -.deptOne__date{ +.deptOne__date { color:white; font-size: 1em; line-height: 2em; } -.deptOne__info{ +.deptOne__info { color:white; line-height: 1em; } -.deptTwo{ +.deptTwo { padding:3%; display: inline-block; background-color: LemonChiffon; } -.deptTwo__header{ +.deptTwo__header { color:gray; font-size:1.1em; } -.deptTwo__date{ +.deptTwo__date { color:gray; font-size: 1em; line-height: 2em; } -.deptTwo__info{ +.deptTwo__info { color:gray; line-height: 1em; } -.deptThree{ +.deptThree { padding:3%; display: inline-block; background-color: MediumSeaGreen; } -.deptThree__header{ +.deptThree__header { color:white; font-size:1.1em; } @@ -122,12 +122,12 @@ nav .link{ line-height: 2em; } -.deptThree__info{ +.deptThree__info { color:white; line-height: 1em; } /* form section */ -.sign-up{ +.sign-up { text-align: center; display: block; font-size: 1.25em; @@ -136,20 +136,20 @@ nav .link{ margin:10% 0; } -.sign-up__field{ +.sign-up__field { margin-top:20px; width:275px; height:35px; padding:2px; } /* feature section */ -.feature{ +.feature { text-align: center; display: block; width:100%; } -.feature__title{ +.feature__title { text-align: center; margin:3% 0; text-transform: uppercase; @@ -157,65 +157,65 @@ nav .link{ width:100%; } -.feature__header{ +.feature__header { margin-top:3px; color:gray; line-height: 1.5em; } -.feature__info{ +.feature__info { color:gray; } -.feature__one{ +.feature__one { display: inline-block; padding:1%; } -.feature__two{ +.feature__two { display: inline-block; padding:1%; } -.feature__three{ +.feature__three { height:450px; display: inline-block; padding:1%; } -.feature__four{ +.feature__four { height:450px; display: inline-block; padding:1%; } /*Grids*/ -.col_1_of_3{ +.col_1_of_3 { width: 25.25%; } -.col_1_of_4{ +.col_1_of_4 { width: 21%; } /*GO FULL WIDTH AT LESS THAN 480 PIXELS */ @media only screen and (max-width: 480px) { -.col_3_of_3{ +.col_3_of_3 { width: 100%; } -.col_1_of_3{ +.col_1_of_3 { width: 100%; } } @media only screen and (max-width: 480px) { -.col_4_of_4{ +.col_4_of_4 { width: 100%; } -.col_1_of_4{ +.col_1_of_4 { width: 100%; } }