Skip to content
This repository has been archived by the owner on Mar 3, 2022. It is now read-only.

Simple rename #24

Open
wants to merge 2 commits into
base: 7.x-3.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions README.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
FortyFour
thinskin
=========

FortyFour powers whitehouse.gov. At the time of this writing, this is the
website of the FortyFourth president.
ThinSkin powers whitehouse.gov. At the time of this writing, this is the
website of the ThinSkined president.

We called it thin skin because it is a light weight responsive theme based off
Zen.

Dependencies
------------

- SixteenHundred: A SASS library developed for whitehouse.gov (named after 1600 Pennsylvania Avenue)
- SixteenHundredNav: Provides menu_block based menus like block-menu-block-sixteenhundrednav-main
- Panels: The 7.x-3.x branch of FortyFour is made for a Panels/Panelizer-based
- Panels: The 7.x-3.x branch of ThinSkin is made for a Panels/Panelizer-based
site and delegates most page layouts and node layouts to Panels
2 changes: 1 addition & 1 deletion css/styles.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions sass/_mixins.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @file
// This is a placeholder for fortyfour-specific custom mixins.
// This is a placeholder for thinskin-specific custom mixins.
//
// WAIT! Before you add anything, ask yourself if the mixin belongs in the
// sixteenhundred library. Mixins added there are available to both the theme
// and other modules in this code base.
// and other modules in this code base.
32 changes: 16 additions & 16 deletions sass/components/_buttons.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Use mixins from sixteenhundred to build button classes for use in the
// fortyfour in the theme.
// thinskin in the theme.

.btn {
@include btn;
Expand Down Expand Up @@ -51,44 +51,44 @@
}

