From: Steve Sutton Date: Tue, 8 Dec 2015 16:51:10 +0000 (-0500) Subject: Update the page templates for the theme. X-Git-Tag: v1.0.0^2~105 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=1b0b405de7d8c6ec53b73c09972a86093a3e628b;p=WP-Themes%2Fstaffords.git Update the page templates for the theme. Going through and optimizing the templates. There shouldn't be any duplicating portions of the pages. Adding new template for default with no sidebar. Rename the page to full width --- diff --git a/css/app.css b/css/app.css index a2943d5..d45a5a2 100644 --- a/css/app.css +++ b/css/app.css @@ -4991,14 +4991,14 @@ blockquote, blockquote p { .vcard { display: inline-block; margin: 0 0 1.25rem 0; - border: 1px solid #DDDDDD; + border: 0 none #DDDDDD; padding: 0.625rem 0.75rem; } .vcard li { margin: 0; display: block; } .vcard .fn { font-weight: bold; - font-size: 0.9375rem; } + font-size: 0.75rem; } .vevent .summary { font-weight: bold; } @@ -8017,7 +8017,8 @@ input[type="submit"].blogbutton { margin: 0 2.5px; } .sidebar ul li a { height: 20px; - width: 20px; } + width: 20px; + margin-bottom: 10px; } .sidebar ul li a.facebook, .sidebar ul li a.tweet, .sidebar ul li a.pin, .sidebar ul li a.youtube { height: 20px; width: 20px; @@ -8051,6 +8052,19 @@ input[type="submit"].blogbutton { background-position: -120px 0; } .sidebar ul li a.youtube:hover { background-position: -120px -30px; } +.sidebar ul.vcard { + padding-left: 0px; } + .sidebar ul.vcard li { + display: block; + font-size: 0.75rem; } + .sidebar ul.vcard li.email { + display: block; } + .sidebar ul.vcard li.email a { + height: auto; + width: auto; } + .sidebar ul.vcard li.tel { + color: #a61a1d; + margin-bottom: 10px; } #sidebar { padding-top: 25px; diff --git a/functions.php b/functions.php index 25983bb..24e7243 100644 --- a/functions.php +++ b/functions.php @@ -105,9 +105,9 @@ function glm_get_header() { // echo ' id="feature-image" style="background-image: url('.$image_data[0].');height:100%;padding:0;background-position:top center;background-size:cover;background-repeat:no-repeat;min-height: 270px;max-height: 630px;"'; // } else { echo ' id="feature-image" style="background-image: url('.get_template_directory_uri().'/assets/slide-6.jpg);height:100%;padding:0;background-position:top center;background-size:cover;background-repeat:no-repeat;min-height: 270px;max-height: 630px;"'; - + echo '>'; - echo ''; + echo ''; echo '
'; echo '
'; echo '
'; @@ -140,7 +140,7 @@ function mytheme_search_loop() { add_action('thematic_searchloop', 'mytheme_search_loop'); // End of the Contextual/Highlight Search functions -add_image_size('glm_blocks', '300', '300', true); +add_image_size('glm_blocks', '257', '257', true); // needed to keep Woocommerce from constantly complaining. add_theme_support( 'woocommerce' ); -?> \ No newline at end of file +?> diff --git a/index.php b/index.php index dc27734..4f23eca 100644 --- a/index.php +++ b/index.php @@ -21,12 +21,15 @@
- - \ No newline at end of file + + diff --git a/page_art-gallery.php b/page_art-gallery.php index c68c462..833bf9b 100644 --- a/page_art-gallery.php +++ b/page_art-gallery.php @@ -4,83 +4,63 @@ Template Name: Stafford's Art Gallery */ ?> +
+ + + + + + + +
-
- - - -
-
-
-
- -
-
-
- - - -

- -
-
- -
-
+
+ +
+ +
+
+ + + + +
- -
- - - -
-
-
-
- +
+ +
+ +
+ + + + +

+
-
-
- - - -

- -
-
- + +
+ +
+ +
- - \ No newline at end of file +
+ diff --git a/page_bay-view.php b/page_bay-view.php index db6ae89..3602f7b 100644 --- a/page_bay-view.php +++ b/page_bay-view.php @@ -4,89 +4,66 @@ Template Name: Bay View Inn */ ?> +
+ + + + + + + +
-
- - - -
-
-
-
- -
-
-
- - - -

- -
-
- -
-
+
+ +
+ +
+
+ + + + + +
+
+ +
+ +
+ + + + +

+
- -
- - - -
-
-
-
- -
- -
-
- - - -

- -
-
- -
+ +
+ +
+ +
- +
+
diff --git a/page_crooked-river.php b/page_crooked-river.php index 6a34379..b5c2969 100644 --- a/page_crooked-river.php +++ b/page_crooked-river.php @@ -4,87 +4,65 @@ Template Name: Crooked River Lodge */ ?> +
+ + -
- - - -
-
-
-
- -
-
-
- - - -

- -
-
- -
-
+ + + + +
+ +
+ +
+ +
+
+ + + + + +
+
+ +
+ +
+ + + + +

+
- -
- - - -
-
-
-
- -
-
-
- - - -

- -
-
- -
+ +
+ +
+ +
- +
+
diff --git a/page_drawbridge.php b/page_drawbridge.php index b315121..55b0aa9 100644 --- a/page_drawbridge.php +++ b/page_drawbridge.php @@ -4,83 +4,59 @@ Template Name: Drawbridge Bistro */ ?> +
+ + -
- - - -
-
-
-
- -
-
-
- - - -

- -
-
- -
-
+ + + + +
+
+
+
+ + + + +
- -
- - - -
-
-
-
- +
+ +
+ +
+ + + + +

+
-
-
- - - -

