From b95fae049b9d0f25d9c173eb43e422ade2b6f693 Mon Sep 17 00:00:00 2001 From: jordan Date: Sat, 21 Jan 2012 19:05:20 -0500 Subject: [PATCH] minor cleaning on lectures page and lecture page, fixed links on home page --- .vimrc | 4 + public/assets/css/screen.css | 60 ++++++----- public/assets/css/scss/partials/_mixins.scss | 5 + public/assets/css/scss/partials/_pages.scss | 41 ++++++-- public/assets/css/scss/screen.scss | 20 ++++ public/assets/img/dotted-y.png | Bin 0 -> 1010 bytes public/index.html | 99 +++++++++++-------- public/javascripts/main.js | 2 + 8 files changed, 156 insertions(+), 75 deletions(-) create mode 100644 .vimrc create mode 100644 public/assets/img/dotted-y.png diff --git a/.vimrc b/.vimrc new file mode 100644 index 0000000..b949622 --- /dev/null +++ b/.vimrc @@ -0,0 +1,4 @@ +set tabstop=2 +set shiftwidth=2 +set softtabstop=2 + diff --git a/public/assets/css/screen.css b/public/assets/css/screen.css index 6d73d29..cad05e3 100755 --- a/public/assets/css/screen.css +++ b/public/assets/css/screen.css @@ -57,7 +57,7 @@ Please have a look around, I hope you enjoy your stay. margin-left: 1.705%; margin-right: 1.705%; } -.grid-3, #g-logo { +.grid-3, .sidebar, #g-logo { float: left; width: 34.091%; padding: 0; @@ -71,7 +71,7 @@ Please have a look around, I hope you enjoy your stay. margin-left: 1.705%; margin-right: 1.705%; } -.grid-5, #g-nav-main { +.grid-5, #g-nav-main, #pg_lectures .main-content { float: left; width: 59.091%; padding: 0; @@ -92,14 +92,14 @@ Please have a look around, I hope you enjoy your stay. margin-left: 1.705%; margin-right: 1.705%; } -.grid-8, #g-nav-user, #g-masthead-hr, .breadcrumb, .subheader, .main-content, #g-footer, #intro-schools { +.grid-8, #g-nav-user, #g-masthead-hr, .breadcrumb, .subheader, .main-content, #g-footer, #messages, #intro-schools { float: left; width: 96.591%; padding: 0; margin-left: 1.705%; margin-right: 1.705%; } -.futura, .futura-oblique, .breadcrumb .location, #schools .number_of_courses, #schools .number_of_notes, #pg_courses .course .course-data-number, .futura-light, h1, .subheader h2, .futura-light-oblique, .futura-bold, .link-bar a, body, p, #g-masthead, #pg_home h1 { +.futura, .futura-oblique, .breadcrumb .location, #schools .number_of_courses, #schools .number_of_notes, #pg_courses .course .course-data-number, .futura-light, h1, .subheader h2, .futura-light-oblique, .futura-bold, .info, .error, .link-bar a, body, p, #g-masthead, #pg_home h1 { font-family: "futura-pt", "Helvetica Neue", "Helvetica", "Arial", sans-serif; font-weight: 500; -webkit-font-smoothing: antialiased; } @@ -114,7 +114,7 @@ Please have a look around, I hope you enjoy your stay. font-style: italic; font-weight: 300; } -.futura-bold, .link-bar a { +.futura-bold, .info, .error, .link-bar a { font-weight: 700; } body { @@ -143,7 +143,7 @@ body { line-height: 1.5em; /* 24 */ } -.big, p, #g-nav-main a, .breadcrumb { +.big, h4, p, #g-nav-main a, .breadcrumb, #pg_lectures .lecture-name { /* 18px / 24px */ font-size: 1.125em; line-height: 1.333em; } @@ -500,6 +500,15 @@ body { .centered-rt-parent { margin: 0 auto; } +.light { + color: #444; } + +.info { + color: #6bcf77; } + +.error { + color: #b7300b; } + /* A.Sprites ---------------------------------------------------------------- @@ -627,14 +636,19 @@ body { [Table of contents] - 0.Home - 1.Schools - 2.Courses - 3.Course - 4.Legal + 0.General + 1.Home + 2.Schools + 3.Courses + 4.Course ----------------------------------------------------------------*/ -/* 0.`Home +/* 0.`General +---------------------------------------------- */ +#messages { + padding: 0.75em; } + +/* 1.`Home ---------------------------------------------- */ #pg_home .subheader { text-align: center; @@ -659,7 +673,7 @@ body { height: 2px; background-color: #999; } -/* 1.`Schools +/* 2.`Schools ---------------------------------------------- */ #schools a { display: block; @@ -688,7 +702,7 @@ body { #schools .number_of_courses, #schools .number_of_notes { color: #999; } -/* 2.`Courses +/* 3.`Courses ---------------------------------------------- */ #pg_courses .course { position: relative; @@ -723,8 +737,15 @@ body { #pg_courses .course .course-data-description { margin-top: -0.5em; } -/* 3.`Course +/* 4.`Course ---------------------------------------------- */ +#pg_lectures .lecture { + padding-bottom: 0.75em; + margin-bottom: 1em; + background-image: url("../img/dotted-x.png"); + background-position: bottom; + background-repeat: repeat-x; } + .link-bar { margin-left: -0.375em; } .link-bar li { @@ -753,14 +774,5 @@ body { .schools em { margin: 0 auto; } -/* 4. Legal ----------------------------------------------- */ - -#pg_legal .subheader { - text-align: center; - padding: 3em 0; } -#pg_legal .section-home { - margin-bottom: 1.5em; } - /* media queries ============================================== */ diff --git a/public/assets/css/scss/partials/_mixins.scss b/public/assets/css/scss/partials/_mixins.scss index 9cc0509..2952bae 100755 --- a/public/assets/css/scss/partials/_mixins.scss +++ b/public/assets/css/scss/partials/_mixins.scss @@ -36,6 +36,11 @@ background-repeat: repeat-x; } +@mixin dotted-y($position: left) { + background-image: url('../img/dotted-y.png'); + background-position: $position; + background-repeat: repeat-y; +} // css3 diff --git a/public/assets/css/scss/partials/_pages.scss b/public/assets/css/scss/partials/_pages.scss index 133ee26..1d05d36 100644 --- a/public/assets/css/scss/partials/_pages.scss +++ b/public/assets/css/scss/partials/_pages.scss @@ -2,15 +2,23 @@ [Table of contents] - 0.Home - 1.Schools - 2.Courses - 3.Course + 0.General + 1.Home + 2.Schools + 3.Courses + 4.Course ----------------------------------------------------------------*/ +/* 0.`General +---------------------------------------------- */ + +#messages { + @extend .grid-8; + padding: $base/2; +} -/* 0.`Home +/* 1.`Home ---------------------------------------------- */ #pg_home { @@ -63,7 +71,7 @@ } -/* 1.`Schools +/* 2.`Schools ---------------------------------------------- */ #schools { @@ -113,7 +121,7 @@ } } -/* 2.`Courses +/* 3.`Courses ---------------------------------------------- */ #pg_courses { @@ -171,5 +179,22 @@ } } -/* 3.`Course +/* 4.`Course ---------------------------------------------- */ + +#pg_lectures { + + .main-content { + @extend .grid-5; + } + + .lecture { + padding-bottom: $base/2; + margin-bottom: $base/1.5; + @include dotted-x( bottom ); + } + + .lecture-name { + @extend .big; + } +} diff --git a/public/assets/css/scss/screen.scss b/public/assets/css/scss/screen.scss index 21d3869..3cd1d5b 100755 --- a/public/assets/css/scss/screen.scss +++ b/public/assets/css/scss/screen.scss @@ -70,6 +70,10 @@ h3 { @extend .large; } +h4 { + @extend .big; +} + a { @include transition( color ); color: $mustard; @@ -124,6 +128,9 @@ body { background-position: 20% 0; } +.sidebar { + @extend .grid-3; +} /* a.`header @@ -420,6 +427,19 @@ body { .centered { text-align: center;} .centered-rt-parent { margin: 0 auto;} +.light { + color: #444; +} + +.info { + @extend .futura-bold; + color: #6bcf77; +} + +.error { + @extend .futura-bold; + color: #b7300b; +} @import "partials/sprites"; // A @import "partials/pages"; // B diff --git a/public/assets/img/dotted-y.png b/public/assets/img/dotted-y.png new file mode 100644 index 0000000000000000000000000000000000000000..44743041fdbe6c4a8e9955f66fa626ba1c7a95d3 GIT binary patch literal 1010 zcmbVLJ#W)M7&Zh|5YdGVrjs+U5c}>D+p$$sC3Z}M>QbeV$QZ}IBvxvlu`k5!RIxF! z@dubeh?N0W7#Z1_`3dEm#DyX1fMxscy?dYM{eFFX^kldCpehK$ZtuYE^YsS*s<(Ie zfAORFlrQ&LcgRlYge|?42@#5=ZWXf2?Jv?4P#UM{rQUs!oU=tD=u^si_F4<^OT&N9}WETxvvM}{$sG08=N2_ z%maCJ8fQjsiYs1&?~7wu1S=IbH^sG6L-!b1G$lZhVBLo*1S*nHqp4}yBY+`-GQ={% zb)*>$Y(NM$kI1d1!Nlm>&c+s(OmW6oV#xAxxs;X-iKbH->AGHUU|i=K_3SKWUS5y0 zTFGFO%umCFg){~Qqc^4tW{TX?bqG=7x>v+;wn-FEnVfrxj3g*WQ4!ZlJ7azF*Nv^( z+2AZ8a-U>$k@~zIlUfPpxx3y_p~$^4o~0o#ig#*Le-V+G^=wn*H&PG=h68oWvYRd4 z!cc7?)Y6dCcA(R>kYi~rz2w-2wQUEr)vkga)J6R5XjpetRcRol32~=WVtaAMyx1qD z-H_YeV4K%s4J#!cqv?Rs)3O7OXOz)wMiXG2D8TjnFfQbxJnLv}l7=ry;G{GHtNa?_ z7W;Y&J5bSJL&tb~+-q#`KRJ`RGjh=!|1?W^#5=IqUbQ|Ku7-!id}2~Q8lT?0f5^v5 z?Ah%>{&PGUjo{?wy}O5(mzUFvk6&-qYPE`b=R&9m@4oL?@Yma7qJ>`f$o|k7z4`+a CUo
-
__msg__
+
+
__msg__
+