.btn-facebook, .btn-blue-facebook {
@include gradient-button($btn-color-top, $btn-color-bottom, $btn-hover, "fortyfour/social-icons/fb_btn_icon2.png");
@include gradient-button($btn-color-top, $btn-color-bottom, $btn-hover, "thinskin/social-icons/fb_btn_icon2.png");
}
.btn-twitter, .btn-blue-twitter {
@include gradient-button($btn-color-top, $btn-color-bottom, $btn-hover, "fortyfour/social-icons/twt_btn_icon2.png");
@include gradient-button($btn-color-top, $btn-color-bottom, $btn-hover, "thinskin/social-icons/twt_btn_icon2.png");
}
.btn-dark-blue-facebook {
@include gradient-button(#369, #036, #036, "fortyfour/social-icons/fb_btn_icon2.png");
@include gradient-button(#369, #036, #036, "thinskin/social-icons/fb_btn_icon2.png");
}
.btn-dark-blue-twitter {
@include gradient-button(#369, #036, #036, "fortyfour/social-icons/twt_btn_icon2.png");
@include gradient-button(#369, #036, #036, "thinskin/social-icons/twt_btn_icon2.png");
}
.btn-red-facebook {
@include gradient-button(#b60000, #880000, #7e0000, "fortyfour/social-icons/fb_btn_icon2.png");
@include gradient-button(#b60000, #880000, #7e0000, "thinskin/social-icons/fb_btn_icon2.png");
}
.btn-red-twitter {
@include gradient-button(#b60000, #880000, #7e0000, "fortyfour/social-icons/twt_btn_icon2.png");
@include gradient-button(#b60000, #880000, #7e0000, "thinskin/social-icons/twt_btn_icon2.png");
}
.btn-gold-facebook {
@include gradient-button(#b9884e, #65400a, #65400a, "fortyfour/social-icons/fb_btn_icon2.png");
@include gradient-button(#b9884e, #65400a, #65400a, "thinskin/social-icons/fb_btn_icon2.png");
}
.btn-gold-twitter {
@include gradient-button(#b9884e, #65400a, #65400a, "fortyfour/social-icons/twt_btn_icon2.png");
@include gradient-button(#b9884e, #65400a, #65400a, "thinskin/social-icons/twt_btn_icon2.png");
}
.btn-green-facebook {
@include gradient-button(#76b100, #669900, #5e8d00, "fortyfour/social-icons/fb_btn_icon2.png");
@include gradient-button(#76b100, #669900, #5e8d00, "thinskin/social-icons/fb_btn_icon2.png");
}
.btn-green-twitter {
@include gradient-button(#76b100, #669900, #5e8d00, "fortyfour/social-icons/twt_btn_icon2.png");
@include gradient-button(#76b100, #669900, #5e8d00, "thinskin/social-icons/twt_btn_icon2.png");
}
.btn-dark-gray-facebook {
@include gradient-button(#5b5b5b, #2e2e2e, #949494, "fortyfour/social-icons/fb_btn_icon2.png");
@include gradient-button(#5b5b5b, #2e2e2e, #949494, "thinskin/social-icons/fb_btn_icon2.png");
}
.btn-dark-gray-twitter {
@include gradient-button(#5b5b5b, #2e2e2e, #949494, "fortyfour/social-icons/twt_btn_icon2.png");
@include gradient-button(#5b5b5b, #2e2e2e, #949494, "thinskin/social-icons/twt_btn_icon2.png");
}
.btn-light-gray-facebook {
@include gradient-button(#a8a8a8, #8a8a8a, #c8c8c8, "fortyfour/social-icons/fb_btn_icon2.png");
@include gradient-button(#a8a8a8, #8a8a8a, #c8c8c8, "thinskin/social-icons/fb_btn_icon2.png");
}
.btn-light-gray-twitter {
@include gradient-button(#a8a8a8, #8a8a8a, #c8c8c8, "fortyfour/social-icons/twt_btn_icon2.png");
}
@include gradient-button(#a8a8a8, #8a8a8a, #c8c8c8, "thinskin/social-icons/twt_btn_icon2.png");
}
4 changes: 2 additions & 2 deletions sass/components/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

.whr-header-bg {
background: white image-url('fortyfour/bg/wh_header_decor_desktop_large_format.png') no-repeat center top;
background: white image-url('thinskin/bg/wh_header_decor_desktop_large_format.png') no-repeat center top;
// One off breakpoint to keep the background positioned correctly.
@include breakpoint(445px) {
background-position: center -62px;
Expand Down Expand Up @@ -96,7 +96,7 @@
}
.whr-contact-nav--horizontal-1-level-menu--menu-item a {
padding-right: 10px;
background: image-url('fortyfour/sprites/contact-nav-icons.png') no-repeat right top;
background: image-url('thinskin/sprites/contact-nav-icons.png') no-repeat right top;
font-family: $whitney;
font-size: 0.923em; // 12px / 13px.
font-weight: bold;
Expand Down
2 changes: 1 addition & 1 deletion sass/sixteenhundred/stylesheets/variables/_colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ $gray40: #666;
$gray70: #565656;
$gray80: #353535;

/* Colors from 6.x fortyfour */
/* Colors from 6.x thinskin */
$link-color: #336699;
$dark-blue: #002654;
$gray: #434343;
Expand Down
22 changes: 11 additions & 11 deletions template.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
* The name of the template being rendered ("maintenance_page" in this case.)
*/
/* -- Delete this line if you want to use this function
function fortyfour_preprocess_maintenance_page(&$variables, $hook) {
function thinskin_preprocess_maintenance_page(&$variables, $hook) {
// When a variable is manipulated or added in preprocess_html or
// preprocess_page, that same work is probably needed for the maintenance page
// as well, so we can just re-use those functions to do that work here.
fortyfour_preprocess_html($variables, $hook);
fortyfour_preprocess_page($variables, $hook);
thinskin_preprocess_html($variables, $hook);
thinskin_preprocess_page($variables, $hook);
}
// */

Expand All @@ -35,7 +35,7 @@ function fortyfour_preprocess_maintenance_page(&$variables, $hook) {
* The name of the template being rendered ("html" in this case.)
*/
/* -- Delete this line if you want to use this function
function fortyfour_preprocess_html(&$variables, $hook) {
function thinskin_preprocess_html(&$variables, $hook) {
$variables['sample_variable'] = t('Lorem ipsum.');

// The body tag's classes are controlled by the $classes_array variable. To
Expand All @@ -52,7 +52,7 @@ function fortyfour_preprocess_html(&$variables, $hook) {
* @param $hook
* The name of the template being rendered ("page" in this case.)
*/
function fortyfour_preprocess_page(&$variables, $hook) {
function thinskin_preprocess_page(&$variables, $hook) {
if (isset($variables['node'])) {
// Tell the template whether the node is panelizer-controlled.
$variables['page_manager_control'] = isset($variables['node']->panelizer_view_mode) ? $variables['node']->panelizer_view_mode : NULL;
Expand All @@ -73,11 +73,11 @@ function fortyfour_preprocess_page(&$variables, $hook) {
* The name of the template being rendered ("node" in this case.)
*/
/* -- Delete this line if you want to use this function
function fortyfour_preprocess_node(&$variables, $hook) {
function thinskin_preprocess_node(&$variables, $hook) {
$variables['sample_variable'] = t('Lorem ipsum.');

// Optionally, run node-type-specific preprocess functions, like
// fortyfour_preprocess_node_page() or fortyfour_preprocess_node_story().
// thinskin_preprocess_node_page() or thinskin_preprocess_node_story().
$function = __FUNCTION__ . '_' . $variables['node']->type;
if (function_exists($function)) {
$function($variables, $hook);
Expand All @@ -94,7 +94,7 @@ function fortyfour_preprocess_node(&$variables, $hook) {
* The name of the template being rendered ("comment" in this case.)
*/
/* -- Delete this line if you want to use this function
function fortyfour_preprocess_comment(&$variables, $hook) {
function thinskin_preprocess_comment(&$variables, $hook) {
$variables['sample_variable'] = t('Lorem ipsum.');
}
// */
Expand All @@ -108,7 +108,7 @@ function fortyfour_preprocess_comment(&$variables, $hook) {
* The name of the template being rendered ("region" in this case.)
*/
/* -- Delete this line if you want to use this function
function fortyfour_preprocess_region(&$variables, $hook) {
function thinskin_preprocess_region(&$variables, $hook) {
// Don't use Zen's region--sidebar.tpl.php template for sidebars.
//if (strpos($variables['region'], 'sidebar_') === 0) {
// $variables['theme_hook_suggestions'] = array_diff($variables['theme_hook_suggestions'], array('region__sidebar'));
Expand All @@ -125,7 +125,7 @@ function fortyfour_preprocess_region(&$variables, $hook) {
* The name of the template being rendered ("block" in this case.)
*/
/* -- Delete this line if you want to use this function
function fortyfour_preprocess_block(&$variables, $hook) {
function thinskin_preprocess_block(&$variables, $hook) {
// Add a count to all the blocks in the region.
// $variables['classes_array'][] = 'count-' . $variables['block_id'];

Expand All @@ -145,7 +145,7 @@ function fortyfour_preprocess_block(&$variables, $hook) {
* @param $hook
* The name of the template being rendered ("block" in this case.)
*/
function fortyfour_preprocess_fieldable_panels_pane(&$variables, $hook) {
function thinskin_preprocess_fieldable_panels_pane(&$variables, $hook) {
$theme_hook_suggestions = $variables['theme_hook_suggestions'];

// Determine if this is a featured content fieldable panel pane.
Expand Down
2 changes: 1 addition & 1 deletion templates/html.tpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<?php print $styles; ?>
<!--[if lte IE 9]>
<link href="<?php print $base_path; ?>sites/whitehouse.gov/themes/forall/fortyfour/css/ie9.css" rel="stylesheet" type="text/css">
<link href="<?php print $base_path; ?>sites/whitehouse.gov/themes/forall/thinskin/css/ie9.css" rel="stylesheet" type="text/css">
<![endif]-->
<?php print $scripts; ?>
<?php if ($add_html5_shim and !$add_respond_js): ?>
Expand Down
2 changes: 1 addition & 1 deletion templates/page.tpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* This is a "single region" page template, delegating responsibility for layout
* to Panels layout plugins, node template files (where not panelized), and custom page callbacks.
*
* Available variables provided by FortyFour:
* Available variables provided by ThinSkin:
* - $page_manager_control: NULL if not under Page Manager (Panels) control. Not
* NULL if controlled by Panels. NOTE: The assumption here is that pages under
* Page Manager control will include things like $tabs and $messages via
Expand Down
8 changes: 4 additions & 4 deletions theme-settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @param $form_state
* A keyed array containing the current state of the form.
*/
function fortyfour_form_system_theme_settings_alter(&$form, &$form_state, $form_id = NULL) {
function thinskin_form_system_theme_settings_alter(&$form, &$form_state, $form_id = NULL) {
// Work-around for a core bug affecting admin themes. See issue #943212.
if (isset($form_id)) {
return;
Expand All @@ -16,10 +16,10 @@ function fortyfour_form_system_theme_settings_alter(&$form, &$form_state, $form_
// Create the form using Forms API: http://api.drupal.org/api/7

/* -- Delete this line if you want to use this setting
$form['fortyfour_example'] = array(
$form['thinskin_example'] = array(
'#type' => 'checkbox',
'#title' => t('fortyfour sample setting'),
'#default_value' => theme_get_setting('fortyfour_example'),
'#title' => t('thinskin sample setting'),
'#default_value' => theme_get_setting('thinskin_example'),
'#description' => t("This option doesn't do anything; it's just an example."),
);
// */
Expand Down
File renamed without changes.