- -
-
- -
+ +
+ +
+ +
- - \ No newline at end of file +
+
+ diff --git a/page_fullwidth.php b/page_fullwidth.php new file mode 100644 index 0000000..8e585ab --- /dev/null +++ b/page_fullwidth.php @@ -0,0 +1,29 @@ + + +
+ + + +
+
+
+
+ +
+
+
+ + + +

+ +
+
+
+ diff --git a/page_perry.php b/page_perry.php index 8d955da..a2c8eed 100644 --- a/page_perry.php +++ b/page_perry.php @@ -4,88 +4,66 @@ Template Name: Perry Hotel */ ?> +
+ + -
- - - -
-
-
-
- -
-
-
- - - -

- -
-
- -
-
+ + + + +
+ +
+ +
+ +
+
+ + + + + +
+
+ +
+ +
+ + + + +

+
- -
- - - -
-
-
-
- -
-
-
- - - -

- -
-
- -
+ +
+ +
+ +
- +
+
diff --git a/page_pier.php b/page_pier.php index 221c836..a1d20f8 100644 --- a/page_pier.php +++ b/page_pier.php @@ -4,88 +4,65 @@ Template Name: Pier Restaurant */ ?> +
+ + + + + + + +
-
- - - -
-
-
- -
-
-
- - - -

- -
-
- -
-
+ + +
+
+ + + + +
- -
- - - -
-
-
-
- +
+ +
+ +
+ + + + +

+
-
-
- - - -

- -
-
- -
+ +
+ +
+ +
- +
+
diff --git a/page_pointer-boat.php b/page_pointer-boat.php index 778fe67..4068775 100644 --- a/page_pointer-boat.php +++ b/page_pointer-boat.php @@ -4,88 +4,66 @@ Template Name: The Pointer Boat */ ?> +
+ + + + + + + +
-
- - - -
-
-
- -
-
-
- - - -

- -
-
- -
-
+ +
+ +
+
+ + + + +
- -
- - - -
-
-
-
- +
+ +
+ +
+ + + + +

+
-
-
- - - -

- -
-
- -
+ +
+ +
+ +
- +
+
diff --git a/page_vacation.php b/page_vacation.php index 0cc68c5..80c8fde 100644 --- a/page_vacation.php +++ b/page_vacation.php @@ -4,84 +4,63 @@ Template Name: Vacation Rentals */ ?> +
+ + + + + + + +
-
- - - -
-
-
- -
-
-
- - - -

- -
-
- -
-
+ +
+ +
+
+ + + + +
- -
- - - -
-
-
-
- +
+ +
+ + + + + +

+
-
-
- - - -

- -
-
- -
+ +
+ +
+ +
- +
+
diff --git a/page_weathervane.php b/page_weathervane.php index db44a7e..d198bc7 100644 --- a/page_weathervane.php +++ b/page_weathervane.php @@ -4,88 +4,65 @@ Template Name: Weathervane Restaurant */ ?> +
+ + + + + + + +
-
- - - -
-
-
- -
-
-
- - - -

- -
-
- -
-
+ +
+ +
+
+ + + +
- -
- - - -
-
-
-
- +
+ +
+ +
+ + + + +

+
-
-
- - - -

- -
-
- -
+ +
+ +
+ +
- +
+
diff --git a/scss/_settings.scss b/scss/_settings.scss index 2fc0552..63c5645 100644 --- a/scss/_settings.scss +++ b/scss/_settings.scss @@ -303,27 +303,27 @@ $small-font-color: scale-color($header-font-color, $lightness: 35%); // $acronym-underline: 1px dotted $gainsboro; // We use these to control padding and margin -// $microformat-padding: rem-calc(10 12); -// $microformat-margin: rem-calc(0 0 20 0); +$microformat-padding: rem-calc(10 12); +$microformat-margin: rem-calc(0 0 20 0); // We use these to control the border styles -// $microformat-border-width: 1px; -// $microformat-border-style: solid; -// $microformat-border-color: $gainsboro; +$microformat-border-width: 0; +$microformat-border-style: none; +$microformat-border-color: $gainsboro; // We use these to control full name font styles -// $microformat-fullname-font-weight: $font-weight-bold; -// $microformat-fullname-font-size: rem-calc(15); +$microformat-fullname-font-weight: $font-weight-bold; +$microformat-fullname-font-size: rem-calc(12); // We use this to control the summary font styles -// $microformat-summary-font-weight: $font-weight-bold; +$microformat-summary-font-weight: $font-weight-bold; // We use this to control abbr padding -// $microformat-abbr-padding: rem-calc(0 1); +$microformat-abbr-padding: rem-calc(0 1); // We use this to control abbr font styles -// $microformat-abbr-font-weight: $font-weight-bold; -// $microformat-abbr-font-decoration: none; +$microformat-abbr-font-weight: $font-weight-bold; +$microformat-abbr-font-decoration: none; // 01. Accordion // - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/scss/_sidebar.scss b/scss/_sidebar.scss index c62cbea..16fdb21 100644 --- a/scss/_sidebar.scss +++ b/scss/_sidebar.scss @@ -22,6 +22,7 @@ a { height: 20px; width: 20px; + margin-bottom: 10px; &.facebook, &.tweet, &.pin, &.youtube { height: 20px; @@ -69,6 +70,24 @@ } } + ul.vcard { + padding-left: 0px; + li { + display: block; + font-size: rem-calc(12); + } + li.email { + display: block; + a { + height: auto; + width: auto; + } + } + li.tel { + color: $red; + margin-bottom: 10px; + } + } } #sidebar { padding-top: 25px; @@ -203,4 +222,4 @@ } .sidebar h2 { font-size: 1.375rem; -} \ No newline at end of file +}