From 2c37e20b200307c9f08ea1aaee142cb64a8ccc18 Mon Sep 17 00:00:00 2001 From: Steven Walker Date: Mon, 16 May 2016 13:06:07 -0400 Subject: [PATCH 1/2] establishing baseline grid and other styling/typography fixes --- .../plugins/idcommerce/css/style.css | 10 +-- .../themes/backer/single-ignition_product.php | 4 +- wordpress/wp-content/themes/backer/style.css | 68 +++++++++---------- wordpress/wp-content/themes/backer/style1.css | 2 +- 4 files changed, 37 insertions(+), 47 deletions(-) diff --git a/wordpress/wp-content/plugins/idcommerce/css/style.css b/wordpress/wp-content/plugins/idcommerce/css/style.css index 8562982e..77f42ca3 100644 --- a/wordpress/wp-content/plugins/idcommerce/css/style.css +++ b/wordpress/wp-content/plugins/idcommerce/css/style.css @@ -191,8 +191,6 @@ -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; - font-weight: 400; - font-size: 19px; padding: 11px 19px; margin: 8px auto; background-color: #fbfbfb; @@ -352,7 +350,7 @@ .md-requiredlogin #backtoblog { padding: 12px 16px 0; } .md-requiredlogin form .input, .md-requiredlogin input[type="text"] { - font-size: 19px; + line-height: 21px; padding: 13px 0; color: #1b93b3; @@ -837,11 +835,8 @@ float: right; margin-top: -8px; } .memberdeck form .form-row input, .memberdeck form .form-row textarea { - font-size: 19px; - line-height: 21px; padding: 8px; height: inherit; - color: #134755; display: block; border: 1px solid rgba(42, 42, 42, 0.7); width: 100%; @@ -1087,7 +1082,6 @@ margin-top: 13px; text-align: center; color: #2B95B2; - font-family: "ignitiondeck-font-1" !important; font-style: normal !important; font-weight: normal !important; font-variant: normal !important; @@ -1387,7 +1381,7 @@ padding: 25px; border-radius: 6px; border: 2px solid transparent; - font-family: 'Open Sans'; } + } .idc-social-sharing-box .social-sharing-options-wrapper h2 { color: #364d65; font-size: 25px; diff --git a/wordpress/wp-content/themes/backer/single-ignition_product.php b/wordpress/wp-content/themes/backer/single-ignition_product.php index 6a656c02..e5168be8 100644 --- a/wordpress/wp-content/themes/backer/single-ignition_product.php +++ b/wordpress/wp-content/themes/backer/single-ignition_product.php @@ -54,7 +54,7 @@
-

About this project

+

About this project

New Mt. Zion Baptist Church is not heated adequately in the winter due to an cient boiler. This project will resolve these heating issues by upgrading the boiler to a Weil McLain Commercial Boiler. An energy management system will be installed to increase the energy efficiency of the heating and cooling systems.

@@ -157,7 +157,7 @@
-

Comments

+

Comments

