Permalink
Browse files

light house tickets + external header start, skin file variable addit…

…ions
  • Loading branch information...
1 parent 2c751c1 commit 271db08e4f23174dadb07064ea21b797284dc6c9 Seth committed Jan 12, 2012
@@ -20,7 +20,6 @@ h1, h2, h3, h4
color: $primary-header-color
&:hover
color: scale-color($primary-header-color, $lightness: -50%)
- text-decoration: none
h5
color: $secondary-header-color
a
@@ -45,6 +44,7 @@ h5
font-weight: normal
h6
color: $tertiary-header-color
+ font-family: $primary-body-font
font-size: $h6-size
font-weight: normal
// text
@@ -163,8 +163,8 @@ p
padding: 8px 10px 0
// dropdowns
> ul
- background-color: scale-color($primary-tab-off, $lightness: -20%)
- border: 1px solid scale-color($primary-tab-off, $lightness: $tab-border-lightness)
+ background-color: scale-color($primary-tab-off, $lightness: $tab-bg-lightness)
+ border: 1px solid scale-color(scale-color($primary-tab-off, $lightness: $tab-bg-lightness), $lightness: $tab-border-lightness)
box-shadow: $box-shadow
display: none
float: none
@@ -184,16 +184,16 @@ p
font-size: $primary-body-size
padding: 5px 10px
white-space: nowrap
- text-shadow: 1px 1px 1px scale-color($primary-tab-off, $lightness: $tab-border-lightness)
+ text-shadow: 1px 1px 1px scale-color($primary-tab-off, $lightness: -20%)
&:hover
- background-color: $primary-tab-off
+ background-color: scale-color($primary-tab-off, $lightness: $tab-hover-lightness)
text-decoration: none
// Secondary Navigation
#secondary-navigation
+grid(12)
- border-bottom: 1px solid scale-color($primary-tab-off, $lightness: -20%)
+ border-bottom: 1px solid scale-color($primary-tab-off, $lightness: $tab-border-lightness)
height: 22px
margin-bottom: 20px
// tabs
@@ -216,16 +216,18 @@ p
&.selected
> a
border: 1px solid scale-color($primary-tab-off, $lightness: $tab-border-lightness)
- border-bottom: 0
+ border-bottom-width: 0
background-color: $primary-tab-on
color: #666
text-decoration: none
text-shadow: none
&:hover
background-color: $primary-tab-on
+ border-bottom-width: 0
text-decoration: none
&:hover
- background-color: scale-color($primary-tab-off, $lightness: -20%)
+ > a
+ background-color: scale-color($primary-tab-off, $lightness: $tab-bg-lightness)
> ul > li > a
background-color: $primary-tab-off
border: 1px solid scale-color($primary-tab-off, $lightness: $tab-border-lightness)
@@ -234,9 +236,11 @@ p
display: block
font-weight: bold
text-decoration: none
- text-shadow: 1px 1px 1px scale-color($primary-tab-off, $lightness: -40%)
+ text-shadow: 1px 1px 1px scale-color($primary-tab-off, $lightness: -20%)
&:hover
- background-color: scale-color($primary-tab-off, $lightness: -20%)
+ border: 1px solid scale-color(scale-color($primary-tab-off, $lightness: $tab-bg-lightness), $lightness: $tab-border-lightness)
+ border-bottom-width: 0
+ background-color: scale-color($primary-tab-off, $lightness: $tab-bg-lightness)
@@ -331,6 +335,7 @@ p
bottom: -1px
> h2
color: $tertiary-header-color
+ font-family: $primary-body-font
font-size: 12px
font-weight: normal
margin-bottom: 0
@@ -1108,6 +1113,7 @@ p
width: 250px
.ad_300
width: 300px
+ border: 0
.ad_336
width: 336px
.ad_468
@@ -1575,6 +1581,16 @@ body div.jGrowl div.jGrowl-closer
padding: $ninesixty_gutter_width / 2 0 0 0
fieldset
margin-bottom: $ninesixty_gutter_width / 2
+ &.share-story-input
+ +grid(6)
+ +alpha()
+ &.share-story-submit
+ padding: 0
+ border: 0
+ +grid(2)
+ +omega()
+ input
+ margin: 0
.post-input-wrap
+grid(5)
+omega()
@@ -1614,3 +1630,33 @@ body div.jGrowl div.jGrowl-closer
padding: 10px 0
text-align: center
+
+// External Header Widget
+#external-header-wrap
+ background: $tertiary-bg-color
+ border: 1px solid scale-color($tertiary-bg-color, $lightness: -20%)
+ border-bottom: 2px solid $primary-border-color
+ #external-header
+ float: left
+ background: $primary-bg-color
+ border-right: 1px solid scale-color($primary-bg-color, $lightness: -10%)
+ height: 70px
+ min-width: 100px
+ padding: 10px 10px 10px 80px
+ .site-icon
+ height: 60px
+ width: 60px
+ border: 1px solid scale-color($primary-bg-color, $lightness: -30%)
+ float: left
+ margin-left: -70px
+ img
+ width: 100%
+ #external-details
+ border-left: 1px solid scale-color($tertiary-bg-color, $lightness: -20%)
+ float: left
+ height: 70px
+ min-width: 380px
+ padding: 10px
+ .add-this-wrap
+ padding: 10px 0
+
@@ -25,6 +25,8 @@ $tertiary-link-color: #2462E2
$primary-tab-off: #3B5998
$primary-tab-on: #FFFFFF
$tab-border-lightness: -35%
+$tab-bg-lightness: -20%
+$tab-hover-lightness: 20%
// Button Colors
$primary-btn: #3B5998
$secondary-btn: #428519
@@ -1,4 +1,8 @@
+
+
+
#full-col
+ = render :partial => 'shared/tests/external_header'
= render :partial => 'shared/tests/featured_3_col'
#left-col
= render :partial => 'shared/tests/featured_2_col'
@@ -34,7 +34,7 @@
= link_to t('footer.setup_twitter', :setup_twitter_path => admin_twitter_settings_path, :learn_more_path => "http://support.newscloud.com/kb/configuring-your-application/how-to-configure-twitter-anywhere" ).html_safe
- else
%span.twt_ft_wrap
- %a.twitter-follow-button{:href => base_twitter_url(account_setting.value), "data-width" => "200px", "data-align" => "center" }= t('footer.twitter_follow', :twitter_account => base_twitter_url(account_setting.value))
+ %a.twitter-follow-button{:href => base_twitter_url(account_setting.value), "data-width" => "400px", "data-align" => "center" }= t('footer.twitter_follow', :twitter_account => base_twitter_url(account_setting.value))
// second footer col
.footer-panel.two
@@ -0,0 +1,16 @@
+#external-header-wrap.clearfix
+ #external-header
+ .site-icon
+ = image_tag('skin/icon-fan-app.gif')
+ %h2 Site Name Title
+ %a{:href => '#'}
+ Back to Main site
+ #external-details
+ .content
+ %h3 Article title as read on n2 platform
+ %h6
+ posted by
+ %a soandso
+ several days ago
+ .add-this-wrap
+ add this stuff goes here.
@@ -30,10 +30,14 @@
%form.formtastic
%fieldset.form-desc
%p Share a Story
- %fieldset.inputs
+ %fieldset.inputs.share-story-input
+ %ol
+ %li
+ %input{:type => 'text'}
+ %fieldset.buttons.share-story-submit
%ol
- %li.file
- %input{:type => 'file'}
+ %li{:class => 'commit float-left'}
+ %input{:type => 'submit', :class => 'button-input next create', :value => 'Look up!'}
// NOT PART OF SIMPLE POSTING WIDGET
%br

0 comments on commit 271db08

Please sign in to comment.