diff --git a/wordpress/wp-content/themes/backer/style.css b/wordpress/wp-content/themes/backer/style.css index 3d999a78..15d7c44f 100644 --- a/wordpress/wp-content/themes/backer/style.css +++ b/wordpress/wp-content/themes/backer/style.css @@ -57,19 +57,21 @@ html[xmlns] .clearfix, .row-fluid { url("font/MuseoSansRounded-500.otf") format('opentype'); font-weight: normal; } - +html, +body { + height: 100%; + width: 100%; + margin: 0; + padding: 0; + left: 0; + top: 0; + font-size: 16px; + font-family: "Museo500",'Helvetica Neue', Helvetica, Arial, sans-serif; + background: #F4F4F4; +} html { - background: #f8f8f8; overflow-x: hidden; } -body { - font-family: "Museo500",'Helvetica Neue', Helvetica, Arial, sans-serif; - color: #5a5a5a; - font-size: 16px; - line-height: 24px; - font-weight: 500; - background: #f8f8f8; -} html:not(.ie8) body { overflow-x: hidden; } @@ -160,35 +162,43 @@ iframe { /* ------------------------ ----- Typography ----- ------------------------------*/ - +h1, h2, h3, h4, h5, h6, p { + margin-bottom: 22px; +} h1 { font-size: 2.5rem; + line-height: .55rem; } h2 { font-size: 2rem; + line-height: .675rem; + } h3 { font-size: 1.375rem; + line-height: 1rem; } h4 { font-size: 1.125rem; + line-height: 1.222rem; } h5 { font-size: 1rem; + line-height: 1.375rem; } h6 { font-size: 0.875rem; + line-height: 1.5714285714rem; } p { - font-size: 1.125rem; - font-weight: 200; - line-height: 1.8; + font-size: 1rem; + line-height: 1.375rem; } a { @@ -208,10 +218,6 @@ h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { font-weight: inherit; } -p { - margin-bottom: 24px; -} - strong { font-weight: 700; } @@ -425,6 +431,11 @@ blockquote p:first-child { margin-bottom: 0; } +input, textarea, select { + font-size: 1rem; + line-height: 1.375rem +} + /* --------------------------------------------------------------------------------- ------------------------------ HEADER ---------------------------------- ------------------------------------------------------------------------------------*/ @@ -626,17 +637,7 @@ body.sticky-header #footer1 { .top-menu > li:first-child { margin-left: 0; } -.top-menu > li > a { - font-weight: 600; - font-size: 15px; - line-height: 15px; - border-bottom: 2px solid transparent; - color: #1b1b1b; - padding: 4px 0; -} -.top-menu > li:hover > a { - border-bottom-color: #1b1b1b; -} + .top-menu li.green > a { color: #55AE57; } @@ -837,7 +838,6 @@ input.wysija-submit[type="submit"] { right: 0; top: 0; width: 43px !important; - font-size: 17px; } .footer .widget ul li.current-cat a, .footer .widget ul li.current_page_item a { @@ -2952,23 +2952,19 @@ form { .memberdeck form, .ignitiondeck form { font-weight: 500; } + + input, textarea, select, .memberdeck form .form-row input, .memberdeck form .form-row textarea, .memberdeck form .form-row select, .ignitiondeck form .form-row input, .ignitiondeck form .form-row textarea, .ignitiondeck form .form-row select, .wp-editor-container, .md-requiredlogin form .input { background: #fff; border: 1px solid #eaeaea; padding: 12px 17px; - font-size: 14px; - line-height: 22px; - color: #ccc; - font-weight: 500; border-radius: 5px; width: 100%; - font-family: "MuseoSansW01-Rounded500", 'Helvetica Neue', Helvetica, Arial, sans-serif; display: inline-block; resize: none; height: auto; margin: 0 0 40px 0; box-shadow: none !important; - border-radius: 5px; text-indent: 0; } p input { margin-bottom: 0; diff --git a/wordpress/wp-content/themes/backer/style1.css b/wordpress/wp-content/themes/backer/style1.css index 1059f423..a8d3c41d 100644 --- a/wordpress/wp-content/themes/backer/style1.css +++ b/wordpress/wp-content/themes/backer/style1.css @@ -45,7 +45,7 @@ body{ margin:0; padding:0; font-size:100%; color:#898989; font-size:15px; font-f #main-content .content-wrap .box-1 .list > li a{color:#898989; font-weight:600;} #main-content .content-wrap .box-1 .list > li i {padding-right: 10px; font-size:24px; color:#ccc; font-weight:normal;} -#main-content .content-wrap .about-box h1{ font-size:24px; margin:0;} + #main-content .content-wrap .about-box{padding:40px 0; } #main-content .content-wrap .about-box .entry-title{margin-top:0;} -- GitLab From 70b7c1e5788778c30ddb238d5fb9a2bf75e58a56 Mon Sep 17 00:00:00 2001 From: Steven Walker Date: Mon, 16 May 2016 15:00:36 -0400 Subject: [PATCH 2/2] more styling improvements --- .../themes/backer/single-ignition_product.php | 18 +++---- wordpress/wp-content/themes/backer/style.css | 20 +++++--- wordpress/wp-content/themes/backer/style1.css | 49 +++++++++++++------ 3 files changed, 54 insertions(+), 33 deletions(-) diff --git a/wordpress/wp-content/themes/backer/single-ignition_product.php b/wordpress/wp-content/themes/backer/single-ignition_product.php index e5168be8..a24a8527 100644 --- a/wordpress/wp-content/themes/backer/single-ignition_product.php +++ b/wordpress/wp-content/themes/backer/single-ignition_product.php @@ -44,7 +44,7 @@

Church of God Saint Michaels

-

Brook lyn, NY

+

Brooklyn, NY

New Mt. Zion Baptist Church is not heated adequately in the winter due to an cient boiler. This project will resolve these heating issues by upgrading the boiler to a Weil McLain Commercial Boiler.

  • ABOUT
  • @@ -79,7 +79,7 @@

    Who is installing?

-
+

Bill’s Heating

3234 Flushing Ave.

Brooklyn, NY 11223

@@ -96,10 +96,10 @@
    -
  • April 2016 Funds collected
  • -
  • May 2016 LED lighting installed
  • -
  • August 2016 Insulation and new boiler installed
  • -
  • September 2016 Project complete
  • +
  • April 2016

    Funds collected

  • +
  • May 2016

    >LED lighting installed

  • +
  • August 2016

    Insulation and new boiler installed

  • +
  • September 2016

    Project complete

@@ -216,14 +216,14 @@